summaryrefslogtreecommitdiff
path: root/app/helpers/merge_requests_helper.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-09-30 20:50:53 -0700
committerStan Hu <stanhu@gmail.com>2015-09-30 20:50:53 -0700
commit5544d54793c49b072e7b46b847d01307ce3754e7 (patch)
tree6bf63658521f2f6c1aa0704446f3374986a47e38 /app/helpers/merge_requests_helper.rb
parent2714d5b8147cef39343a1c35ba099ebe6445f5e4 (diff)
downloadgitlab-ce-5544d54793c49b072e7b46b847d01307ce3754e7.tar.gz
Include full path of source and target branch names in New Merge Request page
Previous title would only show the group name, which could be confusing. Closes #2875
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
-rw-r--r--app/helpers/merge_requests_helper.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index f8169b4f288..81773e7afcf 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -71,4 +71,17 @@ module MergeRequestsHelper
merge_request.source_branch
end
end
+
+ def format_mr_branch_names(merge_request)
+ source_path = merge_request.source_project_path
+ target_path = merge_request.target_project_path
+ source_branch = merge_request.source_branch
+ target_branch = merge_request.target_branch
+
+ if source_path == target_path
+ [source_branch, target_branch]
+ else
+ ["#{source_path}:#{source_branch}", "#{target_path}:#{target_branch}"]
+ end
+ end
end