summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-13 16:42:01 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-13 16:42:01 +0000
commitb8f5e23f270df85b32baa1fd6912b6a5eb334755 (patch)
tree48cf1bb0a659d891907e835454a2373f15fb177c /lib
parentd37d7ffc1b617f8d75959c05f77727e14ac4e353 (diff)
parentb160db1482255146e58317be4b16b1e9aebc3748 (diff)
downloadgitlab-ce-b8f5e23f270df85b32baa1fd6912b6a5eb334755.tar.gz
Merge branch 'tag-branch-hooks' into 'master'
Execute hooks and services when branch or tag is created or deleted through web interface. Fixes #2095. Split up into commits to make it easier to see why what was changed :) See merge request !1692
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/push_data_builder.rb3
1 files changed, 2 insertions, 1 deletions
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,