Update notifications mails and notify specs for GFM

10 files changed, 34 insertions, 35 deletions

diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index a6e986cd9ed..ea404247d2a 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -17,22 +17,23 @@ class Notify < ActionMailer::Base
   def new_issue_email(issue_id)
     @issue = Issue.find(issue_id)
     @project = @issue.project
-    mail(:to => @issue.assignee_email, :subject => "gitlab | New Issue was created")
+    mail(:to => @issue.assignee_email, :subject => "gitlab | new issue ##{@issue.id} | #{@issue.title} | #{@project.name}")
   end
 
   def note_wall_email(recipient_id, note_id)
     recipient = User.find(recipient_id)
     @note = Note.find(note_id)
     @project = @note.project
-    mail(:to => recipient.email, :subject => "gitlab | #{@note.project_name} ")
+    mail(:to => recipient.email, :subject => "gitlab | #{@project.name}")
   end
 
   def note_commit_email(recipient_id, note_id)
     recipient = User.find(recipient_id)
     @note = Note.find(note_id)
     @commit = @note.target
+    @commit = CommitDecorator.decorate(@commit)
     @project = @note.project
-    mail(:to => recipient.email, :subject => "gitlab | note for commit | #{@note.project_name} ")
+    mail(:to => recipient.email, :subject => "gitlab | note for commit #{@commit.short_id} | #{@commit.title} | #{@project.name}")
   end
 
   def note_merge_request_email(recipient_id, note_id)
@@ -40,7 +41,7 @@ class Notify < ActionMailer::Base
     @note = Note.find(note_id)
     @merge_request = @note.noteable
     @project = @note.project
-    mail(:to => recipient.email, :subject => "gitlab | note for merge request | #{@note.project_name} ")
+    mail(:to => recipient.email, :subject => "gitlab | note for merge request !#{@merge_request.id} | #{@project.name}")
   end
 
   def note_issue_email(recipient_id, note_id)
@@ -48,7 +49,7 @@ class Notify < ActionMailer::Base
     @note = Note.find(note_id)
     @issue = @note.noteable
     @project = @note.project
-    mail(:to => recipient.email, :subject => "gitlab | note for issue #{@issue.id} | #{@note.project_name} ")
+    mail(:to => recipient.email, :subject => "gitlab | note for issue ##{@issue.id} | #{@project.name}")
   end
 
   def note_wiki_email(recipient_id, note_id)
@@ -56,13 +57,13 @@ class Notify < ActionMailer::Base
     @note = Note.find(note_id)
     @wiki = @note.noteable
     @project = @note.project
-    mail(:to => recipient.email, :subject => "gitlab | note for wiki | #{@note.project_name}")
+    mail(:to => recipient.email, :subject => "gitlab | note for wiki | #{@project.name}")
   end
 
   def new_merge_request_email(merge_request_id)
     @merge_request = MergeRequest.find(merge_request_id)
     @project = @merge_request.project
-    mail(:to => @merge_request.assignee_email, :subject => "gitlab | new merge request | #{@merge_request.title} ")
+    mail(:to => @merge_request.assignee_email, :subject => "gitlab | new merge request !#{@merge_request.id} | #{@merge_request.title} | #{@project.name}")
   end
 
   def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id)
@@ -70,7 +71,7 @@ class Notify < ActionMailer::Base
     @merge_request = MergeRequest.find(merge_request_id)
     @previous_assignee ||= User.find(previous_assignee_id)
     @project = @merge_request.project
-    mail(:to => recipient.email, :subject => "gitlab | merge request changed | #{@merge_request.title} ")
+    mail(:to => recipient.email, :subject => "gitlab | changed merge request !#{@merge_request.id} | #{@merge_request.title} | #{@project.name}")
   end
 
   def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id)
@@ -78,6 +79,6 @@ class Notify < ActionMailer::Base
     @issue = Issue.find(issue_id)
     @previous_assignee ||= User.find(previous_assignee_id)
     @project = @issue.project
