Download as
Browse Code »

Commit edd6028bdb1f0e8ba6744540e9d3f324ab40126d

Authored by Pierre de La Morinerie
1 parent 7ba0b502
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Remove custom link to target in notification emails 

Every email has a different way of showing a link to the discussion on
the website. We don't need this anymore, as we now have a standard
"View in GitLab" link in the footer of every email.
Showing 14 changed files with 1 additions and 36 deletions   Show diff stats
app/mailers/emails/notes.rb
  Diff comments   View file @edd6028
@@ -14,7 +14,7 @@ module Emails @@ -14,7 +14,7 @@ module Emails
14 @note = Note.find(note_id) 14 @note = Note.find(note_id)
15 @issue = @note.noteable 15 @issue = @note.noteable
16 @project = @note.project 16 @project = @note.project
17 - @target_url = project_issue_url(@project, @issue) 17 + @target_url = project_issue_url(@project, @issue, anchor: "note_#{@note.id}")
18 mail(from: sender(@note.author_id), 18 mail(from: sender(@note.author_id),
19 to: recipient(recipient_id), 19 to: recipient(recipient_id),
20 subject: subject("#{@issue.title} (##{@issue.iid})")) 20 subject: subject("#{@issue.title} (##{@issue.iid})"))
app/views/notify/closed_issue_email.html.haml
  Diff comments   View file @edd6028
1 %p 1 %p
2 = "Issue was closed by #{@updated_by.name}" 2 = "Issue was closed by #{@updated_by.name}"
3 -%p  
4 - = "Issue ##{@issue.iid}"  
5 - = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title  
app/views/notify/closed_merge_request_email.html.haml
  Diff comments   View file @edd6028
1 %p 1 %p
2 = "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}" 2 = "Merge Request #{@merge_request.iid} 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.target_project, @merge_request)  
5 -%p  
6 != merge_path_description(@merge_request, '→') 4 != merge_path_description(@merge_request, '→')
7 %p 5 %p
8 Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} 6 Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
app/views/notify/group_access_granted_email.html.haml
  Diff comments   View file @edd6028
1 %p 1 %p
2 = "You have been granted #{@membership.human_access} access to group" 2 = "You have been granted #{@membership.human_access} access to group"
3 -%p  
4 - = link_to group_url(@group) do  
5 - = @group.name  
app/views/notify/issue_status_changed_email.html.haml
  Diff comments   View file @edd6028
1 %p 1 %p
2 = "Issue was #{@issue_status} by #{@updated_by.name}" 2 = "Issue was #{@issue_status} by #{@updated_by.name}"
3 -%p  
4 - = "Issue ##{@issue.iid}"  
5 - = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title  
app/views/notify/merged_merge_request_email.html.haml
  Diff comments   View file @edd6028
1 %p 1 %p
2 = "Merge Request #{@merge_request.iid} was merged" 2 = "Merge Request #{@merge_request.iid} was merged"
3 %p 3 %p
4 - = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)  
5 -%p  
6 != merge_path_description(@merge_request, '→') 4 != merge_path_description(@merge_request, '→')
7 %p 5 %p
8 Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} 6 Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
app/views/notify/new_issue_email.html.haml
  Diff comments   View file @edd6028
1 %p 1 %p
2 New Issue was created. 2 New Issue was created.
3 %p 3 %p
4 - = "Issue ##{@issue.iid}"  
5 - = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title  
6 -%p  
7 Author: #{@issue.author_name} 4 Author: #{@issue.author_name}
8 %p 5 %p
9 Assignee: #{@issue.assignee_name} 6 Assignee: #{@issue.assignee_name}
app/views/notify/new_merge_request_email.html.haml
  Diff comments   View file @edd6028
1 %p 1 %p
2 = "New Merge Request ##{@merge_request.iid}" 2 = "New Merge Request ##{@merge_request.iid}"
3 %p 3 %p
4 - = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)  
5 -%p  
6 != merge_path_description(@merge_request, '→') 4 != merge_path_description(@merge_request, '→')
7 %p 5 %p
8 Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} 6 Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
app/views/notify/note_commit_email.html.haml
  Diff comments   View file @edd6028
1 -%p  
2 - = "New comment for Commit #{@commit.short_id}"  
3 - = link_to_gfm truncate(@commit.title, length: 16), project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}")  
4 = render 'note_message' 1 = render 'note_message'
5 2
app/views/notify/note_issue_email.html.haml
  Diff comments   View file @edd6028
1 -%p  
2 - = "New comment for Issue ##{@issue.iid}"  
3 - = link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")  
4 = render 'note_message' 1 = render 'note_message'
app/views/notify/note_merge_request_email.html.haml
  Diff comments   View file @edd6028
@@ -4,5 +4,4 @@ @@ -4,5 +4,4 @@
4 - else 4 - else
5 = link_to "New comment", project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}") 5 = link_to "New comment", project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
6 for Merge Request ##{@merge_request.iid} 6 for Merge Request ##{@merge_request.iid}
7 - %cite "#{truncate(@merge_request.title, length: 20)}"  
8 = render 'note_message' 7 = render 'note_message'
app/views/notify/note_wall_email.html.haml
  Diff comments   View file @edd6028
1 -%p  
2 - New message on  
3 - = link_to "Project Wall", project_wall_url(@note.project, anchor: "note_#{@note.id}")  
4 -  
5 = render 'note_message' 1 = render 'note_message'
app/views/notify/reassigned_issue_email.html.haml
  Diff comments   View file @edd6028
1 %p 1 %p
2 - = "Reassigned Issue ##{@issue.iid}"  
3 - = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue)  
4 -%p  
5 Assignee changed 2 Assignee changed
6 - if @previous_assignee 3 - if @previous_assignee
7 from 4 from
app/views/notify/reassigned_merge_request_email.html.haml
  Diff comments   View file @edd6028
1 %p 1 %p
2 - = "Reassigned Merge Request ##{@merge_request.iid}"  
3 - = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.target_project, @merge_request)  
4 -%p  
5 Assignee changed 2 Assignee changed
6 - if @previous_assignee 3 - if @previous_assignee
7 from 4 from