mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-20 10:06:04 +10:00
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.
This commit is contained in:
@@ -14,7 +14,7 @@ module Emails
|
||||
@note = Note.find(note_id)
|
||||
@issue = @note.noteable
|
||||
@project = @note.project
|
||||
@target_url = project_issue_url(@project, @issue)
|
||||
@target_url = project_issue_url(@project, @issue, anchor: "note_#{@note.id}")
|
||||
mail(from: sender(@note.author_id),
|
||||
to: recipient(recipient_id),
|
||||
subject: subject("#{@issue.title} (##{@issue.iid})"))
|
||||
|
||||
@@ -1,5 +1,2 @@
|
||||
%p
|
||||
= "Issue was closed by #{@updated_by.name}"
|
||||
%p
|
||||
= "Issue ##{@issue.iid}"
|
||||
= link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
%p
|
||||
= "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}"
|
||||
%p
|
||||
= link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
|
||||
%p
|
||||
!= merge_path_description(@merge_request, '→')
|
||||
%p
|
||||
|
||||
@@ -1,5 +1,2 @@
|
||||
%p
|
||||
= "You have been granted #{@membership.human_access} access to group"
|
||||
%p
|
||||
= link_to group_url(@group) do
|
||||
= @group.name
|
||||
|
||||
@@ -1,5 +1,2 @@
|
||||
%p
|
||||
= "Issue was #{@issue_status} by #{@updated_by.name}"
|
||||
%p
|
||||
= "Issue ##{@issue.iid}"
|
||||
= link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
%p
|
||||
= "Merge Request #{@merge_request.iid} was merged"
|
||||
%p
|
||||
= link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
|
||||
%p
|
||||
!= merge_path_description(@merge_request, '→')
|
||||
%p
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
%p
|
||||
New Issue was created.
|
||||
%p
|
||||
= "Issue ##{@issue.iid}"
|
||||
= link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
|
||||
%p
|
||||
Author: #{@issue.author_name}
|
||||
%p
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
%p
|
||||
= "New Merge Request ##{@merge_request.iid}"
|
||||
%p
|
||||
= link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
|
||||
%p
|
||||
!= merge_path_description(@merge_request, '→')
|
||||
%p
|
||||
|
||||
@@ -1,5 +1,2 @@
|
||||
%p
|
||||
= "New comment for Commit #{@commit.short_id}"
|
||||
= link_to_gfm truncate(@commit.title, length: 16), project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}")
|
||||
= render 'note_message'
|
||||
|
||||
|
||||
@@ -1,4 +1 @@
|
||||
%p
|
||||
= "New comment for Issue ##{@issue.iid}"
|
||||
= link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")
|
||||
= render 'note_message'
|
||||
|
||||
@@ -4,5 +4,4 @@
|
||||
- else
|
||||
= link_to "New comment", project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
|
||||
for Merge Request ##{@merge_request.iid}
|
||||
%cite "#{truncate(@merge_request.title, length: 20)}"
|
||||
= render 'note_message'
|
||||
|
||||
@@ -1,5 +1 @@
|
||||
%p
|
||||
New message on
|
||||
= link_to "Project Wall", project_wall_url(@note.project, anchor: "note_#{@note.id}")
|
||||
|
||||
= render 'note_message'
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
%p
|
||||
= "Reassigned Issue ##{@issue.iid}"
|
||||
= link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue)
|
||||
%p
|
||||
Assignee changed
|
||||
- if @previous_assignee
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
%p
|
||||
= "Reassigned Merge Request ##{@merge_request.iid}"
|
||||
= link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.target_project, @merge_request)
|
||||
%p
|
||||
Assignee changed
|
||||
- if @previous_assignee
|
||||
|
||||
Reference in New Issue
Block a user