diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
commit | e4384360a16dd9a19d4d2d25d0ef1f2b862ed2a6 (patch) | |
tree | 2fcdfa7dcdb9db8f5208b2562f4b4e803d671243 /app/controllers/groups | |
parent | ffda4e7bcac36987f936b4ba515995a6698698f0 (diff) |
Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42
Diffstat (limited to 'app/controllers/groups')
-rw-r--r-- | app/controllers/groups/milestones_controller.rb | 4 | ||||
-rw-r--r-- | app/controllers/groups/runners_controller.rb | 20 | ||||
-rw-r--r-- | app/controllers/groups/settings/ci_cd_controller.rb | 1 | ||||
-rw-r--r-- | app/controllers/groups/uploads_controller.rb | 2 |
4 files changed, 10 insertions, 17 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index 5f6b55ea928..cbed75019f2 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -9,6 +9,10 @@ class Groups::MilestonesController < Groups::ApplicationController feature_category :team_planning urgency :low + before_action do + push_frontend_feature_flag(:content_editor_on_issues, group) + end + def index respond_to do |format| format.html do diff --git a/app/controllers/groups/runners_controller.rb b/app/controllers/groups/runners_controller.rb index 4b52617d287..2dd0e36b65f 100644 --- a/app/controllers/groups/runners_controller.rb +++ b/app/controllers/groups/runners_controller.rb @@ -6,10 +6,6 @@ class Groups::RunnersController < Groups::ApplicationController before_action :authorize_update_runner!, only: [:edit, :update, :destroy, :pause, :resume] before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show, :register] - before_action only: [:index] do - push_frontend_feature_flag(:create_runner_workflow_for_namespace, group) - end - feature_category :runner urgency :low @@ -20,11 +16,9 @@ class Groups::RunnersController < Groups::ApplicationController Gitlab::Tracking.event(self.class.name, 'index', user: current_user, namespace: @group) end - def show - end + def show; end - def edit - end + def edit; end def update if Ci::Runners::UpdateRunnerService.new(@runner).execute(runner_params).success? @@ -34,12 +28,10 @@ class Groups::RunnersController < Groups::ApplicationController end end - def new - render_404 unless create_runner_workflow_for_namespace_enabled? - end + def new; end def register - render_404 unless create_runner_workflow_for_namespace_enabled? && runner.registration_available? + render_404 unless runner.registration_available? end private @@ -67,10 +59,6 @@ class Groups::RunnersController < Groups::ApplicationController render_404 end - - def create_runner_workflow_for_namespace_enabled? - Feature.enabled?(:create_runner_workflow_for_namespace, group) - 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 4bbaf92b126..169caabf9d8 100644 --- a/app/controllers/groups/settings/ci_cd_controller.rb +++ b/app/controllers/groups/settings/ci_cd_controller.rb @@ -14,6 +14,7 @@ module Groups feature_category :continuous_integration before_action do + push_frontend_feature_flag(:ci_group_env_scope_graphql, group) push_frontend_feature_flag(:ci_variables_pages, current_user) end diff --git a/app/controllers/groups/uploads_controller.rb b/app/controllers/groups/uploads_controller.rb index cd1ebc39411..d29532f9d6f 100644 --- a/app/controllers/groups/uploads_controller.rb +++ b/app/controllers/groups/uploads_controller.rb @@ -9,7 +9,7 @@ class Groups::UploadsController < Groups::ApplicationController before_action :authorize_upload_file!, only: [:create, :authorize] before_action :verify_workhorse_api!, only: [:authorize] - feature_category :groups_and_projects + feature_category :portfolio_management urgency :low, [:show] private |