summaryrefslogtreecommitdiff
path: root/app/controllers/snippets_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-03 17:54:33 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-03 17:54:33 -0800
commit635ebac606d77eae03ce2e2a8f0a814ad4c79177 (patch)
tree8f3047074880166e53edb987df8ba4295d374c3d /app/controllers/snippets_controller.rb
parentac7af45d8987422c2a529d3d87eae6d9bd608e12 (diff)
parent704922c855a9741b5495db56ac266788a9c25c33 (diff)
downloadgitlab-ce-635ebac606d77eae03ce2e2a8f0a814ad4c79177.tar.gz
Merge branch 'master' into mwessel/gitlab-ce-configure-protection
Diffstat (limited to 'app/controllers/snippets_controller.rb')
-rw-r--r--app/controllers/snippets_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index 312e561b522..1ed3bc388fb 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -27,7 +27,7 @@ class SnippetsController < ApplicationController
@snippets = SnippetsFinder.new.execute(current_user, {
filter: :by_user,
user: @user,
- scope: params[:scope]}).
+ scope: params[:scope] }).
page(params[:page]).per(20)
if @user == current_user