-    mail(:to => recipient.email, :subject => "gitlab | changed issue | #{@issue.title} ")
+    mail(:to => recipient.email, :subject => "gitlab | changed issue ##{@issue.id} | #{@issue.title} | #{@project.name}")
   end
 end
diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml
index dd6f50c0686..08eea5538fb 100644
--- a/app/views/notify/new_issue_email.html.haml
+++ b/app/views/notify/new_issue_email.html.haml
@@ -10,7 +10,6 @@
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
       %td{:align => "left", :style => "padding: 20px 0 0;"}
         %h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          = link_to project_issue_url(@issue.project, @issue), :title => @issue.title do
-            = "Issue ##{@issue.id.to_s}"
-            = truncate(@issue.title, :length => 45)
+          = "Issue ##{@issue.id}"
+          = link_to_gfm truncate(@issue.title, :length => 45), project_issue_url(@issue.project, @issue), :title => @issue.title
         %br
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml
index f7ec01e84b3..4bacff5060c 100644
--- a/app/views/notify/new_merge_request_email.html.haml
+++ b/app/views/notify/new_merge_request_email.html.haml
@@ -4,8 +4,8 @@
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
       %td{:align => "left", :style => "padding: 20px 0 0;"}
         %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          New Merge Request
-          = link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request)
+          = "New Merge Request !#{@merge_request.id}"
+          = link_to_gfm truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request)
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
     %tr
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
diff --git a/app/views/notify/note_commit_email.html.haml b/app/views/notify/note_commit_email.html.haml
index 99b89632ea4..6994f1a6340 100644
--- a/app/views/notify/note_commit_email.html.haml
+++ b/app/views/notify/note_commit_email.html.haml
@@ -4,8 +4,8 @@
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
       %td{:align => "left", :style => "padding: 20px 0 0;"}
         %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          New comment for commit
-          = link_to truncate(@commit.id.to_s, :length => 16), project_commit_url(@note.project, :id => @commit.id, :anchor => "note_#{@note.id}")
+          = "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}")
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
     %tr
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
diff --git a/app/views/notify/note_issue_email.html.haml b/app/views/notify/note_issue_email.html.haml
index 17d58bdec73..34d9b800c1e 100644
--- a/app/views/notify/note_issue_email.html.haml
+++ b/app/views/notify/note_issue_email.html.haml
@@ -4,10 +4,8 @@
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
       %td{:align => "left", :style => "padding: 20px 0 0;"}
         %h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          New comment -
-          = link_to project_issue_url(@issue.project, @issue, :anchor => "note_#{@note.id}") do
-            = "Issue ##{@issue.id.to_s}"
-            = truncate(@issue.title, :length => 35)
+          = "New comment for Issue ##{@issue.id}"
+          = link_to_gfm truncate(@issue.title, :length => 35), project_issue_url(@issue.project, @issue, :anchor => "note_#{@note.id}")
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
     %tr
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml
index 9c2284a6457..20e7679d4dc 100644
--- a/app/views/notify/note_merge_request_email.html.haml
+++ b/app/views/notify/note_merge_request_email.html.haml
@@ -4,8 +4,8 @@
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
       %td{:align => "left", :style => "padding: 20px 0 0;"}
         %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          New comment for Merge Request
-          = link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request, :anchor => "note_#{@note.id}")
+          = "New comment for Merge Request !#{@merge_request.id}"
+          = link_to_gfm truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request, :anchor => "note_#{@note.id}")
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
     %tr
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
diff --git a/app/views/notify/note_wiki_email.html.haml b/app/views/notify/note_wiki_email.html.haml
index 91270682c6b..591319515f6 100644
--- a/app/views/notify/note_wiki_email.html.haml
+++ b/app/views/notify/note_wiki_email.html.haml
@@ -4,9 +4,8 @@
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
       %td{:align => "left", :style => "padding: 20px 0 0;"}
         %h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          New comment -
