diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-28 16:02:46 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-12-02 17:48:53 +0100 |
commit | 4fb24126e7b67c17ca0a064610ae76e8c8a7a68f (patch) | |
tree | c837ec671882b8537f82ee628c6ad019c8c6e735 | |
parent | f325e4e734e5e486f3b02db176eb629124052b43 (diff) | |
download | gitlab-ce-4fb24126e7b67c17ca0a064610ae76e8c8a7a68f.tar.gz |
Merge branch '24813-project-members-with-developer-access-can-no-longer-create-tags' into 'master'
Create tag after running pre-hooks and pass updated SHA to post-hooks
Closes #24813
See merge request !7700
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r-- | app/models/repository.rb | 5 | ||||
-rw-r--r-- | app/services/git_hooks_service.rb | 6 | ||||
-rw-r--r-- | changelogs/unreleased/24813-project-members-with-developer-access-can-no-longer-create-tags.yml | 4 | ||||
-rw-r--r-- | spec/models/repository_spec.rb | 26 |
4 files changed, 37 insertions, 4 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index fe4b73e9aa4..4170e62e348 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -167,8 +167,9 @@ class Repository options = { message: message, tagger: user_to_committer(user) } if message - GitHooksService.new.execute(user, path_to_repo, oldrev, target, ref) do - rugged.tags.create(tag_name, target, options) + GitHooksService.new.execute(user, path_to_repo, oldrev, target, ref) do |service| + raw_tag = rugged.tags.create(tag_name, target, options) + service.newrev = raw_tag.target_id end find_tag(tag_name) diff --git a/app/services/git_hooks_service.rb b/app/services/git_hooks_service.rb index 172bd85dade..6cd3908d43a 100644 --- a/app/services/git_hooks_service.rb +++ b/app/services/git_hooks_service.rb @@ -1,6 +1,8 @@ class GitHooksService PreReceiveError = Class.new(StandardError) + attr_accessor :oldrev, :newrev, :ref + def execute(user, repo_path, oldrev, newrev, ref) @repo_path = repo_path @user = Gitlab::GlId.gl_id(user) @@ -16,7 +18,7 @@ class GitHooksService end end - yield + yield self run_hook('post-receive') end @@ -25,6 +27,6 @@ class GitHooksService def run_hook(name) hook = Gitlab::Git::Hook.new(name, @repo_path) - hook.trigger(@user, @oldrev, @newrev, @ref) + hook.trigger(@user, oldrev, newrev, ref) end end diff --git a/changelogs/unreleased/24813-project-members-with-developer-access-can-no-longer-create-tags.yml b/changelogs/unreleased/24813-project-members-with-developer-access-can-no-longer-create-tags.yml new file mode 100644 index 00000000000..9254db40742 --- /dev/null +++ b/changelogs/unreleased/24813-project-members-with-developer-access-can-no-longer-create-tags.yml @@ -0,0 +1,4 @@ +--- +title: Pass tag SHA to post-receive hook when tag is created via UI +merge_request: 7700 +author: diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 19b3e7e470d..1158ea9c966 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1275,6 +1275,32 @@ describe Repository, models: true do expect(tag).to be_a(Gitlab::Git::Tag) end + + it 'passes commit SHA to pre-receive and update hooks,\ + and tag SHA to post-receive hook' do + pre_receive_hook = Gitlab::Git::Hook.new('pre-receive', repository.path_to_repo) + update_hook = Gitlab::Git::Hook.new('update', repository.path_to_repo) + post_receive_hook = Gitlab::Git::Hook.new('post-receive', repository.path_to_repo) + + allow(Gitlab::Git::Hook).to receive(:new). + and_return(pre_receive_hook, update_hook, post_receive_hook) + + allow(pre_receive_hook).to receive(:trigger).and_call_original + allow(update_hook).to receive(:trigger).and_call_original + allow(post_receive_hook).to receive(:trigger).and_call_original + + tag = repository.add_tag(user, '8.5', 'master', 'foo') + + commit_sha = repository.commit('master').id + tag_sha = tag.target + + expect(pre_receive_hook).to have_received(:trigger). + with(anything, anything, commit_sha, anything) + expect(update_hook).to have_received(:trigger). + with(anything, anything, commit_sha, anything) + expect(post_receive_hook).to have_received(:trigger). + with(anything, anything, tag_sha, anything) + end end context 'with an invalid target' do |