diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 21:13:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 21:13:16 +0300 |
| commit | 4c5b7f992f2ee3134409559e35350748425fb467 (patch) | |
| tree | edabd5b6b177a0f982d27ecddd45de9dccbe6186 /app/controllers | |
| parent | f50cb4f63fae6f02a0b8d9c3a95f29b3b4f79516 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/hook_logs_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/admin/hooks_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/concerns/integrations_actions.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/hook_logs_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/hooks_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/services_controller.rb | 1 |
6 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/admin/hook_logs_controller.rb b/app/controllers/admin/hook_logs_controller.rb index 444ad17f86d..4cebfb485e5 100644 --- a/app/controllers/admin/hook_logs_controller.rb +++ b/app/controllers/admin/hook_logs_controller.rb @@ -9,6 +9,7 @@ class Admin::HookLogsController < Admin::ApplicationController respond_to :html feature_category :integrations + urgency :low, [:retry] def show end diff --git a/app/controllers/admin/hooks_controller.rb b/app/controllers/admin/hooks_controller.rb index ca24f671b9d..c2f5e275bb2 100644 --- a/app/controllers/admin/hooks_controller.rb +++ b/app/controllers/admin/hooks_controller.rb @@ -6,6 +6,7 @@ class Admin::HooksController < Admin::ApplicationController before_action :hook_logs, only: :edit feature_category :integrations + urgency :low, [:test] def index @hooks = SystemHook.all diff --git a/app/controllers/concerns/integrations_actions.rb b/app/controllers/concerns/integrations_actions.rb index dd066cc1b02..47d09d7e375 100644 --- a/app/controllers/concerns/integrations_actions.rb +++ b/app/controllers/concerns/integrations_actions.rb @@ -8,6 +8,8 @@ module IntegrationsActions include IntegrationsHelper before_action :integration, only: [:edit, :update, :overrides, :test] + + urgency :low, [:test] end def edit diff --git a/app/controllers/projects/hook_logs_controller.rb b/app/controllers/projects/hook_logs_controller.rb index 99ebe3335c0..959fa97e562 100644 --- a/app/controllers/projects/hook_logs_controller.rb +++ b/app/controllers/projects/hook_logs_controller.rb @@ -13,6 +13,7 @@ class Projects::HookLogsController < Projects::ApplicationController layout 'project_settings' feature_category :integrations + urgency :low, [:retry] def show end diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb index b87bfc58f8b..35baf5d0ebb 100644 --- a/app/controllers/projects/hooks_controller.rb +++ b/app/controllers/projects/hooks_controller.rb @@ -13,6 +13,7 @@ class Projects::HooksController < Projects::ApplicationController layout "project_settings" feature_category :integrations + urgency :low, [:test] def index @hooks = @project.hooks diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index c42d382c4bb..9464826701d 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -18,6 +18,7 @@ class Projects::ServicesController < Projects::ApplicationController layout "project_settings" feature_category :integrations + urgency :low, [:test] def edit end |