diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-24 20:56:53 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-24 20:56:53 +0000 |
| commit | caf84a0306450d97f6939393670aa8c4c807ddca (patch) | |
| tree | aefe9231bc293d8e6fcd3b6cda7a697d39999546 /lib/gitlab/git | |
| parent | a349a4269c5194e53020e5909e9554bc1bfed40f (diff) | |
| parent | 5735747050543a9e68aeb8f017c995e6119a9510 (diff) | |
| download | gitlab-ce-caf84a0306450d97f6939393670aa8c4c807ddca.tar.gz | |
Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'
Add formatted_data attribute to Git::WikiPage
Closes #39805
See merge request gitlab-org/gitlab-ce!16682
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/wiki_page.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/git/wiki_page.rb b/lib/gitlab/git/wiki_page.rb index a06bac4414f..669ae11a423 100644 --- a/lib/gitlab/git/wiki_page.rb +++ b/lib/gitlab/git/wiki_page.rb @@ -1,7 +1,7 @@ module Gitlab module Git class WikiPage - attr_reader :url_path, :title, :format, :path, :version, :raw_data, :name, :text_data, :historical + attr_reader :url_path, :title, :format, :path, :version, :raw_data, :name, :text_data, :historical, :formatted_data # This class is meant to be serializable so that it can be constructed # by Gitaly and sent over the network to GitLab. @@ -21,6 +21,7 @@ module Gitlab @raw_data = gollum_page.raw_data @name = gollum_page.name @historical = gollum_page.historical? + @formatted_data = gollum_page.formatted_data if gollum_page.is_a?(Gollum::Page) @version = version end |