Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
5443021a
Commit
5443021a
authored
Aug 06, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update notifications mails and notify specs for GFM
parent
9a0b763e
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
34 additions
and
35 deletions
+34
-35
app/mailers/notify.rb
app/mailers/notify.rb
+10
-9
app/views/notify/new_issue_email.html.haml
app/views/notify/new_issue_email.html.haml
+2
-3
app/views/notify/new_merge_request_email.html.haml
app/views/notify/new_merge_request_email.html.haml
+2
-2
app/views/notify/note_commit_email.html.haml
app/views/notify/note_commit_email.html.haml
+2
-2
app/views/notify/note_issue_email.html.haml
app/views/notify/note_issue_email.html.haml
+2
-4
app/views/notify/note_merge_request_email.html.haml
app/views/notify/note_merge_request_email.html.haml
+2
-2
app/views/notify/note_wiki_email.html.haml
app/views/notify/note_wiki_email.html.haml
+2
-3
app/views/notify/reassigned_issue_email.html.haml
app/views/notify/reassigned_issue_email.html.haml
+2
-2
app/views/notify/reassigned_merge_request_email.html.haml
app/views/notify/reassigned_merge_request_email.html.haml
+2
-2
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+8
-6
No files found.
app/mailers/notify.rb
View file @
5443021a
...
...
@@ -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
app/views/notify/new_issue_email.html.haml
View file @
5443021a
...
...
@@ -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
app/views/notify/new_merge_request_email.html.haml
View file @
5443021a
...
...
@@ -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"
}
...
...
app/views/notify/note_commit_email.html.haml
View file @
5443021a
...
...
@@ -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"
}
...
...
app/views/notify/note_issue_email.html.haml
View file @
5443021a
...
...
@@ -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"
}
...
...
app/views/notify/note_merge_request_email.html.haml
View file @
5443021a
...
...
@@ -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"
}
...
...
app/views/notify/note_wiki_email.html.haml
View file @
5443021a
...
...
@@ -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"
}
...
...
app/views/notify/reassigned_issue_email.html.haml
View file @
5443021a
...
...
@@ -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"
}
...
...
app/views/notify/reassigned_merge_request_email.html.haml
View file @
5443021a
...
...
@@ -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"
}
...
...
spec/mailers/notify_spec.rb
View file @
5443021a
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment