diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-07 09:27:48 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-07 09:27:48 +0000 |
| commit | 662cf2cef40b97b983b85abb7d68b8a81b170bc3 (patch) | |
| tree | b3234b74551e0d5f57c4581dfeca225b0d39f8d5 /app/controllers | |
| parent | b9df4998607c64b758af641339edd40254900ecc (diff) | |
| parent | fbb891c8f3818b9aa17fadbb984ff7d33053c819 (diff) | |
| download | gitlab-ce-662cf2cef40b97b983b85abb7d68b8a81b170bc3.tar.gz | |
Merge branch 'fix-wiki-page-history' into 'master'
Fix broken Wiki Page History
This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes.
Closes #2104
Closes #1751
Closes #1592
Closes https://github.com/gitlabhq/gitlabhq/issues/9399
See merge request !1232
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/wikis_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index 50512cb6dc3..51c26a6a465 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -5,7 +5,6 @@ class Projects::WikisController < Projects::ApplicationController before_action :authorize_create_wiki!, only: [:edit, :create, :history] before_action :authorize_admin_wiki!, only: :destroy before_action :load_project_wiki - include WikiHelper def pages @wiki_pages = Kaminari.paginate_array(@project_wiki.pages).page(params[:page]).per(PER_PAGE) |