diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-12 23:23:15 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-12 23:23:15 +0000 |
| commit | fdfa79a79e24e84f9fcb4a0a605a5bb00d9146c4 (patch) | |
| tree | af51dd326e44cf41eaf99caf9b10260995bfc56a /app/controllers/snippets_controller.rb | |
| parent | 2fe69158f0492496f301fe2bf0ee78d9a5448ce1 (diff) | |
| parent | f0cbbd70bba7c44e9b09a3472e6c2f6f58623150 (diff) | |
| download | gitlab-ce-fdfa79a79e24e84f9fcb4a0a605a5bb00d9146c4.tar.gz | |
Merge branch 'default-pagination' into 'master'
Use same constant for amount of items per page
See merge request !1689
Diffstat (limited to 'app/controllers/snippets_controller.rb')
| -rw-r--r-- | app/controllers/snippets_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index 6ac048e4b83..ae501362dc2 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -16,7 +16,7 @@ class SnippetsController < ApplicationController layout :determine_layout def index - @snippets = SnippetsFinder.new.execute(current_user, filter: :all).page(params[:page]).per(20) + @snippets = SnippetsFinder.new.execute(current_user, filter: :all).page(params[:page]).per(PER_PAGE) end def user_index @@ -28,7 +28,7 @@ class SnippetsController < ApplicationController filter: :by_user, user: @user, scope: params[:scope] }). - page(params[:page]).per(20) + page(params[:page]).per(PER_PAGE) if @user == current_user render 'current_user_index' |