-          = link_to project_issue_url(@wiki.project, @wiki, :anchor => "note_#{@note.id}") do
-            = "Wiki ##{@wiki.title.to_s}"
+          New comment for Wiki page
+          = link_to_gfm @wiki.title, project_issue_url(@wiki.project, @wiki, :anchor => "note_#{@note.id}")
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
     %tr
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
diff --git a/app/views/notify/reassigned_issue_email.html.haml b/app/views/notify/reassigned_issue_email.html.haml
index 43579b274d3..26ddc13336a 100644
--- a/app/views/notify/reassigned_issue_email.html.haml
+++ b/app/views/notify/reassigned_issue_email.html.haml
@@ -4,8 +4,8 @@
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
       %td{:align => "left", :style => "padding: 20px 0 0;"}
         %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          Reassigned Issue
-          = link_to truncate(@issue.title, :length => 16), project_issue_url(@issue.project, @issue)
+          = "Reassigned Issue ##{@issue.id}"
+          = link_to_gfm truncate(@issue.title, :length => 16), project_issue_url(@issue.project, @issue)
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
     %tr
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
diff --git a/app/views/notify/reassigned_merge_request_email.html.haml b/app/views/notify/reassigned_merge_request_email.html.haml
index 30b1f4fec42..e9f657c131f 100644
--- a/app/views/notify/reassigned_merge_request_email.html.haml
+++ b/app/views/notify/reassigned_merge_request_email.html.haml
@@ -4,8 +4,8 @@
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
       %td{:align => "left", :style => "padding: 20px 0 0;"}
         %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          Reassigned Merge Request
-          = link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request)
+          = "Reassigned Merge Request !#{@merge_request.id}"
+          = link_to_gfm truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request)
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
     %tr
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 4df771b97fe..010f063a98d 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -60,7 +60,7 @@ describe Notify do
           it_behaves_like 'an assignee email'
 
           it 'has the correct subject' do
-            should have_subject /New Issue was created/
+            should have_subject /new issue ##{issue.id}/
           end
 
           it 'contains a link to the new issue' do
@@ -102,7 +102,7 @@ describe Notify do
           it_behaves_like 'an assignee email'
 
           it 'has the correct subject' do
-            should have_subject /new merge request/
+            should have_subject /new merge request !#{merge_request.id}/
           end
 
           it 'contains a link to the new merge request' do
@@ -126,7 +126,7 @@ describe Notify do
           it_behaves_like 'a multiple recipients email'
 
           it 'has the correct subject' do
-            should have_subject /merge request changed/
+            should have_subject /changed merge request !#{merge_request.id}/
           end
 
           it 'contains the name of the previous assignee' do
@@ -188,6 +188,8 @@ describe Notify do
           mock(:commit).tap do |commit|
             commit.stub(:id).and_return('fauxsha1')
             commit.stub(:project).and_return(project)
+            commit.stub(:short_id).and_return('fauxsha1')
+            commit.stub(:safe_message).and_return('some message')
           end
         end
         before(:each) { note.stub(:target).and_return(commit) }
@@ -197,7 +199,7 @@ describe Notify do
         it_behaves_like 'a note email'
 
         it 'has the correct subject' do
-          should have_subject /note for commit/
+          should have_subject /note for commit #{commit.short_id}/
         end
 
         it 'contains a link to the commit' do
@@ -215,7 +217,7 @@ describe Notify do
         it_behaves_like 'a note email'
 
         it 'has the correct subject' do
-          should have_subject /note for merge request/
+          should have_subject /note for merge request !#{merge_request.id}/
         end
 
         it 'contains a link to the merge request note' do
@@ -233,7 +235,7 @@ describe Notify do
         it_behaves_like 'a note email'
 
         it 'has the correct subject' do
-          should have_subject /note for issue #{issue.id}/
+          should have_subject /note for issue ##{issue.id}/
         end
 
         it 'contains a link to the issue note' do