From a0686b4653208e66c768b63e249bd73406f9e267 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 23 Oct 2023 21:12:16 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/models/wiki_page.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 2eed693ca76..3dd8f334a68 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -80,6 +80,7 @@ class WikiPage
   alias_method :to_param, :slug
 
   def human_title
+    return front_matter_title if Feature.enabled?(:wiki_front_matter_title, container) && front_matter_title.present?
     return 'Home' if title == Wiki::HOMEPAGE
 
     title
@@ -95,6 +96,10 @@ class WikiPage
     attributes[:title] = new_title
   end
 
+  def front_matter_title
+    front_matter[:title]
+  end
+
   def raw_content
     attributes[:content] ||= page&.text_data
   end
@@ -320,7 +325,7 @@ class WikiPage
   def serialize_front_matter(hash)
     return '' unless hash.present?
 
-    YAML.dump(hash.transform_keys(&:to_s)) + "---\n"
+    YAML.dump(hash.to_h.transform_keys(&:to_s)) + "---\n"
   end
 
   def update_front_matter(attrs)
-- 
cgit v1.2.3