Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 0 deletions

diff --git a/spec/lib/banzai/filter/commit_trailers_filter_spec.rb b/spec/lib/banzai/filter/commit_trailers_filter_spec.rb
index 2bdf702083a..c22517621c1 100644
--- a/spec/lib/banzai/filter/commit_trailers_filter_spec.rb
+++ b/spec/lib/banzai/filter/commit_trailers_filter_spec.rb
@@ -137,6 +137,13 @@ RSpec.describe Banzai::Filter::CommitTrailersFilter do
       expect(doc.to_html).to match Regexp.escape(exp)
     end
 
+    it 'trailers without emails' do
+      exp = message = commit_html(Array.new(5) { 'Merged-By:' }.join("\n"))
+      doc = filter(message)
+
+      expect(doc.to_html).to match Regexp.escape(exp)
+    end
+
     it 'trailers that are inline the commit message body' do
       message = commit_html %(
         #{FFaker::Lorem.sentence} #{commit_message} #{FFaker::Lorem.sentence}