diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-11-24 14:58:05 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-11-28 20:01:38 +0300 |
| commit | 3c6a4d63636ba41dad0ce63cf536761fc3b5ef64 (patch) | |
| tree | 9fafbe59d20f94c22e27dd35a8ddd1297ca6a54b /app/services/merge_requests/build_service.rb | |
| parent | 7c1e54d58d7ee0308b865d9563f1dfeb54568e16 (diff) | |
Ensure MRs always use branch refs for comparison
If a merge request was created with a branch name that also matched a tag name,
we'd generate a comparison to or from the tag respectively, rather than the
branch. Merging would still use the branch, of course.
To avoid this, ensure that when we get the branch heads, we prepend the
reference prefix for branches, which will ensure that we generate the correct
comparison.
Diffstat (limited to 'app/services/merge_requests/build_service.rb')
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index f3b99e1ec8c..8223e5fed7f 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -18,7 +18,17 @@ module MergeRequests attr_accessor :merge_request - delegate :target_branch, :source_branch, :source_project, :target_project, :compare_commits, :wip_title, :description, :errors, to: :merge_request + delegate :target_branch, + :target_branch_ref, + :target_project, + :source_branch, + :source_branch_ref, + :source_project, + :compare_commits, + :wip_title, + :description, + :errors, + to: :merge_request def find_source_project return source_project if source_project.present? && can?(current_user, :read_project, source_project) @@ -54,10 +64,10 @@ module MergeRequests def compare_branches compare = CompareService.new( source_project, - source_branch + source_branch_ref ).execute( target_project, - target_branch + target_branch_ref ) if compare |