diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2017-10-03 16:58:33 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-03 16:58:33 +0000 |
| commit | 5dd26d4e5a5a27ca93e6d55b4261c42f4f70e762 (patch) | |
| tree | f29535350ca0fe47d6c9fbddf8a915365b39d281 /app/models/wiki_page.rb | |
| parent | 6e0d17b8c605218ef5df8337fa573caa887bf41f (diff) | |
| download | gitlab-ce-5dd26d4e5a5a27ca93e6d55b4261c42f4f70e762.tar.gz | |
Hide Gollum inside Gitlab::Git::Wiki
Diffstat (limited to 'app/models/wiki_page.rb')
| -rw-r--r-- | app/models/wiki_page.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index f2315bb3dbb..5f710961f95 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -50,7 +50,7 @@ class WikiPage # The Gitlab ProjectWiki instance. attr_reader :wiki - # The raw Gollum::Page instance. + # The raw Gitlab::Git::WikiPage instance. attr_reader :page # The attributes Hash used for storing and validating @@ -75,7 +75,7 @@ class WikiPage if @attributes[:slug].present? @attributes[:slug] else - wiki.wiki.preview_page(title, '', format).url_path + wiki.wiki.preview_slug(title, format) end end @@ -131,7 +131,7 @@ class WikiPage def versions return [] unless persisted? - @page.versions + wiki.wiki.page_versions(@page.path) end def commit @@ -264,8 +264,8 @@ class WikiPage end page_title, page_dir = wiki.page_title_and_dir(page_details) - gollum_wiki = wiki.wiki - @page = gollum_wiki.paged(page_title, page_dir) + gitlab_git_wiki = wiki.wiki + @page = gitlab_git_wiki.page(title: page_title, dir: page_dir) set_attributes @persisted = errors.blank? |