Set push data object kind in PushDataBuilder.

3 files changed, 4 insertions, 7 deletions

diff --git a/app/services/create_tag_service.rb b/app/services/create_tag_service.rb
index dfc5677c9d4..755202310ab 100644
--- a/app/services/create_tag_service.rb
+++ b/app/services/create_tag_service.rb
@@ -40,9 +40,7 @@ class CreateTagService < BaseService
   end
 
   def create_push_data(project, user, tag)
-    data = Gitlab::PushDataBuilder.
+    Gitlab::PushDataBuilder.
       build(project, user, Gitlab::Git::BLANK_SHA, tag.target, "#{Gitlab::Git::TAG_REF_PREFIX}#{tag.name}", [])
-    data[:object_kind] = "tag_push"
-    data
   end
 end
diff --git a/app/services/git_tag_push_service.rb b/app/services/git_tag_push_service.rb
index cd92f50b02a..666bc482f88 100644
--- a/app/services/git_tag_push_service.rb
+++ b/app/services/git_tag_push_service.rb
@@ -16,8 +16,6 @@ class GitTagPushService
   private
 
   def create_push_data(oldrev, newrev, ref)
-    data = Gitlab::PushDataBuilder.build(project, user, oldrev, newrev, ref, [])
-    data[:object_kind] = "tag_push"
-    data
+    Gitlab::PushDataBuilder.build(project, user, oldrev, newrev, ref, [])
   end
 end
diff --git a/lib/gitlab/push_data_builder.rb b/lib/gitlab/push_data_builder.rb
index 0cc6b0ac694..ea9012b8844 100644
--- a/lib/gitlab/push_data_builder.rb
+++ b/lib/gitlab/push_data_builder.rb
@@ -28,9 +28,10 @@ module Gitlab
         # Get latest 20 commits ASC
         commits_limited = commits.last(20)
 
+        type = Gitlab::Git.tag_ref?(ref) ? "tag_push" : "push"
         # Hash to be passed as post_receive_data
         data = {
-          object_kind: "push",
+          object_kind: type,
           before: oldrev,
           after: newrev,
           ref: ref,