diff options
| author | Sanster <cwq1913@163.com> | 2017-02-24 20:13:42 +0800 |
|---|---|---|
| committer | Sanster <cwq1913@163.com> | 2017-03-24 06:28:21 +0800 |
| commit | 4d6e377cd9929be7826614dc986deba4ad03438c (patch) | |
| tree | cdb3ecb5f2c99bac48f1e0bb215c9d1c30e5a7b4 /app/controllers/projects/merge_requests_controller.rb | |
| parent | 6eeba4b18214e054bbdebd66f53586fc09256130 (diff) | |
| download | gitlab-ce-4d6e377cd9929be7826614dc986deba4ad03438c.tar.gz | |
fix new MR form erroneously selects tag as source when branch of same name exists #23237
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rwxr-xr-x[-rw-r--r--] | app/controllers/projects/merge_requests_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 677a8a1a73a..2fadf7c8c81 100644..100755 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -402,7 +402,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController if params[:ref].present? @ref = params[:ref] - @commit = @repository.commit(@ref) + @commit = @repository.commit("refs/heads/#{@ref}") end render layout: false @@ -413,7 +413,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController if params[:ref].present? @ref = params[:ref] - @commit = @target_project.commit(@ref) + @commit = @target_project.commit("refs/heads/#{@ref}") end render layout: false |