Add latest changes from gitlab-org/gitlab@master

63 files changed, 127 insertions, 1 deletions

diff --git a/app/controllers/admin/application_controller.rb b/app/controllers/admin/application_controller.rb
index b742b7e19cf..956e03cef07 100644
--- a/app/controllers/admin/application_controller.rb
+++ b/app/controllers/admin/application_controller.rb
@@ -8,3 +8,5 @@ class Admin::ApplicationController < ApplicationController
 
   layout 'admin'
 end
+
+Admin::ApplicationController.prepend_if_ee('EE::Admin::ApplicationController')
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index f2f72bea5b4..dc16ad80980 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -149,3 +149,5 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     render action
   end
 end
+
+Admin::ApplicationSettingsController.prepend_if_ee('EE::Admin::ApplicationSettingsController')
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index 64b959e2431..c36bbaab23b 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -14,3 +14,5 @@ class Admin::DashboardController < Admin::ApplicationController
   end
   # rubocop: enable CodeReuse/ActiveRecord
 end
+
+Admin::DashboardController.prepend_if_ee('EE::Admin::DashboardController')
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 32a36da56fe..85a37fcd43e 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -99,3 +99,5 @@ class Admin::GroupsController < Admin::ApplicationController
     ]
   end
 end
+
+Admin::GroupsController.prepend_if_ee('EE::Admin::GroupsController')
diff --git a/app/controllers/admin/health_check_controller.rb b/app/controllers/admin/health_check_controller.rb
index 7cd80e8b5e1..7668c799cba 100644
--- a/app/controllers/admin/health_check_controller.rb
+++ b/app/controllers/admin/health_check_controller.rb
@@ -11,3 +11,5 @@ class Admin::HealthCheckController < Admin::ApplicationController
     ['standard']
   end
 end
+
+Admin::HealthCheckController.prepend_if_ee('EE::Admin::HealthCheckController')
diff --git a/app/controllers/admin/logs_controller.rb b/app/controllers/admin/logs_controller.rb
index 704e727b1da..14245300633 100644
--- a/app/controllers/admin/logs_controller.rb
+++ b/app/controllers/admin/logs_controller.rb
@@ -20,3 +20,5 @@ class Admin::LogsController < Admin::ApplicationController
     ]
   end
 end
+
+Admin::LogsController.prepend_if_ee('EE::Admin::LogsController')
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index 70db15916b9..0e8c69eb7d6 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -76,3 +76,5 @@ class Admin::ProjectsController < Admin::ApplicationController
     @group ||= @project.group
   end
 end
+
+Admin::ProjectsController.prepend_if_ee('EE::Admin::ProjectsController')
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 98883af6286..61d36d1efc2 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -241,3 +241,5 @@ class Admin::UsersController < Admin::ApplicationController
     Gitlab::AppLogger.info(_("User %{current_user_username} has started impersonating %{username}") % { current_user_username: current_user.username, username: user.username })
   end
 end
+
+Admin::UsersController.prepend_if_ee('EE::Admin::UsersController')
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2f7ac41781a..9a7859fc687 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -534,3 +534,5 @@ class ApplicationController < ActionController::Base
     end
   end
 end
+
+ApplicationController.prepend_if_ee('EE::ApplicationController')
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index 30a567c3bef..06531932b31 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -46,3 +46,5 @@ class AutocompleteController < ApplicationController
     render json: target_branches.map { |target_branch| { title: target_branch } }
   end
 end
+
+AutocompleteController.prepend_if_ee('EE::AutocompleteController')
diff --git a/app/controllers/boards/lists_controller.rb b/app/controllers/boards/lists_controller.rb
index 08b4748d7e1..7633e2aedd2 100644
--- a/app/controllers/boards/lists_controller.rb
+++ b/app/controllers/boards/lists_controller.rb
@@ -87,3 +87,5 @@ module Boards
     end
   end
 end
+
+Boards::ListsController.prepend_if_ee('EE::Boards::ListsController')
diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb
index 97f59da7885..b55061b5dc6 100644
--- a/app/controllers/clusters/clusters_controller.rb
+++ b/app/controllers/clusters/clusters_controller.rb
@@ -244,3 +244,5 @@ class Clusters::ClustersController < Clusters::BaseController
     @cluster.applications.each(&:schedule_status_update)
   end
 end
