diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-17 18:11:29 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-17 18:11:29 +0000 |
| commit | f1503ea64b21497db21094355ac574248dc243c4 (patch) | |
| tree | 55e580a3494031039a9e65711d27b176dec6d342 /app/controllers | |
| parent | 5ff5438a0674c1e8217f78d2000c61c9d550c503 (diff) | |
| download | gitlab-ce-f1503ea64b21497db21094355ac574248dc243c4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/alerting/notifications_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/app/controllers/projects/alerting/notifications_controller.rb b/app/controllers/projects/alerting/notifications_controller.rb index 82fff287c4a..f3283c88740 100644 --- a/app/controllers/projects/alerting/notifications_controller.rb +++ b/app/controllers/projects/alerting/notifications_controller.rb @@ -13,8 +13,6 @@ module Projects prepend_before_action :repository, :project_without_auth feature_category :incident_management - # Goal is to increase the urgency to medium. - # See https://gitlab.com/gitlab-org/gitlab/-/issues/361310. urgency :low, [:create] def create diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 8570bbf1dbd..7878ace5015 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -18,7 +18,6 @@ class Projects::JobsController < Projects::ApplicationController before_action :verify_api_request!, only: :terminal_websocket_authorize before_action :authorize_create_proxy_build!, only: :proxy_websocket_authorize before_action :verify_proxy_request!, only: :proxy_websocket_authorize - before_action :push_job_log_search, only: [:show] before_action :push_job_log_jump_to_failures, only: [:show] before_action :reject_if_build_artifacts_size_refreshing!, only: [:erase] @@ -250,10 +249,6 @@ class Projects::JobsController < Projects::ApplicationController ::Gitlab::Workhorse.channel_websocket(service) end - def push_job_log_search - push_frontend_feature_flag(:job_log_search, @project) - end - def push_job_log_jump_to_failures push_frontend_feature_flag(:job_log_jump_to_failures, @project) end |