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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
903090d1
Commit
903090d1
authored
Oct 08, 2013
by
Abe Hassan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the sigil for merge request emails
parent
358426d6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/mailers/emails/notes.rb
app/mailers/emails/notes.rb
+1
-1
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+1
-1
No files found.
app/mailers/emails/notes.rb
View file @
903090d1
...
...
@@ -18,7 +18,7 @@ module Emails
@note
=
Note
.
find
(
note_id
)
@merge_request
=
@note
.
noteable
@project
=
@note
.
project
mail
(
to:
recipient
(
recipient_id
),
subject:
subject
(
"note for merge request
!
#{
@merge_request
.
iid
}
"
))
mail
(
to:
recipient
(
recipient_id
),
subject:
subject
(
"note for merge request
#
#{
@merge_request
.
iid
}
"
))
end
def
note_wall_email
(
recipient_id
,
note_id
)
...
...
spec/mailers/notify_spec.rb
View file @
903090d1
...
...
@@ -320,7 +320,7 @@ describe Notify do
it_behaves_like
'a note email'
it
'has the correct subject'
do
should
have_subject
/note for merge request
!
#{
merge_request
.
iid
}
/
should
have_subject
/note for merge request
#
#{
merge_request
.
iid
}
/
end
it
'contains a link to the merge request 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