diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-10-31 14:09:39 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-10-31 14:09:39 +0000 |
commit | 490776517c394ced2780159fa3800e2accc27601 (patch) | |
tree | 1cea0795bf80cf7a1431d356832cc798d9892edb /lib/api | |
parent | 3645e684bf854b3588f5b5a8e069c6a6778a184a (diff) | |
parent | fa3bbd449efb69a42a2347c3c3fa08cd822c2471 (diff) | |
download | gitlab-ce-490776517c394ced2780159fa3800e2accc27601.tar.gz |
Merge branch '22271-drone-tag-pipeline-build' into 'master'
Fix lightweight tags not processed correctly by GitTagPushService
## What does this MR do?
Fix lightweight tags not processed correctly by GitTagPushService
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
Lightweight tags were being processed incorrectly, causing tag triggers to receive wrong information and not function properly.
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #22271
See merge request !6532
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index feaa0c213bf..ab9d2d54f4b 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -138,7 +138,7 @@ module API expose :name expose :commit do |repo_branch, options| - options[:project].repository.commit(repo_branch.target) + options[:project].repository.commit(repo_branch.dereferenced_target) end expose :protected do |repo_branch, options| @@ -523,7 +523,7 @@ module API expose :name, :message expose :commit do |repo_tag, options| - options[:project].repository.commit(repo_tag.target) + options[:project].repository.commit(repo_tag.dereferenced_target) end expose :release, using: Entities::Release do |repo_tag, options| |