diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-01-02 09:23:39 +0100 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-01-22 10:08:46 +0100 |
commit | 1c0437d95e6329035af49d13b26c4a60948b02e3 (patch) | |
tree | 85fe188c12f9c8c44e03c0e10568d6029d4890a4 /app/controllers | |
parent | bd7a387b4348adac36e2b3aa9b908a4d3dc01606 (diff) | |
download | gitlab-ce-1c0437d95e6329035af49d13b26c4a60948b02e3.tar.gz |
Client implementation for WikiPageVerion
Part of gitlab-org/gitaly#639
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/wikis_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index 292e4158f8b..730f20bc086 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -76,9 +76,9 @@ class Projects::WikisController < Projects::ApplicationController @page = @project_wiki.find_page(params[:id]) if @page - @page_versions = Kaminari.paginate_array(@page.versions(page: params[:page]), + @page_versions = Kaminari.paginate_array(@page.versions(page: params[:page].to_i), total_count: @page.count_versions) - .page(params[:page]) + .page(params[:page]) else redirect_to( project_wiki_path(@project, :home), |