+
+Clusters::ClustersController.prepend_if_ee('EE::Clusters::ClustersController')
diff --git a/app/controllers/concerns/boards_actions.rb b/app/controllers/concerns/boards_actions.rb
index e4123d87137..a093d0d6e7f 100644
--- a/app/controllers/concerns/boards_actions.rb
+++ b/app/controllers/concerns/boards_actions.rb
@@ -44,3 +44,5 @@ module BoardsActions
     serializer.represent(resource, serializer: 'board', include_full_project_path: board.group_board?)
   end
 end
+
+BoardsActions.prepend_if_ee('EE::BoardsActions')
diff --git a/app/controllers/concerns/boards_responses.rb b/app/controllers/concerns/boards_responses.rb
index 9da2f888ead..d8bc1320db4 100644
--- a/app/controllers/concerns/boards_responses.rb
+++ b/app/controllers/concerns/boards_responses.rb
@@ -86,3 +86,5 @@ module BoardsResponses
     BoardSerializer.new
   end
 end
+
+BoardsResponses.prepend_if_ee('EE::BoardsResponses')
diff --git a/app/controllers/concerns/cycle_analytics_params.rb b/app/controllers/concerns/cycle_analytics_params.rb
index c1ef848e1e7..b970bdc544e 100644
--- a/app/controllers/concerns/cycle_analytics_params.rb
+++ b/app/controllers/concerns/cycle_analytics_params.rb
@@ -18,3 +18,5 @@ module CycleAnalyticsParams
     end
   end
 end
+
+CycleAnalyticsParams.prepend_if_ee('EE::CycleAnalyticsParams')
diff --git a/app/controllers/concerns/internal_redirect.rb b/app/controllers/concerns/internal_redirect.rb
index fa3716502a0..99bbfd56516 100644
--- a/app/controllers/concerns/internal_redirect.rb
+++ b/app/controllers/concerns/internal_redirect.rb
@@ -45,3 +45,5 @@ module InternalRedirect
     URI(request.referer).path
   end
 end
+
+InternalRedirect.prepend_if_ee('EE::InternalRedirect')
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb
index e537c11096c..543a27c56d4 100644
--- a/app/controllers/concerns/issuable_actions.rb
+++ b/app/controllers/concerns/issuable_actions.rb
@@ -260,3 +260,5 @@ module IssuableActions
   end
   # rubocop:enable Gitlab/ModuleWithInstanceVariables
 end
+
+IssuableActions.prepend_if_ee('EE::IssuableActions')
diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb
index 88044cf7557..c9a8de0b290 100644
--- a/app/controllers/concerns/issuable_collections.rb
+++ b/app/controllers/concerns/issuable_collections.rb
@@ -153,3 +153,5 @@ module IssuableCollections
   end
   # rubocop:enable Gitlab/ModuleWithInstanceVariables
 end
+
+IssuableCollections.prepend_if_ee('EE::IssuableCollections')
diff --git a/app/controllers/concerns/lfs_request.rb b/app/controllers/concerns/lfs_request.rb
index bff0715f192..733265f4099 100644
--- a/app/controllers/concerns/lfs_request.rb
+++ b/app/controllers/concerns/lfs_request.rb
@@ -128,3 +128,5 @@ module LfsRequest
     false
   end
 end
+
+LfsRequest.prepend_if_ee('EE::LfsRequest')
diff --git a/app/controllers/concerns/routable_actions.rb b/app/controllers/concerns/routable_actions.rb
index ff9b0332c97..45f9888a040 100644
--- a/app/controllers/concerns/routable_actions.rb
+++ b/app/controllers/concerns/routable_actions.rb
@@ -55,3 +55,5 @@ module RoutableActions
     end
   end
 end
+
+RoutableActions.prepend_if_ee('EE::RoutableActions')
diff --git a/app/controllers/concerns/service_params.rb b/app/controllers/concerns/service_params.rb
index 48451bedcc2..b07ddd6f684 100644
--- a/app/controllers/concerns/service_params.rb
+++ b/app/controllers/concerns/service_params.rb
@@ -85,3 +85,5 @@ module ServiceParams
     ALLOWED_PARAMS_CE
   end
 end
