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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
6afb03ee
Commit
6afb03ee
authored
Feb 20, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove incorrect footer from EmailsOnPush body.
See #1754.
parent
607f0c05
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
app/mailers/emails/projects.rb
app/mailers/emails/projects.rb
+2
-0
app/views/layouts/notify.html.haml
app/views/layouts/notify.html.haml
+1
-1
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+4
-0
No files found.
app/mailers/emails/projects.rb
View file @
6afb03ee
...
...
@@ -38,6 +38,8 @@ module Emails
@subject
<<
@commits
.
first
.
title
end
@disable_footer
=
true
mail
(
from:
sender
(
author_id
),
to:
recipient
,
subject:
@subject
)
...
...
app/views/layouts/notify.html.haml
View file @
6afb03ee
...
...
@@ -27,5 +27,5 @@
-
if
@target_url
#{
link_to
"View it on GitLab"
,
@target_url
}
=
email_action
@target_url
-
if
@project
-
if
@project
&&
!
@disable_footer
You're receiving this notification because you are a member of the
#{
link_to_unless
@target_url
,
@project
.
name_with_namespace
,
namespace_project_url
(
@project
.
namespace
,
@project
)
}
project team.
spec/mailers/notify_spec.rb
View file @
6afb03ee
...
...
@@ -597,6 +597,10 @@ describe Notify do
it
'contains a link to the diff'
do
is_expected
.
to
have_body_text
/
#{
diff_path
}
/
end
it
'doesn not contain the misleading footer'
do
is_expected
.
not_to
have_body_text
/you are a member of/
end
end
describe
'email on push with a single commit'
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