Merge branch 'ee-5941-extract-ee-controllers' into 'master'

Extract EE specific files/lines for app/controllers/groups

Closes #5941

See merge request gitlab-org/gitlab-ee!5947

app/controllers/groups/group_members_controller.rb

@@ -5,13 +5,12 @@ class Groups::GroupMembersController < Groups::ApplicationController
   include MembersPresentation
   include SortingHelper
 
-  # Authorize
-  before_action :authorize_admin_group_member!, except: [:index, :leave, :request_access, :update, :override]
-  before_action :authorize_update_group_member!, only: [:update, :override]
+  def self.admin_not_required_endpoints
+    %i[index leave request_access]
+  end
 
-  skip_cross_project_access_check :index, :create, :update, :destroy, :request_access,
-                                  :approve_access_request, :leave, :resend_invite,
-                                  :override
+  # Authorize
+  before_action :authorize_admin_group_member!, except: admin_not_required_endpoints
 
   skip_cross_project_access_check :index, :create, :update, :destroy, :request_access,
                                   :approve_access_request, :leave, :resend_invite,

app/controllers/groups/milestones_controller.rb

 class Groups::MilestonesController < Groups::ApplicationController
+  prepend EE::Groups::MilestonesController
+
   include MilestoneActions
 
   before_action :group_projects
@@ -77,17 +79,14 @@ class Groups::MilestonesController < Groups::ApplicationController
   def milestones
     milestones = MilestonesFinder.new(search_params).execute
 
-    legacy_milestones =
-      if params[:only_group_milestones]
-        []
-      else
-        GroupMilestone.build_collection(group, group_projects, params)
-      end
-
     @sort = params[:sort] || 'due_date_asc'
     MilestoneArray.sort(milestones + legacy_milestones, @sort)
   end
 
+  def legacy_milestones
+    GroupMilestone.build_collection(group, group_projects, params)
+  end
+
   def milestone
     @milestone =
       if params[:title]

ee/app/controllers/ee/groups/group_members_controller.rb

@@ -3,6 +3,19 @@ module EE
     module GroupMembersController
       extend ActiveSupport::Concern
 
+      class_methods do
+        extend ::Gitlab::Utils::Override
+
+        override :admin_not_required_endpoints
+        def admin_not_required_endpoints
+          super.concat(%i[update override])
+        end
+      end
+
+      included do
+        before_action :authorize_update_group_member!, only: [:update, :override]
+      end
+
       # rubocop:disable Gitlab/ModuleWithInstanceVariables
       def override
         member = @group.members.find_by!(id: params[:id])

ee/app/controllers/ee/groups/milestones_controller.rb

+module EE
+  module Groups
+    module MilestonesController
+      extend ::Gitlab::Utils::Override
+
+      override :legacy_milestones
+      def legacy_milestones
+        params[:only_group_milestones] ? [] : super
+      end
+    end
+  end
+end