+
+ServiceParams.prepend_if_ee('EE::ServiceParams')
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index b192189ba3c..21ee76d31b2 100644
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@@ -31,3 +31,5 @@ class ConfirmationsController < Devise::ConfirmationsController
     after_sign_in_path_for(resource)
   end
 end
+
+ConfirmationsController.prepend_if_ee('EE::ConfirmationsController')
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 1dc89943f7f..6457732dff0 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -100,3 +100,5 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
     Project::SORTING_PREFERENCE_FIELD
   end
 end
+
+Dashboard::ProjectsController.prepend_if_ee('EE::Dashboard::ProjectsController')
diff --git a/app/controllers/groups/application_controller.rb b/app/controllers/groups/application_controller.rb
index 5f92333c2c3..d03a50f6f77 100644
--- a/app/controllers/groups/application_controller.rb
+++ b/app/controllers/groups/application_controller.rb
@@ -38,3 +38,5 @@ class Groups::ApplicationController < ApplicationController
     url_for(safe_params)
   end
 end
+
+Groups::ApplicationController.prepend_if_ee('EE::Groups::ApplicationController')
diff --git a/app/controllers/groups/clusters_controller.rb b/app/controllers/groups/clusters_controller.rb
index 92602fd8096..2165dee45fb 100644
--- a/app/controllers/groups/clusters_controller.rb
+++ b/app/controllers/groups/clusters_controller.rb
@@ -18,3 +18,5 @@ class Groups::ClustersController < Clusters::ClustersController
     @group ||= find_routable!(Group, params[:group_id] || params[:id])
   end
 end
+
+Groups::ClustersController.prepend_if_ee('EE::Groups::ClustersController')
diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb
index 557888711ec..1b1416a72d7 100644
--- a/app/controllers/groups/group_members_controller.rb
+++ b/app/controllers/groups/group_members_controller.rb
@@ -53,3 +53,5 @@ class Groups::GroupMembersController < Groups::ApplicationController
   # MembershipActions concern
   alias_method :membershipable, :group
 end
+
+Groups::GroupMembersController.prepend_if_ee('EE::Groups::GroupMembersController')
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index 7ed4384089b..58df6f66d50 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -118,3 +118,5 @@ class Groups::MilestonesController < Groups::ApplicationController
     params.permit(:state, :search_title).merge(group_ids: group.id)
   end
 end
+
+Groups::MilestonesController.prepend_if_ee('EE::Groups::MilestonesController')
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 886d1f99d69..95a7876a055 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -133,7 +133,7 @@ class GroupsController < Groups::ApplicationController
   protected
 
   def render_show_html
-    render 'groups/show'
+    render 'groups/show', locals: { trial: params[:trial] }
   end
 
   def render_details_html
@@ -229,3 +229,5 @@ class GroupsController < Groups::ApplicationController
     url_for(safe_params)
   end
 end
+
+GroupsController.prepend_if_ee('EE::GroupsController')
diff --git a/app/controllers/ide_controller.rb b/app/controllers/ide_controller.rb
index af1e6cc703b..4c9aac9a327 100644
--- a/app/controllers/ide_controller.rb
+++ b/app/controllers/ide_controller.rb
@@ -7,3 +7,5 @@ class IdeController < ApplicationController
     Gitlab::UsageDataCounters::WebIdeCounter.increment_views_count
   end
 end
+
+IdeController.prepend_if_ee('EE::IdeController')
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index ebb50fc8b10..1cea0299fb2 100644
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@@ -186,3 +186,5 @@ class Import::GithubController < Import::BaseController
     {}
   end
 end
+
+Import::GithubController.prepend_if_ee('EE::Import::GithubController')
diff --git a/app/controllers/ldap/omniauth_callbacks_controller.rb b/app/controllers/ldap/omniauth_callbacks_controller.rb
index 9a5a45939e0..4d8875937eb 100644
--- a/app/controllers/ldap/omniauth_callbacks_controller.rb
+++ b/app/controllers/ldap/omniauth_callbacks_controller.rb
@@ -31,3 +31,5 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController
     redirect_to new_user_session_path
   end
 end
