diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-02 21:12:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-02 21:12:13 +0300 |
| commit | 23f57fb31fe83ea8666753f94118f6d834517dfb (patch) | |
| tree | 0055fc79e5fe1bbb43afcbbce71c745df01f3f6c /app/controllers/admin | |
| parent | 125c8a6a81c1c09911c09183c66768571cfd95b4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/hook_logs_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/hooks_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/integrations_controller.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/hook_logs_controller.rb b/app/controllers/admin/hook_logs_controller.rb index 4cebfb485e5..aa13673095d 100644 --- a/app/controllers/admin/hook_logs_controller.rb +++ b/app/controllers/admin/hook_logs_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Admin::HookLogsController < Admin::ApplicationController - include HooksExecution + include ::Integrations::HooksExecution before_action :hook, only: [:show, :retry] before_action :hook_log, only: [:show, :retry] diff --git a/app/controllers/admin/hooks_controller.rb b/app/controllers/admin/hooks_controller.rb index fb397e7c8c7..6f5475a4a78 100644 --- a/app/controllers/admin/hooks_controller.rb +++ b/app/controllers/admin/hooks_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Admin::HooksController < Admin::ApplicationController - include HooksExecution + include ::Integrations::HooksExecution before_action :hook_logs, only: :edit diff --git a/app/controllers/admin/integrations_controller.rb b/app/controllers/admin/integrations_controller.rb index a3eb24b9b6f..ad0ee0b2cef 100644 --- a/app/controllers/admin/integrations_controller.rb +++ b/app/controllers/admin/integrations_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Admin::IntegrationsController < Admin::ApplicationController - include IntegrationsActions + include ::Integrations::Actions before_action :not_found, unless: -> { instance_level_integrations? } |