diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/controllers/groups | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/controllers/groups')
-rw-r--r-- | app/controllers/groups/application_controller.rb | 8 | ||||
-rw-r--r-- | app/controllers/groups/boards_controller.rb | 1 | ||||
-rw-r--r-- | app/controllers/groups/group_members_controller.rb | 8 | ||||
-rw-r--r-- | app/controllers/groups/milestones_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/groups/runners_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/groups/variables_controller.rb | 2 |
6 files changed, 12 insertions, 11 deletions
diff --git a/app/controllers/groups/application_controller.rb b/app/controllers/groups/application_controller.rb index a3bbfc8be0d..f6c71ac8087 100644 --- a/app/controllers/groups/application_controller.rb +++ b/app/controllers/groups/application_controller.rb @@ -13,8 +13,16 @@ class Groups::ApplicationController < ApplicationController before_action :set_sorting requires_cross_project_access + helper_method :can_manage_members? + private + def can_manage_members?(group = @group) + strong_memoize(:can_manage_members) do + can?(current_user, :admin_group_member, group) + end + end + def group @group ||= find_routable!(Group, params[:group_id] || params[:id]) end diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb index 3d8cdd766bf..04b4d8ea9a7 100644 --- a/app/controllers/groups/boards_controller.rb +++ b/app/controllers/groups/boards_controller.rb @@ -8,6 +8,7 @@ class Groups::BoardsController < Groups::ApplicationController before_action :assign_endpoint_vars before_action do push_frontend_feature_flag(:graphql_board_lists, group, default_enabled: false) + push_frontend_feature_flag(:issue_boards_filtered_search, group, default_enabled: :yaml) push_frontend_feature_flag(:board_multi_select, group, default_enabled: :yaml) push_frontend_feature_flag(:swimlanes_buffered_rendering, group, default_enabled: :yaml) push_frontend_feature_flag(:iteration_cadences, group, default_enabled: :yaml) diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index 8d9059d271f..d5e7653dea2 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -22,8 +22,6 @@ class Groups::GroupMembersController < Groups::ApplicationController feature_category :authentication_and_authorization - helper_method :can_manage_members? - def index @sort = params[:sort].presence || sort_value_name @@ -53,12 +51,6 @@ class Groups::GroupMembersController < Groups::ApplicationController private - def can_manage_members? - strong_memoize(:can_manage_members) do - can?(current_user, :admin_group_member, @group) - end - end - def present_invited_members(invited_members) present_members(invited_members .page(params[:invited_members_page]) diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index e9dce3947dd..63eff750d1b 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -15,7 +15,7 @@ class Groups::MilestonesController < Groups::ApplicationController @milestones = milestones.page(params[:page]) end format.json do - render json: milestones.to_json(only: [:id, :title], methods: :name) + render json: milestones.to_json(only: [:id, :title, :due_date], methods: :name) end end end diff --git a/app/controllers/groups/runners_controller.rb b/app/controllers/groups/runners_controller.rb index b02b0e85d38..1cff658dd52 100644 --- a/app/controllers/groups/runners_controller.rb +++ b/app/controllers/groups/runners_controller.rb @@ -7,7 +7,7 @@ class Groups::RunnersController < Groups::ApplicationController before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show] - feature_category :continuous_integration + feature_category :runner def show end diff --git a/app/controllers/groups/variables_controller.rb b/app/controllers/groups/variables_controller.rb index 00ddb8d736c..9dbbd385ea8 100644 --- a/app/controllers/groups/variables_controller.rb +++ b/app/controllers/groups/variables_controller.rb @@ -6,7 +6,7 @@ module Groups skip_cross_project_access_check :show, :update - feature_category :continuous_integration + feature_category :pipeline_authoring def show respond_to do |format| |