+
+Ldap::OmniauthCallbacksController.prepend_if_ee('EE::Ldap::OmniauthCallbacksController')
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index b1efa767154..da92df89aed 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -214,3 +214,5 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     end
   end
 end
+
+OmniauthCallbacksController.prepend_if_ee('EE::OmniauthCallbacksController')
diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb
index 77de5cb45c9..af860297358 100644
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -64,3 +64,5 @@ class PasswordsController < Devise::PasswordsController
       notice: I18n.t('devise.passwords.send_paranoid_instructions')
   end
 end
+
+PasswordsController.prepend_if_ee('EE::PasswordsController')
diff --git a/app/controllers/profiles/accounts_controller.rb b/app/controllers/profiles/accounts_controller.rb
index b03f4b7435f..95e055a44db 100644
--- a/app/controllers/profiles/accounts_controller.rb
+++ b/app/controllers/profiles/accounts_controller.rb
@@ -30,3 +30,5 @@ class Profiles::AccountsController < Profiles::ApplicationController
     {}
   end
 end
+
+Profiles::AccountsController.prepend_if_ee('EE::Profiles::AccountsController')
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb
index 62f98d9e549..046ae5d9a51 100644
--- a/app/controllers/profiles/preferences_controller.rb
+++ b/app/controllers/profiles/preferences_controller.rb
@@ -50,3 +50,5 @@ class Profiles::PreferencesController < Profiles::ApplicationController
     ]
   end
 end
+
+Profiles::PreferencesController.prepend_if_ee('::EE::Profiles::PreferencesController')
diff --git a/app/controllers/projects/autocomplete_sources_controller.rb b/app/controllers/projects/autocomplete_sources_controller.rb
index 0e3f13045ce..605d70d440b 100644
--- a/app/controllers/projects/autocomplete_sources_controller.rb
+++ b/app/controllers/projects/autocomplete_sources_controller.rb
@@ -43,3 +43,5 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
       .execute(params[:type], params[:type_id])
   end
 end
+
+Projects::AutocompleteSourcesController.prepend_if_ee('EE::Projects::AutocompleteSourcesController')
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 5a1f93dc609..7f776b8b497 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -260,3 +260,5 @@ class Projects::EnvironmentsController < Projects::ApplicationController
     access_denied! unless can?(current_user, :stop_environment, environment)
   end
 end
+
+Projects::EnvironmentsController.prepend_if_ee('EE::Projects::EnvironmentsController')
diff --git a/app/controllers/projects/git_http_client_controller.rb b/app/controllers/projects/git_http_client_controller.rb
index abf8407a51c..a597cc9af32 100644
--- a/app/controllers/projects/git_http_client_controller.rb
+++ b/app/controllers/projects/git_http_client_controller.rb
@@ -119,3 +119,5 @@ class Projects::GitHttpClientController < Projects::ApplicationController
     Gitlab::ProtocolAccess.allowed?('http')
   end
 end
+
+Projects::GitHttpClientController.prepend_if_ee('EE::Projects::GitHttpClientController')
diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index e519cc1f158..0c8c03cb16a 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -110,3 +110,5 @@ class Projects::GitHttpController < Projects::GitHttpClientController
     Users::ActivityService.new(user, 'pull').execute
   end
 end
+
+Projects::GitHttpController.prepend_if_ee('EE::Projects::GitHttpController')
diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb
index dc65f9959db..d06e24ef39c 100644
--- a/app/controllers/projects/group_links_controller.rb
+++ b/app/controllers/projects/group_links_controller.rb
@@ -53,3 +53,5 @@ class Projects::GroupLinksController < Projects::ApplicationController
     params.permit(:link_group_access, :expires_at)
   end
 end
+
+Projects::GroupLinksController.prepend_if_ee('EE::Projects::GroupLinksController')
diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb
index da32ab9e2e0..67a7daf8445 100644
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
@@ -73,3 +73,5 @@ class Projects::ImportsController < Projects::ApplicationController
       .merge(import_url_params)
   end
 end
