diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 18:35:11 +0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-18 06:48:03 +0400 |
| commit | 539c70c7d64589656cce804282725b97e28e49ff (patch) | |
| tree | c181018c64097323006b2d303b810fdb99035997 /app/helpers/merge_requests_helper.rb | |
| parent | d99594273d57b2d5ed7c748b3185712960b89478 (diff) | |
Update emails to describe path using for_fork?
Forked MR's will print
Project:Branch <source_project_with_path>:<source_branch> -> <target_project_with_path>:<target_branch>
Non forked MR's will print
Branch <source_branch> -> <target_branch>
Change-Id: I89399aec2e7fde8e4b64b110a48099a95ae4f038
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 0fb4709e9c3..4ba48aa4339 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -33,4 +33,12 @@ module MergeRequestsHelper def ci_build_details_path merge_request merge_request.source_project.gitlab_ci_service.build_page(merge_request.last_commit.sha) end + + def merge_path_description(merge_request, separator) + if merge_request.for_fork? + "Project:Branches: #{@merge_request.source_project.path_with_namespace}:#{@merge_request.source_branch} #{separator} #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch}" + else + "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}" + end + end end |