summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2016-11-28 13:00:42 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2016-11-28 13:00:42 +0100
commit9e6cdc64741583ed0db74485892c1970ff960eab (patch)
tree8c396b1d47d167607df2035e7c465a935affa3a4 /app
parent6ea0b8d56322108788727a2f4ad27843013d43f1 (diff)
downloadgitlab-ce-9e6cdc64741583ed0db74485892c1970ff960eab.tar.gz
Revert "Pass correct tag target to post-receive hook when creating tag via UI"
This reverts commit ae51774bc45d2e15ccc61b01a30d1b588f179f85.
Diffstat (limited to 'app')
-rw-r--r--app/models/repository.rb13
1 files changed, 3 insertions, 10 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index bf136ccdb6c..5e831f84879 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -196,18 +196,11 @@ class Repository
options = { message: message, tagger: user_to_committer(user) } if message
- rugged.tags.create(tag_name, target, options)
- tag = find_tag(tag_name)
-
- GitHooksService.new.execute(user, path_to_repo, oldrev, tag.target, ref) do
- # we already created a tag, because we need tag SHA to pass correct
- # values to hooks
+ GitHooksService.new.execute(user, path_to_repo, oldrev, target, ref) do
+ rugged.tags.create(tag_name, target, options)
end
- tag
- rescue GitHooksService::PreReceiveError
- rugged.tags.delete(tag_name)
- raise
+ find_tag(tag_name)
end
def rm_branch(user, branch_name)