+
+Projects::ImportsController.prepend_if_ee('EE::Projects::ImportsController')
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index b7fd286bfe0..9cdd6288000 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -280,3 +280,5 @@ class Projects::IssuesController < Projects::ApplicationController
     Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42422')
   end
 end
+
+Projects::IssuesController.prepend_if_ee('EE::Projects::IssuesController')
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb
index 06d7579aff4..c83d4e307a7 100644
--- a/app/controllers/projects/jobs_controller.rb
+++ b/app/controllers/projects/jobs_controller.rb
@@ -231,3 +231,5 @@ class Projects::JobsController < Projects::ApplicationController
     'attachment'
   end
 end
+
+Projects::JobsController.prepend_if_ee('EE::Projects::JobsController')
diff --git a/app/controllers/projects/lfs_api_controller.rb b/app/controllers/projects/lfs_api_controller.rb
index c16736a756a..739f7a2437e 100644
--- a/app/controllers/projects/lfs_api_controller.rb
+++ b/app/controllers/projects/lfs_api_controller.rb
@@ -123,3 +123,5 @@ class Projects::LfsApiController < Projects::GitHttpClientController
     _('You cannot write to this read-only GitLab instance.')
   end
 end
+
+Projects::LfsApiController.prepend_if_ee('EE::Projects::LfsApiController')
diff --git a/app/controllers/projects/merge_requests/application_controller.rb b/app/controllers/projects/merge_requests/application_controller.rb
index 006731c0e66..edffeb32203 100644
--- a/app/controllers/projects/merge_requests/application_controller.rb
+++ b/app/controllers/projects/merge_requests/application_controller.rb
@@ -59,3 +59,5 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont
     @merge_request.close
   end
 end
+
+Projects::MergeRequests::ApplicationController.prepend_if_ee('EE::Projects::MergeRequests::ApplicationController')
diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb
index 456d2c34768..9c5caf7719e 100644
--- a/app/controllers/projects/merge_requests/diffs_controller.rb
+++ b/app/controllers/projects/merge_requests/diffs_controller.rb
@@ -117,3 +117,5 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
     @notes
   end
 end
+
+Projects::MergeRequests::DiffsController.prepend_if_ee('EE::Projects::MergeRequests::DiffsController')
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index ea1dd7d19d5..2a58cfb8f6b 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -351,3 +351,5 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
     return render_404 unless can?(current_user, :read_build, merge_request.actual_head_pipeline)
   end
 end
+
+Projects::MergeRequestsController.prepend_if_ee('EE::Projects::MergeRequestsController')
diff --git a/app/controllers/projects/mirrors_controller.rb b/app/controllers/projects/mirrors_controller.rb
index 6c6adc233b7..dd1ea151de7 100644
--- a/app/controllers/projects/mirrors_controller.rb
+++ b/app/controllers/projects/mirrors_controller.rb
@@ -90,3 +90,5 @@ class Projects::MirrorsController < Projects::ApplicationController
     params.require(:project).permit(mirror_params_attributes)
   end
 end
+
+Projects::MirrorsController.prepend_if_ee('EE::Projects::MirrorsController')
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 499d4918899..28c25dbc1e6 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -220,3 +220,5 @@ class Projects::PipelinesController < Projects::ApplicationController
     view_context.limited_counter_with_delimiter(finder.execute)
   end
 end
+
+Projects::PipelinesController.prepend_if_ee('EE::Projects::PipelinesController')
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 8938cfbad54..b01d48ca3d3 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -51,3 +51,5 @@ class Projects::ProjectMembersController < Projects::ApplicationController
   # MembershipActions concern
   alias_method :membershipable, :project
 end
+
+Projects::ProjectMembersController.prepend_if_ee('EE::Projects::ProjectMembersController')
diff --git a/app/controllers/projects/prometheus/metrics_controller.rb b/app/controllers/projects/prometheus/metrics_controller.rb
index 3a9f9aab4a5..267dca74f96 100644
--- a/app/controllers/projects/prometheus/metrics_controller.rb
+++ b/app/controllers/projects/prometheus/metrics_controller.rb
@@ -32,3 +32,5 @@ module Projects
     end
   end
 end
