diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-19 15:08:32 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-19 15:08:32 +0000 |
| commit | 846dc476d835e43b123e0d66da3a60ed07f10641 (patch) | |
| tree | 02231005811495589ab8bf4a2f4d52f80dc95117 /app/controllers/groups | |
| parent | 2ef0b7f13d72eee215e3491a8db4623cbcdd845c (diff) | |
| download | gitlab-ce-846dc476d835e43b123e0d66da3a60ed07f10641.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/groups')
| -rw-r--r-- | app/controllers/groups/children_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/groups/group_members_controller.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/groups/children_controller.rb b/app/controllers/groups/children_controller.rb index 10a6ad06ae5..d10c52f0301 100644 --- a/app/controllers/groups/children_controller.rb +++ b/app/controllers/groups/children_controller.rb @@ -9,6 +9,9 @@ module Groups feature_category :subgroups + # TODO: Set to higher urgency after resolving https://gitlab.com/gitlab-org/gitlab/-/issues/331494 + urgency :low, [:index] + def index params[:sort] ||= @group_projects_sort parent = if params[:parent_id].present? diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index 617d22eb768..51778f31f65 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -20,7 +20,7 @@ class Groups::GroupMembersController < Groups::ApplicationController :approve_access_request, :leave, :resend_invite, :override - feature_category :authentication_and_authorization + feature_category :subgroups def index push_frontend_feature_flag(:group_member_inherited_group, @group) |