diff options
Diffstat (limited to 'app/controllers/groups')
9 files changed, 21 insertions, 38 deletions
diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb index 641b3adb12b..c65232c0fea 100644 --- a/app/controllers/groups/boards_controller.rb +++ b/app/controllers/groups/boards_controller.rb @@ -8,7 +8,7 @@ class Groups::BoardsController < Groups::ApplicationController before_action :assign_endpoint_vars before_action do push_frontend_feature_flag(:board_multi_select, group, default_enabled: :yaml) - push_frontend_feature_flag(:iteration_cadences, group, default_enabled: :yaml) + push_frontend_feature_flag(:realtime_labels, group, default_enabled: :yaml) experiment(:prominent_create_board_btn, subject: current_user) do |e| e.control { } e.candidate { } @@ -43,11 +43,11 @@ class Groups::BoardsController < Groups::ApplicationController def assign_endpoint_vars @boards_endpoint = group_boards_path(group) - @namespace_path = group.to_param - @labels_endpoint = group_labels_path(group) end def authorize_read_board! access_denied! unless can?(current_user, :read_issue_board, group) end end + +Groups::BoardsController.prepend_mod 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/crm/organizations_controller.rb b/app/controllers/groups/crm/organizations_controller.rb index f8536b4f538..846995ecba5 100644 --- a/app/controllers/groups/crm/organizations_controller.rb +++ b/app/controllers/groups/crm/organizations_controller.rb @@ -10,6 +10,10 @@ class Groups::Crm::OrganizationsController < Groups::ApplicationController render action: "index" end + def edit + render action: "index" + end + private def authorize_read_crm_organization! diff --git a/app/controllers/groups/email_campaigns_controller.rb b/app/controllers/groups/email_campaigns_controller.rb index 520ad768939..70c8a23d918 100644 --- a/app/controllers/groups/email_campaigns_controller.rb +++ b/app/controllers/groups/email_campaigns_controller.rb @@ -40,7 +40,7 @@ class Groups::EmailCampaignsController < Groups::ApplicationController project_pipelines_url(group.projects.first) when :trial, :trial_short 'https://about.gitlab.com/free-trial/' - when :team, :team_short, :invite_team + when :team, :team_short group_group_members_url(group) when :admin_verify project_settings_ci_cd_path(group.projects.first, ci_runner_templates: true, anchor: 'js-runners-settings') @@ -59,11 +59,6 @@ class Groups::EmailCampaignsController < Groups::ApplicationController @track = params[:track]&.to_sym @series = params[:series]&.to_i - # There is only one email that will be sent for invite team track so series - # should only have the value 0. Return early if track is invite team and - # condition for series value is met - return if @track == Namespaces::InviteTeamEmailService::TRACK && @series == 0 - track_valid = @track.in?(Namespaces::InProductMarketingEmailsService::TRACKS.keys) return render_404 unless track_valid diff --git a/app/controllers/groups/group_links_controller.rb b/app/controllers/groups/group_links_controller.rb index 0655d779a4e..cc2ca728592 100644 --- a/app/controllers/groups/group_links_controller.rb +++ b/app/controllers/groups/group_links_controller.rb @@ -6,30 +6,12 @@ class Groups::GroupLinksController < Groups::ApplicationController feature_category :subgroups - def create - shared_with_group = Group.find(params[:shared_with_group_id]) if params[:shared_with_group_id].present? - - if shared_with_group - result = Groups::GroupLinks::CreateService - .new(group, shared_with_group, current_user, group_link_create_params) - .execute - - return render_404 if result[:http_status] == 404 - - flash[:alert] = result[:message] if result[:status] == :error - else - flash[:alert] = _('Please select a group.') - end - - redirect_to group_group_members_path(group) - end - def update Groups::GroupLinks::UpdateService.new(@group_link).execute(group_link_params) if @group_link.expires? render json: { - expires_in: helpers.distance_of_time_in_words_to_now(@group_link.expires_at), + expires_in: helpers.time_ago_with_tooltip(@group_link.expires_at), expires_soon: @group_link.expires_soon? } else @@ -54,10 +36,6 @@ class Groups::GroupLinksController < Groups::ApplicationController @group_link ||= group.shared_with_group_links.find(params[:id]) end - def group_link_create_params - params.permit(:shared_group_access, :expires_at) - end - def group_link_params params.require(:group_link).permit(:group_access, :expires_at) end diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index ece1083d4d1..51778f31f65 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -20,10 +20,13 @@ 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) + @sort = params[:sort].presence || sort_value_name + @include_relations ||= requested_relations if can?(current_user, :admin_group_member, @group) @invited_members = invited_members diff --git a/app/controllers/groups/releases_controller.rb b/app/controllers/groups/releases_controller.rb index db5385ecc71..e87135cc104 100644 --- a/app/controllers/groups/releases_controller.rb +++ b/app/controllers/groups/releases_controller.rb @@ -17,8 +17,10 @@ module Groups def releases if Feature.enabled?(:group_releases_finder_inoperator) Releases::GroupReleasesFinder - .new(@group, current_user, { include_subgroups: true, page: params[:page], per: 30 }) + .new(@group, current_user) .execute(preload: false) + .page(params[:page]) + .per(30) else ReleasesFinder .new(@group, current_user, { include_subgroups: true }) diff --git a/app/controllers/groups/runners_controller.rb b/app/controllers/groups/runners_controller.rb index dabef978ee1..a2be4d9d7e1 100644 --- a/app/controllers/groups/runners_controller.rb +++ b/app/controllers/groups/runners_controller.rb @@ -11,6 +11,8 @@ class Groups::RunnersController < Groups::ApplicationController def index finder = Ci::RunnersFinder.new(current_user: current_user, params: { group: @group }) @group_runners_limited_count = finder.execute.except(:limit, :offset).page.total_count_with_limit(:all, limit: 1000) + + Gitlab::Tracking.event(self.class.name, 'index', user: current_user, namespace: @group) end def runner_list_group_view_vue_ui_enabled diff --git a/app/controllers/groups/settings/integrations_controller.rb b/app/controllers/groups/settings/integrations_controller.rb index ec64e75a68e..0a63c3d304b 100644 --- a/app/controllers/groups/settings/integrations_controller.rb +++ b/app/controllers/groups/settings/integrations_controller.rb @@ -7,10 +7,6 @@ module Groups before_action :authorize_admin_group! - before_action do - push_frontend_feature_flag(:integration_form_sections, group, default_enabled: :yaml) - end - feature_category :integrations layout 'group_settings' |