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

app/controllers/boards/lists_controller.rb

@@ -83,3 +83,5 @@ module Boards
     end
   end
 end
+
+Boards::ListsController.prepend(EE::Boards::ListsController)

app/controllers/clusters/clusters_controller.rb

@@ -234,3 +234,5 @@ class Clusters::ClustersController < Clusters::BaseController
     @cluster.applications.each(&:schedule_status_update)
   end
 end
+
+Clusters::ClustersController.prepend(EE::Clusters::ClustersController)

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(EE::BoardsActions)

app/controllers/concerns/boards_responses.rb

@@ -85,3 +85,5 @@ module BoardsResponses
     BoardSerializer.new
   end
 end
+
+BoardsResponses.prepend(EE::BoardsResponses)

app/controllers/concerns/internal_redirect.rb

@@ -45,3 +45,5 @@ module InternalRedirect
     URI(request.referer).path
   end
 end
+
+InternalRedirect.prepend(EE::InternalRedirect)

app/controllers/concerns/issuable_actions.rb

@@ -223,3 +223,5 @@ module IssuableActions
     @project || @group # rubocop:disable Gitlab/ModuleWithInstanceVariables
   end
 end
+
+IssuableActions.prepend(EE::IssuableActions)

app/controllers/concerns/issuable_collections.rb

@@ -208,3 +208,5 @@ module IssuableCollections
   end
   # rubocop:enable Gitlab/ModuleWithInstanceVariables
 end
+
+IssuableCollections.prepend(EE::IssuableCollections)

app/controllers/concerns/lfs_request.rb

@@ -128,3 +128,5 @@ module LfsRequest
     false
   end
 end
+
+LfsRequest.prepend(EE::LfsRequest)

app/controllers/concerns/routable_actions.rb

@@ -55,3 +55,5 @@ module RoutableActions
     end
   end
 end
+
+RoutableActions.prepend(EE::RoutableActions)

app/controllers/concerns/service_params.rb

@@ -85,3 +85,5 @@ module ServiceParams
     ALLOWED_PARAMS_CE
   end
 end
+
+ServiceParams.prepend(EE::ServiceParams)

app/controllers/confirmations_controller.rb

@@ -31,3 +31,5 @@ class ConfirmationsController < Devise::ConfirmationsController
     after_sign_in_path_for(resource)
   end
 end
+
+ConfirmationsController.prepend(EE::ConfirmationsController)

app/controllers/dashboard/projects_controller.rb

@@ -88,3 +88,5 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
     Events::RenderService.new(current_user).execute(@events, atom_request: request.format.atom?)
   end
 end
+
+Dashboard::ProjectsController.prepend(EE::Dashboard::ProjectsController)

app/controllers/groups/application_controller.rb

@@ -38,3 +38,5 @@ class Groups::ApplicationController < ApplicationController
     url_for(safe_params)
   end
 end
+
+Groups::ApplicationController.prepend(EE::Groups::ApplicationController)

app/controllers/groups/group_members_controller.rb

@@ -44,3 +44,5 @@ class Groups::GroupMembersController < Groups::ApplicationController
   # MembershipActions concern
   alias_method :membershipable, :group
 end
+
+Groups::GroupMembersController.prepend(EE::Groups::GroupMembersController)

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(EE::Groups::MilestonesController)

app/controllers/groups_controller.rb

@@ -228,3 +228,5 @@ class GroupsController < Groups::ApplicationController
     url_for(safe_params)
   end
 end
+
+GroupsController.prepend(EE::GroupsController)

app/controllers/ide_controller.rb

@@ -6,3 +6,5 @@ class IdeController < ApplicationController
   def index
   end
 end
+
+IdeController.prepend(EE::IdeController)

app/controllers/import/github_controller.rb

@@ -182,3 +182,5 @@ class Import::GithubController < Import::BaseController
     {}
   end
 end
+
+Import::GithubController.prepend(EE::Import::GithubController)

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(EE::Ldap::OmniauthCallbacksController)

app/controllers/omniauth_callbacks_controller.rb

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