Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 2 deletions

diff --git a/app/services/web_hook_service.rb b/app/services/web_hook_service.rb
index 5bad2a1583c..27b29feed50 100644
--- a/app/services/web_hook_service.rb
+++ b/app/services/web_hook_service.rb
@@ -36,7 +36,9 @@ class WebHookService
   attr_accessor :hook, :data, :hook_name, :request_options
   attr_reader :uniqueness_token
 
-  def self.hook_to_event(hook_name)
+  def self.hook_to_event(hook_name, hook = nil)
+    return hook.class.name.titleize if hook.is_a?(SystemHook)
+
     hook_name.to_s.singularize.titleize
   end
 
@@ -194,7 +196,7 @@ class WebHookService
       headers = {
         'Content-Type' => 'application/json',
         'User-Agent' => "GitLab/#{Gitlab::VERSION}",
-        Gitlab::WebHooks::GITLAB_EVENT_HEADER => self.class.hook_to_event(hook_name),
+        Gitlab::WebHooks::GITLAB_EVENT_HEADER => self.class.hook_to_event(hook_name, hook),
         Gitlab::WebHooks::GITLAB_UUID_HEADER => SecureRandom.uuid,
         Gitlab::WebHooks::GITLAB_INSTANCE_HEADER => Gitlab.config.gitlab.base_url
       }