Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/front_matter.rb b/lib/gitlab/front_matter.rb
index 5c5c74ca1a0..093501e860b 100644
--- a/lib/gitlab/front_matter.rb
+++ b/lib/gitlab/front_matter.rb
@@ -11,12 +11,12 @@ module Gitlab
     DELIM = Regexp.union(DELIM_LANG.keys)
 
     PATTERN = %r{
-      \A(?:[^\r\n]*coding:[^\r\n]*\R)?        # optional encoding line
-      \s*
+      \A(?<encoding>[^\r\n]*coding:[^\r\n]*\R)? # optional encoding line
+      (?<before>\s*)
       ^(?<delim>#{DELIM})[ \t]*(?<lang>\S*)\R # opening front matter marker (optional language specifier)
       (?<front_matter>.*?)                    # front matter block content (not greedy)
       ^(\k<delim> | \.{3})                    # closing front matter marker
-      \s*
+      [^\S\r\n]*(\R|\z)
     }mx.freeze
   end
 end