diff options
| author | Drew Blessing <drew.blessing@buckle.com> | 2013-11-08 09:04:36 -0600 |
|---|---|---|
| committer | Drew Blessing <drew.blessing@buckle.com> | 2013-11-08 10:20:15 -0600 |
| commit | 57ad81a9c55352d39a88a5c878cc81f59f5328fa (patch) | |
| tree | 0891a6da96443450f788d06fa5487fef1c0f0482 /app/views | |
| parent | 02484930e161f773a205bb1c1d29a8664755fd60 (diff) | |
| download | gitlab-ce-57ad81a9c55352d39a88a5c878cc81f59f5328fa.tar.gz | |
Fix minor errors/annoyances in email templates
There was some funny syntax in merge request email templates. There was a ! before
the merge request number when there probably should be a #. This may be some carry over
from markdown but should not be in email templates. There were also some capitalization
discrepancies among the subject lines. For those OCD people out there I standardized the
capitalization. :)
Diffstat (limited to 'app/views')
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml index 6b2782ebb0b..321f9418ded 100644 --- a/app/views/notify/new_merge_request_email.html.haml +++ b/app/views/notify/new_merge_request_email.html.haml @@ -1,5 +1,5 @@ %p - = "New Merge Request !#{@merge_request.iid}" + = "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 diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb index 2d27350486e..16be4bb619f 100644 --- a/app/views/notify/new_merge_request_email.text.erb +++ b/app/views/notify/new_merge_request_email.text.erb @@ -1,4 +1,4 @@ -New Merge Request <%= @merge_request.iid %> +New Merge Request #<%= @merge_request.iid %> <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> diff --git a/app/views/notify/reassigned_merge_request_email.html.haml b/app/views/notify/reassigned_merge_request_email.html.haml index 3a615f86e69..d2d82d36c48 100644 --- a/app/views/notify/reassigned_merge_request_email.html.haml +++ b/app/views/notify/reassigned_merge_request_email.html.haml @@ -1,5 +1,5 @@ %p - = "Reassigned Merge Request !#{@merge_request.iid}" + = "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 diff --git a/app/views/notify/reassigned_merge_request_email.text.erb b/app/views/notify/reassigned_merge_request_email.text.erb index eecf055ff6f..87a7847e06d 100644 --- a/app/views/notify/reassigned_merge_request_email.text.erb +++ b/app/views/notify/reassigned_merge_request_email.text.erb @@ -1,4 +1,4 @@ -Reassigned Merge Request <%= @merge_request.iid %> +Reassigned Merge Request #<%= @merge_request.iid %> <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> |