diff options
| author | Athar Hameed <athar@gitlab.com> | 2018-06-08 15:28:43 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-08 15:28:43 +0300 |
| commit | c22e51e8c1372e844aa3c4447ebea371d77d0c89 (patch) | |
| tree | 4538509a53d1b1108e953147230fc7fb54553481 /app/services | |
| parent | f068479e637c52b839c3474a87c2d01e82ba0829 (diff) | |
Resolve "Automatically created MR uses wrong target branch (when branching from Tag)"
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/create_from_issue_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/merge_requests/create_from_issue_service.rb b/app/services/merge_requests/create_from_issue_service.rb index cf687b71d16..3407b312700 100644 --- a/app/services/merge_requests/create_from_issue_service.rb +++ b/app/services/merge_requests/create_from_issue_service.rb @@ -41,7 +41,9 @@ module MergeRequests end def ref - @ref || project.default_branch || 'master' + return @ref if project.repository.branch_exists?(@ref) + + project.default_branch || 'master' end def merge_request |