diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/controllers/groups | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/controllers/groups')
5 files changed, 10 insertions, 5 deletions
diff --git a/app/controllers/groups/autocomplete_sources_controller.rb b/app/controllers/groups/autocomplete_sources_controller.rb index a2eb475d360..171494e66bd 100644 --- a/app/controllers/groups/autocomplete_sources_controller.rb +++ b/app/controllers/groups/autocomplete_sources_controller.rb @@ -5,8 +5,7 @@ class Groups::AutocompleteSourcesController < Groups::ApplicationController feature_category :team_planning, [:issues, :labels, :milestones, :commands] feature_category :code_review, [:merge_requests] - urgency :low, [:issues, :labels, :milestones, :commands] - urgency :low, [:merge_requests] + urgency :low, [:issues, :labels, :milestones, :commands, :merge_requests, :members] def members render json: ::Groups::ParticipantsService.new(@group, current_user).execute(target) diff --git a/app/controllers/groups/email_campaigns_controller.rb b/app/controllers/groups/email_campaigns_controller.rb index 70c8a23d918..38087e3fc11 100644 --- a/app/controllers/groups/email_campaigns_controller.rb +++ b/app/controllers/groups/email_campaigns_controller.rb @@ -4,6 +4,7 @@ class Groups::EmailCampaignsController < Groups::ApplicationController EMAIL_CAMPAIGNS_SCHEMA_URL = 'iglu:com.gitlab/email_campaigns/jsonschema/1-0-0' feature_category :navigation + urgency :low before_action :check_params diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index b95d8c87a4a..f0b857ca4c9 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -25,10 +25,8 @@ class Groups::GroupMembersController < Groups::ApplicationController urgency :low def index - push_frontend_feature_flag(:group_member_inherited_group, @group) - @sort = params[:sort].presence || sort_value_name - @include_relations ||= requested_relations + @include_relations ||= requested_relations(:groups_with_inherited_permissions) if can?(current_user, :admin_group_member, @group) @invited_members = invited_members diff --git a/app/controllers/groups/runners_controller.rb b/app/controllers/groups/runners_controller.rb index 8d687bf3c2c..aeb54527c69 100644 --- a/app/controllers/groups/runners_controller.rb +++ b/app/controllers/groups/runners_controller.rb @@ -41,3 +41,5 @@ class Groups::RunnersController < Groups::ApplicationController params.require(:runner).permit(Ci::Runner::FORM_EDITABLE) end end + +Groups::RunnersController.prepend_mod diff --git a/app/controllers/groups/settings/ci_cd_controller.rb b/app/controllers/groups/settings/ci_cd_controller.rb index 4b75cec19f7..b1afac1f1c7 100644 --- a/app/controllers/groups/settings/ci_cd_controller.rb +++ b/app/controllers/groups/settings/ci_cd_controller.rb @@ -9,6 +9,7 @@ module Groups before_action :authorize_update_max_artifacts_size!, only: [:update] before_action :define_variables, only: [:show] before_action :push_licensed_features, only: [:show] + before_action :assign_variables_to_gon, only: [:show] feature_category :continuous_integration urgency :low @@ -81,6 +82,10 @@ module Groups # Overridden in EE def push_licensed_features end + + # Overridden in EE + def assign_variables_to_gon + end end end end |