Download as
Browse Code »

Commit 539c70c7d64589656cce804282725b97e28e49ff

Authored by Izaak Alpert
1 parent d9959427
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
Showing 9 changed files with 17 additions and 8 deletions   Show diff stats
app/helpers/merge_requests_helper.rb
  Diff comments   View file @539c70c
@@ -33,4 +33,12 @@ module MergeRequestsHelper @@ -33,4 +33,12 @@ module MergeRequestsHelper
33 def ci_build_details_path merge_request 33 def ci_build_details_path merge_request
34 merge_request.source_project.gitlab_ci_service.build_page(merge_request.last_commit.sha) 34 merge_request.source_project.gitlab_ci_service.build_page(merge_request.last_commit.sha)
35 end 35 end
  36 +
  37 + def merge_path_description(merge_request, separator)
  38 + if merge_request.for_fork?
  39 + "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}"
  40 + else
  41 + "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}"
  42 + end
  43 + end
36 end 44 end
app/mailers/emails/merge_requests.rb
  Diff comments   View file @539c70c
@@ -23,7 +23,6 @@ module Emails @@ -23,7 +23,6 @@ module Emails
23 end 23 end
24 end 24 end
25 25
26 -  
27 # Over rides default behavour to show source/target 26 # Over rides default behavour to show source/target
28 # Formats arguments into a String suitable for use as an email subject 27 # Formats arguments into a String suitable for use as an email subject
29 # 28 #
@@ -63,4 +62,5 @@ module Emails @@ -63,4 +62,5 @@ module Emails
63 subject << " | " + extra.join(' | ') if extra.present? 62 subject << " | " + extra.join(' | ') if extra.present?
64 subject 63 subject
65 end 64 end
  65 +
66 end 66 end
app/mailers/notify.rb
  Diff comments   View file @539c70c
@@ -6,6 +6,7 @@ class Notify &lt; ActionMailer::Base @@ -6,6 +6,7 @@ class Notify &lt; ActionMailer::Base
6 6
7 add_template_helper ApplicationHelper 7 add_template_helper ApplicationHelper
8 add_template_helper GitlabMarkdownHelper 8 add_template_helper GitlabMarkdownHelper
  9 + add_template_helper MergeRequestsHelper
9 10
10 default_url_options[:host] = Gitlab.config.gitlab.host 11 default_url_options[:host] = Gitlab.config.gitlab.host
11 default_url_options[:protocol] = Gitlab.config.gitlab.protocol 12 default_url_options[:protocol] = Gitlab.config.gitlab.protocol
app/views/notify/closed_merge_request_email.html.haml
  Diff comments   View file @539c70c
1 %p 1 %p
2 = "Merge Request #{@merge_request.id} was closed by #{@updated_by.name}" 2 = "Merge Request #{@merge_request.id} was closed by #{@updated_by.name}"
3 %p 3 %p
4 - = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request) 4 + = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
5 %p 5 %p
6 - Projects:Branches: #{@merge_request.source_project.path_with_namespace}:#{@merge_request.source_branch} &rarr; #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch} 6 + != merge_path_description(@merge_request, '&rarr;')
7 %p 7 %p
8 Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name} 8 Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
9 9
app/views/notify/closed_merge_request_email.text.haml
  Diff comments   View file @539c70c
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} 3 Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
4 4
5 -Project:Branches: #{@merge_request.source_project.path_with_namespace}:#{@merge_request.source_branch} to #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch} 5 += merge_path_description(@merge_request, 'to')
6 6
7 Author: #{@merge_request.author_name} 7 Author: #{@merge_request.author_name}
8 Assignee: #{@merge_request.assignee_name} 8 Assignee: #{@merge_request.assignee_name}
app/views/notify/merged_merge_request_email.html.haml
  Diff comments   View file @539c70c
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 %p 3 %p
4 = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request) 4 = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
5 %p 5 %p
6 - Projects:Branches: #{@merge_request.source_project.path_with_namespace}:#{@merge_request.source_branch} &rarr; #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch} 6 + != merge_path_description(@merge_request, '&rarr;')
7 %p 7 %p
8 Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name} 8 Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
9 9
app/views/notify/merged_merge_request_email.text.haml
  Diff comments   View file @539c70c
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Merge Request Url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} 3 Merge Request Url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
4 4
5 -Project:Branches: #{@merge_request.source_project.path_with_namespace}:#{@merge_request.source_branch} to #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch} 5 += merge_path_description(@merge_request, 'to')
6 6
7 Author: #{@merge_request.author_name} 7 Author: #{@merge_request.author_name}
8 Assignee: #{@merge_request.assignee_name} 8 Assignee: #{@merge_request.assignee_name}
app/views/notify/new_merge_request_email.html.haml
  Diff comments   View file @539c70c
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 %p 3 %p
4 = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request) 4 = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
5 %p 5 %p
6 - Project:Branches: #{@merge_request.source_project.path_with_namespace}:#{@merge_request.source_branch} &rarr; #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch} 6 + != merge_path_description(@merge_request, '&rarr;')
7 %p 7 %p
8 Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name} 8 Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
9 9
app/views/notify/new_merge_request_email.text.erb
  Diff comments   View file @539c70c
@@ -2,7 +2,7 @@ New Merge Request &lt;%= @merge_request.id %&gt; @@ -2,7 +2,7 @@ New Merge Request &lt;%= @merge_request.id %&gt;
2 2
3 <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> 3 <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
4 4
5 -From: <%= @merge_request.source_project.path_with_namespace%>:<%= @merge_request.source_branch %> to <%= @merge_request.target_project.path_with_namespace%>:<%= @merge_request.target_branch %> 5 + <%= merge_path_description(@merge_request, 'to') %>
6 Author: <%= @merge_request.author_name %> 6 Author: <%= @merge_request.author_name %>
7 Asignee: <%= @merge_request.assignee_name %> 7 Asignee: <%= @merge_request.assignee_name %>
8 8