+
+Projects::Prometheus::MetricsController.prepend_if_ee('EE::Projects::Prometheus::MetricsController')
diff --git a/app/controllers/projects/protected_refs_controller.rb b/app/controllers/projects/protected_refs_controller.rb
index 4e2a9df5576..d9921757502 100644
--- a/app/controllers/projects/protected_refs_controller.rb
+++ b/app/controllers/projects/protected_refs_controller.rb
@@ -65,3 +65,5 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
     %i[access_level id]
   end
 end
+
+Projects::ProtectedRefsController.prepend_if_ee('EE::Projects::ProtectedRefsController')
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb
index d69f9e65874..2ed29b937ad 100644
--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@@ -90,3 +90,5 @@ class Projects::RepositoriesController < Projects::ApplicationController
     render_404
   end
 end
+
+Projects::RepositoriesController.prepend_if_ee('EE::Projects::RepositoriesController')
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index 1b8d479209b..0d61c3cc031 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -122,3 +122,5 @@ module Projects
     end
   end
 end
+
+Projects::Settings::CiCdController.prepend_if_ee('EE::Projects::Settings::CiCdController')
diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb
index 388fcb32c35..0c5cf01d912 100644
--- a/app/controllers/projects/settings/integrations_controller.rb
+++ b/app/controllers/projects/settings/integrations_controller.rb
@@ -25,3 +25,5 @@ module Projects
     end
   end
 end
+
+Projects::Settings::IntegrationsController.prepend_if_ee('EE::Projects::Settings::IntegrationsController')
diff --git a/app/controllers/projects/settings/operations_controller.rb b/app/controllers/projects/settings/operations_controller.rb
index ec89bb89edc..7c71486a765 100644
--- a/app/controllers/projects/settings/operations_controller.rb
+++ b/app/controllers/projects/settings/operations_controller.rb
@@ -69,3 +69,5 @@ module Projects
     end
   end
 end
+
+Projects::Settings::OperationsController.prepend_if_ee('::EE::Projects::Settings::OperationsController')
diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index bc2ce15286f..0c634bbea03 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -104,3 +104,5 @@ module Projects
     end
   end
 end
+
+Projects::Settings::RepositoryController.prepend_if_ee('EE::Projects::Settings::RepositoryController')
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 5f335de4d6b..a6ed783b433 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -464,3 +464,5 @@ class ProjectsController < Projects::ApplicationController
     @project = @project.present(current_user: current_user)
   end
 end
+
+ProjectsController.prepend_if_ee('EE::ProjectsController')
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index fb631f09f10..a973ed23da9 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -145,3 +145,5 @@ class RegistrationsController < Devise::RegistrationsController
     stored_location_for(user) || dashboard_projects_path
   end
 end
+
+RegistrationsController.prepend_if_ee('EE::RegistrationsController')
diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb
index f1b39125a48..310ae17abbf 100644
--- a/app/controllers/root_controller.rb
+++ b/app/controllers/root_controller.rb
@@ -62,3 +62,5 @@ class RootController < Dashboard::ProjectsController
     root_urls.exclude?(home_page_url)
   end
 end
+
+RootController.prepend_if_ee('EE::RootController')
diff --git a/app/controllers/sent_notifications_controller.rb b/app/controllers/sent_notifications_controller.rb
index 77757c4a3ef..51a67cd2e3b 100644
--- a/app/controllers/sent_notifications_controller.rb
+++ b/app/controllers/sent_notifications_controller.rb
@@ -36,3 +36,5 @@ class SentNotificationsController < ApplicationController
     end
   end
 end
+
+SentNotificationsController.prepend_if_ee('EE::SentNotificationsController')
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index a6dd811ab8b..f8da152e3d2 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -288,3 +288,5 @@ class SessionsController < Devise::SessionsController
     end
   end
 end
+
+SessionsController.prepend_if_ee('EE::SessionsController')
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e38d4073de3..c3c227b08c5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -182,3 +182,5 @@ class UsersController < ApplicationController
     access_denied! unless can?(current_user, :read_user_profile, user)
   end
 end
+
+UsersController.prepend_if_ee('EE::UsersController')