diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb index f2e599ab28b2b4cd90edb882ee1439140a6711b9..f3a2ae14d352b790042b4765052e3105ad762800 100644 --- a/app/mailers/emails/projects.rb +++ b/app/mailers/emails/projects.rb @@ -38,6 +38,8 @@ module Emails @subject << @commits.first.title end + @disable_footer = true + mail(from: sender(author_id), to: recipient, subject: @subject) diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index 8cca80e5248c7c1a291b05ff35610261e224c72d..eb5da4701604476a7e72a4ba188280cfbc0e24c5 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -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. diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index ae2b61262bded078e1a5cb362c3cd35de0a9f78d..41b0daacded6f719954fe25b32dbab6d9b341cc1 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -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