Merge branch 'dm-blockquote-trailing-whitespace' into 'master'

Allow trailing whitespace on blockquote fence lines See merge request gitlab-org/gitlab-ce!19960

Merge branch 'dm-blockquote-trailing-whitespace' into 'master'
8451c5ff · Sean McGivern · 3c725a2a · b762fc4b · 8451c5ff · 8451c5ff
Commit 8451c5ff authored 6 years ago by Sean McGivern
--- a/changelogs/unreleased/dm-blockquote-trailing-whitespace.yml
+++ b/changelogs/unreleased/dm-blockquote-trailing-whitespace.yml
+---
+title: Allow trailing whitespace on blockquote fence lines
+merge_request:
+author:
+type: fixed
--- a/lib/banzai/filter/blockquote_fence_filter.rb
+++ b/lib/banzai/filter/blockquote_fence_filter.rb
@@ -10,7 +10,7 @@ module Banzai
  
            ^```
            .+?
-            \n```$
+            \n```\ *$
          )
        |
          (?<html>
@@ -19,9 +19,9 @@ module Banzai
            # Anything, including `>>>` blocks which are ignored by this filter
            # </tag>
  
-            ^<[^>]+?>\n
+            ^<[^>]+?>\ *\n
            .+?
-            \n<\/[^>]+?>$
+            \n<\/[^>]+?>\ *$
          )
        |
          (?:
@@ -30,14 +30,14 @@ module Banzai
            # Anything, including code and HTML blocks
            # >>>
  
-            ^>>>\n
+            ^>>>\ *\n
            (?<quote>
              (?:
                  # Any character that doesn't introduce a code or HTML block
                  (?!
                      ^```
                    |
-                      ^<[^>]+?>\n
+                      ^<[^>]+?>\ *\n
                  )
                  .
                |
@@ -48,7 +48,7 @@ module Banzai
                  \g<html>
              )+?
            )
-            \n>>>$
+            \n>>>\ *$
          )
      }mx.freeze
  

--- a/spec/lib/banzai/filter/blockquote_fence_filter_spec.rb
+++ b/spec/lib/banzai/filter/blockquote_fence_filter_spec.rb
@@ -11,4 +11,8 @@ describe Banzai::Filter::BlockquoteFenceFilter do
  
    expect(output).to eq(expected)
  end
+
+  it 'allows trailing whitespace on blockquote fence lines' do
+    expect(filter(">>> \ntest\n>>> ")).to eq("> test")
+  end
 end