summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author🙈 jacopo beschi 🙉 <intrip@gmail.com>2019-09-11 16:33:34 +0000
committer🙈 jacopo beschi 🙉 <intrip@gmail.com>2019-09-11 16:33:34 +0000
commitbbe6d2608e952fde5606b064ddcf2ef04f89972c (patch)
tree2c49c2ef988b14ae1ddb3abb0c38f4b98b9523af
parent63ebddd2c5f83f58c83ff11928e18a6e76c5bbfc (diff)
downloadgitlab-ce-50847-automatically-created-mr-uses-wrong-source-branch-when-branching-from-tag.tar.gz
Apply suggestion to app/services/merge_requests/create_from_issue_service.rb50847-automatically-created-mr-uses-wrong-source-branch-when-branching-from-tag
-rw-r--r--app/services/merge_requests/create_from_issue_service.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/merge_requests/create_from_issue_service.rb b/app/services/merge_requests/create_from_issue_service.rb
index 64348614fde..200a34cae04 100644
--- a/app/services/merge_requests/create_from_issue_service.rb
+++ b/app/services/merge_requests/create_from_issue_service.rb
@@ -90,10 +90,10 @@ module MergeRequests
end
def target_branch
- if ref_is_tag? || !valid_ref?
- default_branch
- else
+ if ref_is_branch?
@ref
+ else
+ default_branch
end
end