diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-06 05:57:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-06 05:57:55 +0000 |
| commit | 4ccf4d3394aa55952a9eedd454bee8d3c8687824 (patch) | |
| tree | 5eb292bb20117c35e9b7d3abf899922a9c20012f | |
| parent | 414af1213e4be015706cc0702e571bd48c68cd3a (diff) | |
| parent | fd97b86ed48b559332be4ba4ee7e8b6f9e7a6bf3 (diff) | |
| download | gitlab-ce-4ccf4d3394aa55952a9eedd454bee8d3c8687824.tar.gz | |
Merge branch '5941-extract-ee-controllers' into 'master'
Backport of "Extract EE specific files/lines for app/controllers/groups"
See merge request gitlab-org/gitlab-ce!19343
| -rw-r--r-- | app/controllers/groups/group_members_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/groups/milestones_controller.rb | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index ef3eba80154..ef5d5e5c742 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -3,8 +3,12 @@ class Groups::GroupMembersController < Groups::ApplicationController include MembersPresentation include SortingHelper + def self.admin_not_required_endpoints + %i[index leave request_access] + end + # Authorize - before_action :authorize_admin_group_member!, except: [:index, :leave, :request_access] + 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, diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index 5903689dc62..9bd51de7e97 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -76,12 +76,15 @@ class Groups::MilestonesController < Groups::ApplicationController def milestones milestones = MilestonesFinder.new(search_params).execute - legacy_milestones = GroupMilestone.build_collection(group, group_projects, params) @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] |