Commit 6afb03ee authored by Douwe Maan's avatar Douwe Maan

Remove incorrect footer from EmailsOnPush body.

See #1754.
parent 607f0c05
...@@ -38,6 +38,8 @@ module Emails ...@@ -38,6 +38,8 @@ module Emails
@subject << @commits.first.title @subject << @commits.first.title
end end
@disable_footer = true
mail(from: sender(author_id), mail(from: sender(author_id),
to: recipient, to: recipient,
subject: @subject) subject: @subject)
......
...@@ -27,5 +27,5 @@ ...@@ -27,5 +27,5 @@
- if @target_url - if @target_url
#{link_to "View it on GitLab", @target_url} #{link_to "View it on GitLab", @target_url}
= email_action @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. 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.
...@@ -597,6 +597,10 @@ describe Notify do ...@@ -597,6 +597,10 @@ describe Notify do
it 'contains a link to the diff' do it 'contains a link to the diff' do
is_expected.to have_body_text /#{diff_path}/ is_expected.to have_body_text /#{diff_path}/
end end
it 'doesn not contain the misleading footer' do
is_expected.not_to have_body_text /you are a member of/
end
end end
describe 'email on push with a single commit' do describe 'email on push with a single commit' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment