diff options
Diffstat (limited to 'app/controllers/groups_controller.rb')
-rw-r--r-- | app/controllers/groups_controller.rb | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 6f8dc75f6bd..8d528e123e1 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -30,7 +30,6 @@ class GroupsController < Groups::ApplicationController before_action do push_frontend_feature_flag(:vue_issuables_list, @group) - push_frontend_feature_flag(:deployment_filters) end before_action do @@ -133,13 +132,23 @@ class GroupsController < Groups::ApplicationController def update if Groups::UpdateService.new(@group, current_user, group_params).execute - redirect_to edit_group_path(@group, anchor: params[:update_section]), notice: "Group '#{@group.name}' was successfully updated." + notice = "Group '#{@group.name}' was successfully updated." + + redirect_to edit_group_origin_location, notice: notice else @group.reset render action: "edit" end end + def edit_group_origin_location + if params.dig(:group, :redirect_target) == 'repository_settings' + group_settings_repository_path(@group, anchor: 'js-default-branch-name') + else + edit_group_path(@group, anchor: params[:update_section]) + end + end + def destroy Groups::DestroyService.new(@group, current_user).async_execute @@ -181,8 +190,6 @@ class GroupsController < Groups::ApplicationController end def unfoldered_environment_names - return render_404 unless Feature.enabled?(:deployment_filters) - respond_to do |format| format.json do render json: EnvironmentNamesFinder.new(@group, current_user).execute @@ -193,6 +200,8 @@ class GroupsController < Groups::ApplicationController protected def render_show_html + record_experiment_user(:invite_members_empty_group_version_a) if ::Gitlab.com? + render 'groups/show', locals: { trial: params[:trial] } end |