Add latest changes from gitlab-org/gitlab@12-0-stable-ee

app/controllers/projects/settings/ci_cd_controller.rb

@@ -122,3 +122,5 @@ module Projects
     end
   end
 end
+
+Projects::Settings::CiCdController.prepend(EE::Projects::Settings::CiCdController)

app/controllers/projects/settings/integrations_controller.rb

@@ -25,3 +25,5 @@ module Projects
     end
   end
 end
+
+Projects::Settings::IntegrationsController.prepend(EE::Projects::Settings::IntegrationsController)

app/controllers/projects/settings/operations_controller.rb

@@ -69,3 +69,5 @@ module Projects
     end
   end
 end
+
+Projects::Settings::OperationsController.prepend(::EE::Projects::Settings::OperationsController)

app/controllers/projects/settings/repository_controller.rb

@@ -104,3 +104,5 @@ module Projects
     end
   end
 end
+
+Projects::Settings::RepositoryController.prepend(EE::Projects::Settings::RepositoryController)

app/controllers/projects/variables_controller.rb

@@ -41,3 +41,5 @@ class Projects::VariablesController < Projects::ApplicationController
     %i[id variable_type key secret_value protected masked _destroy]
   end
 end
+
+Projects::VariablesController.prepend(EE::Projects::VariablesController)

app/controllers/projects_controller.rb

@@ -462,3 +462,5 @@ class ProjectsController < Projects::ApplicationController
     end
   end
 end
+
+ProjectsController.prepend(EE::ProjectsController)

app/controllers/registrations_controller.rb

@@ -126,3 +126,5 @@ class RegistrationsController < Devise::RegistrationsController
     Gitlab::Utils.to_boolean(params[:terms_opt_in])
   end
 end
+
+RegistrationsController.prepend(EE::RegistrationsController)

app/controllers/root_controller.rb

@@ -62,3 +62,5 @@ class RootController < Dashboard::ProjectsController
     root_urls.exclude?(home_page_url)
   end
 end
+
+RootController.prepend(EE::RootController)

app/controllers/sent_notifications_controller.rb

@@ -36,3 +36,5 @@ class SentNotificationsController < ApplicationController
     end
   end
 end
+
+SentNotificationsController.prepend(EE::SentNotificationsController)

app/controllers/sessions_controller.rb

@@ -279,3 +279,5 @@ class SessionsController < Devise::SessionsController
     end
   end
 end
+
+SessionsController.prepend(EE::SessionsController)

app/controllers/users_controller.rb

@@ -167,3 +167,5 @@ class UsersController < ApplicationController
     access_denied! unless can?(current_user, :read_user_profile, user)
   end
 end
+
+UsersController.prepend(EE::UsersController)

app/finders/autocomplete/users_finder.rb

@@ -93,3 +93,5 @@ module Autocomplete
     end
   end
 end
+
+Autocomplete::UsersFinder.prepend(EE::Autocomplete::UsersFinder)

app/finders/group_members_finder.rb

@@ -34,3 +34,5 @@ class GroupMembersFinder
   end
   # rubocop: enable CodeReuse/ActiveRecord
 end
+
+GroupMembersFinder.prepend(EE::GroupMembersFinder)

app/finders/issues_finder.rb

@@ -145,3 +145,5 @@ class IssuesFinder < IssuableFinder
     current_user.blank?
   end
 end
+
+IssuesFinder.prepend(EE::IssuesFinder)

app/finders/license_template_finder.rb

@@ -13,6 +13,8 @@
 class LicenseTemplateFinder
   include Gitlab::Utils::StrongMemoize
+  prepend ::EE::LicenseTemplateFinder # rubocop: disable Cop/InjectEnterpriseEditionModule
+
   attr_reader :project, :params
   def initialize(project, params = {})

app/finders/merge_requests_finder.rb

@@ -101,3 +101,5 @@ class MergeRequestsFinder < IssuableFinder
         .or(table[:title].matches('[WIP]%'))
   end
 end
+
+MergeRequestsFinder.prepend(EE::MergeRequestsFinder)

app/finders/notes_finder.rb

@@ -141,3 +141,5 @@ class NotesFinder
     @params[:notes_filter].present?
   end
 end
+
+NotesFinder.prepend(EE::NotesFinder)

app/finders/projects_finder.rb

@@ -24,6 +24,8 @@
 class ProjectsFinder < UnionFinder
   include CustomAttributesFilter
+  prepend ::EE::ProjectsFinder # rubocop: disable Cop/InjectEnterpriseEditionModule
+
   attr_accessor :params
   attr_reader :current_user, :project_ids_relation

app/finders/template_finder.rb

@@ -3,6 +3,8 @@
 class TemplateFinder
   include Gitlab::Utils::StrongMemoize
+  prepend ::EE::TemplateFinder # rubocop: disable Cop/InjectEnterpriseEditionModule
+
   VENDORED_TEMPLATES = HashWithIndifferentAccess.new(
     dockerfiles: ::Gitlab::Template::DockerfileTemplate,
     gitignores: ::Gitlab::Template::GitignoreTemplate,

app/finders/users_finder.rb

@@ -95,3 +95,5 @@ class UsersFinder
     end
   end
 end
+
+UsersFinder.prepend(EE::UsersFinder)