diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 21:10:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 21:10:32 +0300 |
| commit | bced7d8bcc29bf5b75a03523e74a8e000c10371a (patch) | |
| tree | d3df9e707fba772ae86370c49819e744880e53e1 /app/controllers/projects | |
| parent | 133b8a64b6d5b57f3cd753f55059b2b90721695e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/environments_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/projects/pipeline_schedules_controller.rb | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index 127fe40b0e3..e1e0bb83b40 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -8,10 +8,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController layout 'project' - before_action only: [:show] do - push_frontend_feature_flag(:environment_details_vue, @project) - end - before_action only: [:index, :edit, :new] do push_frontend_feature_flag(:flux_resource_for_environment) end diff --git a/app/controllers/projects/pipeline_schedules_controller.rb b/app/controllers/projects/pipeline_schedules_controller.rb index 42b6d83ee85..83a64579446 100644 --- a/app/controllers/projects/pipeline_schedules_controller.rb +++ b/app/controllers/projects/pipeline_schedules_controller.rb @@ -9,7 +9,6 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController before_action :authorize_create_pipeline_schedule!, only: [:new, :create] before_action :authorize_update_pipeline_schedule!, only: [:edit, :update] before_action :authorize_admin_pipeline_schedule!, only: [:take_ownership, :destroy] - before_action :push_schedule_feature_flag, only: [:index, :new, :edit] feature_category :continuous_integration urgency :low @@ -120,8 +119,4 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController def authorize_admin_pipeline_schedule! return access_denied! unless can?(current_user, :admin_pipeline_schedule, schedule) end - - def push_schedule_feature_flag - push_frontend_feature_flag(:pipeline_schedules_vue, @project) - end end |