Merge branch '58065-uniform-html-txt-email' into 'master'

Make HTML and text emails for new issues uniform and add the mail to mailer previews

Closes #58065

See merge request gitlab-org/gitlab-ce!29886

1 files changed, 2 insertions, 12 deletions

diff --git a/spec/support/shared_examples/notify_shared_examples.rb b/spec/support/shared_examples/notify_shared_examples.rb
index 897c9106d77..6894a63ce42 100644
--- a/spec/support/shared_examples/notify_shared_examples.rb
+++ b/spec/support/shared_examples/notify_shared_examples.rb
@@ -281,18 +281,8 @@ shared_examples 'a note email' do
     is_expected.to have_body_text note.note
   end
 
-  it 'does not contain note author' do
-    is_expected.not_to have_body_text note.author_name
-  end
-
-  context 'when enabled email_author_in_body' do
-    before do
-      stub_application_setting(email_author_in_body: true)
-    end
-
-    it 'contains a link to note author' do
-      is_expected.to have_body_text note.author_name
-    end
+  it 'contains a link to note author' do
+    is_expected.to have_body_text note.author_name
   end
 end