Skip to content
Snippets Groups Projects

Revert "Merge branch '353926' into 'master'"

Merged David O'Regan requested to merge revert-686b1c8e into master
All threads resolved!
5 files
+ 107
8
Compare changes
  • Side-by-side
  • Inline
Files
5
+ 2
1
@@ -316,6 +316,7 @@ def serialize_front_matter(hash)
@@ -316,6 +316,7 @@ def serialize_front_matter(hash)
end
end
def update_front_matter(attrs)
def update_front_matter(attrs)
 
return unless Gitlab::WikiPages::FrontMatterParser.enabled?(container)
return unless attrs.has_key?(:front_matter)
return unless attrs.has_key?(:front_matter)
fm_yaml = serialize_front_matter(attrs[:front_matter])
fm_yaml = serialize_front_matter(attrs[:front_matter])
@@ -326,7 +327,7 @@ def update_front_matter(attrs)
@@ -326,7 +327,7 @@ def update_front_matter(attrs)
def parsed_content
def parsed_content
strong_memoize(:parsed_content) do
strong_memoize(:parsed_content) do
Gitlab::WikiPages::FrontMatterParser.new(raw_content).parse
Gitlab::WikiPages::FrontMatterParser.new(raw_content, container).parse
end
end
end
end
Loading