diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-28 21:01:09 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-28 21:01:09 +0300 |
| commit | becf29e3ab3463a8a1f3c6ed7bbfd7d2dcc49ea0 (patch) | |
| tree | a56172dc723850b3baf3452a575bb77c461dbe64 /app/controllers | |
| parent | 2081650afc6417daa5933146c0922ff622a958b7 (diff) | |
| parent | 3c6a4d63636ba41dad0ce63cf536761fc3b5ef64 (diff) | |
Merge branch '40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name' into 'master'
Resolve "Merge request generates wrong diff when branch and tag have the same name"
Closes #40530
See merge request gitlab-org/gitlab-ce!15591
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests/creations_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index 764a9c7111e..1511fc08c89 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -65,7 +65,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap if params[:ref].present? @ref = params[:ref] - @commit = @repository.commit("refs/heads/#{@ref}") + @commit = @repository.commit(Gitlab::Git::BRANCH_REF_PREFIX + @ref) end render layout: false @@ -76,7 +76,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap if params[:ref].present? @ref = params[:ref] - @commit = @target_project.commit("refs/heads/#{@ref}") + @commit = @target_project.commit(Gitlab::Git::BRANCH_REF_PREFIX + @ref) end render layout: false |