diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-24 15:15:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-24 15:15:38 +0000 |
| commit | efbf661c4224d481c57d0346e26983a805e5ec93 (patch) | |
| tree | 4736f287350884cb49d84a09c52c8c2e1b851080 /app/controllers | |
| parent | 4720346c2e10e1ff62a20b39dfc9866eb88858e6 (diff) | |
| download | gitlab-ce-efbf661c4224d481c57d0346e26983a805e5ec93.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/broadcast_messages_controller.rb | 24 | ||||
| -rw-r--r-- | app/controllers/groups/runners_controller.rb | 2 |
2 files changed, 9 insertions, 17 deletions
diff --git a/app/controllers/admin/broadcast_messages_controller.rb b/app/controllers/admin/broadcast_messages_controller.rb index 654b8309937..821c3cc1635 100644 --- a/app/controllers/admin/broadcast_messages_controller.rb +++ b/app/controllers/admin/broadcast_messages_controller.rb @@ -6,7 +6,6 @@ module Admin before_action :find_broadcast_message, only: [:edit, :update, :destroy] before_action :find_broadcast_messages, only: [:index, :create] - before_action :push_features, only: [:index, :edit] feature_category :onboarding urgency :low @@ -15,8 +14,7 @@ module Admin @broadcast_message = BroadcastMessage.new end - def edit - end + def edit; end def create @broadcast_message = BroadcastMessage.new(broadcast_message_params) @@ -88,18 +86,14 @@ module Admin def broadcast_message_params params.require(:broadcast_message) .permit(%i[ - theme - ends_at - message - starts_at - target_path - broadcast_type - dismissable - ], target_access_levels: []).reverse_merge!(target_access_levels: []) - end - - def push_features - push_frontend_feature_flag(:role_targeted_broadcast_messages, current_user) + theme + ends_at + message + starts_at + target_path + broadcast_type + dismissable + ], target_access_levels: []).reverse_merge!(target_access_levels: []) end end end diff --git a/app/controllers/groups/runners_controller.rb b/app/controllers/groups/runners_controller.rb index f267c1cb857..4b52617d287 100644 --- a/app/controllers/groups/runners_controller.rb +++ b/app/controllers/groups/runners_controller.rb @@ -36,8 +36,6 @@ class Groups::RunnersController < Groups::ApplicationController def new render_404 unless create_runner_workflow_for_namespace_enabled? - - @group_runner_registration_token = @group.runners_token end def register |