summaryrefslogtreecommitdiff
path: root/app/models/wiki_page.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/wiki_page.rb')
-rw-r--r--app/models/wiki_page.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 102907a8bd3..42fd213d03b 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -58,7 +58,7 @@ class WikiPage
attr_reader :page
# The attributes Hash used for storing and validating
- # new Page values before writing to the Gollum repository.
+ # new Page values before writing to the raw repository.
attr_accessor :attributes
def hook_attrs
@@ -111,10 +111,7 @@ class WikiPage
# The processed/formatted content of this page.
def formatted_content
- # Assuming @page exists, nil formatted_data means we didn't load it
- # before hand (i.e. page was fetched by Gitaly), so we fetch it separately.
- # If the page was fetched by Gollum, formatted_data would've been a String.
- @attributes[:formatted_content] ||= @page&.formatted_data || @wiki.page_formatted_data(@page)
+ @attributes[:formatted_content] ||= @wiki.page_formatted_data(@page)
end
# The markup format for the page.