diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 09:08:10 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 09:08:10 +0000 |
commit | 13867d66e92c2fd8962a126db4fbdc32891343c9 (patch) | |
tree | 580a1baf1cdd3283ede126ee510ecf1d3562a471 /app/models/hooks | |
parent | 83758a4e5fcfec056b36a4b56fb22c8a915753cc (diff) | |
download | gitlab-ce-13867d66e92c2fd8962a126db4fbdc32891343c9.tar.gz |
Add latest changes from gitlab-org/gitlab@masterogolowinski-master-patch-27476
Diffstat (limited to 'app/models/hooks')
-rw-r--r-- | app/models/hooks/project_hook.rb | 4 | ||||
-rw-r--r-- | app/models/hooks/system_hook.rb | 8 | ||||
-rw-r--r-- | app/models/hooks/web_hook.rb | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb index 65e3eaf31e7..9ae697b9e59 100644 --- a/app/models/hooks/project_hook.rb +++ b/app/models/hooks/project_hook.rb @@ -18,6 +18,10 @@ class ProjectHook < WebHook belongs_to :project validates :project, presence: true + + def pluralized_name + _('Project Hooks') + end end ProjectHook.prepend_if_ee('EE::ProjectHook') diff --git a/app/models/hooks/system_hook.rb b/app/models/hooks/system_hook.rb index 3d54d17e787..c8a0cc05912 100644 --- a/app/models/hooks/system_hook.rb +++ b/app/models/hooks/system_hook.rb @@ -20,4 +20,12 @@ class SystemHook < WebHook def allow_local_requests? Gitlab::CurrentSettings.allow_local_requests_from_system_hooks? end + + def pluralized_name + _('System Hooks') + end + + def help_path + 'system_hooks/system_hooks' + end end diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb index e51b1c41059..dbd5a1b032a 100644 --- a/app/models/hooks/web_hook.rb +++ b/app/models/hooks/web_hook.rb @@ -37,4 +37,8 @@ class WebHook < ApplicationRecord def allow_local_requests? Gitlab::CurrentSettings.allow_local_requests_from_web_hooks_and_services? end + + def help_path + 'user/project/integrations/webhooks' + end end |