summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-16 18:09:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-16 18:09:09 +0000
commitb6b701cf9d08253d7c6f1e7500a09b1e373e18e3 (patch)
tree72da94c08ae78c7c7be1d9c1c362a894b10a0efb /app/controllers/concerns
parent0e1756ac5c275f8d548c06693b15578baf189d56 (diff)
downloadgitlab-ce-b6b701cf9d08253d7c6f1e7500a09b1e373e18e3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/web_hooks/hook_actions.rb1
-rw-r--r--app/controllers/concerns/web_hooks/hook_log_actions.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/concerns/web_hooks/hook_actions.rb b/app/controllers/concerns/web_hooks/hook_actions.rb
index ae971b7bc95..076347922c8 100644
--- a/app/controllers/concerns/web_hooks/hook_actions.rb
+++ b/app/controllers/concerns/web_hooks/hook_actions.rb
@@ -9,6 +9,7 @@ module WebHooks
attr_writer :hooks, :hook
before_action :hook_logs, only: :edit
+ feature_category :webhooks
end
def index
diff --git a/app/controllers/concerns/web_hooks/hook_log_actions.rb b/app/controllers/concerns/web_hooks/hook_log_actions.rb
index f3378d7c857..321cee5a452 100644
--- a/app/controllers/concerns/web_hooks/hook_log_actions.rb
+++ b/app/controllers/concerns/web_hooks/hook_log_actions.rb
@@ -11,7 +11,7 @@ module WebHooks
respond_to :html
- feature_category :integrations
+ feature_category :webhooks
urgency :low, [:retry]
end