Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 3 deletions

diff --git a/lib/gitlab/wiki_pages/front_matter_parser.rb b/lib/gitlab/wiki_pages/front_matter_parser.rb
index ee30fa907f4..071b0dde619 100644
--- a/lib/gitlab/wiki_pages/front_matter_parser.rb
+++ b/lib/gitlab/wiki_pages/front_matter_parser.rb
@@ -3,6 +3,8 @@
 module Gitlab
   module WikiPages
     class FrontMatterParser
+      FEATURE_FLAG = :wiki_front_matter
+
       # We limit the maximum length of text we are prepared to parse as YAML, to
       # avoid exploitations and attempts to consume memory and CPU. We allow for:
       #  - a title line
@@ -28,12 +30,18 @@ module Gitlab
       end
 
       # @param [String] wiki_content
-      def initialize(wiki_content)
+      # @param [FeatureGate] feature_gate The scope for feature availability
+      def initialize(wiki_content, feature_gate)
         @wiki_content = wiki_content
+        @feature_gate = feature_gate
+      end
+
+      def self.enabled?(gate = nil)
+        Feature.enabled?(FEATURE_FLAG, gate)
       end
 
       def parse
-        return empty_result unless wiki_content.present?
+        return empty_result unless enabled? && wiki_content.present?
         return empty_result(block.error) unless block.valid?
 
         Result.new(front_matter: block.data, content: strip_front_matter_block)
@@ -86,12 +94,16 @@ module Gitlab
 
       private
 
-      attr_reader :wiki_content
+      attr_reader :wiki_content, :feature_gate
 
       def empty_result(reason = nil, error = nil)
         Result.new(content: wiki_content, reason: reason, error: error)
       end
 
+      def enabled?
+        self.class.enabled?(feature_gate)
+      end
+
       def block
         @block ||= parse_front_matter_block
       end