diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-10 18:26:02 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-10 18:26:02 +0000 |
| commit | 180ec7113e358a7f8388e1436dc0670a11ba68df (patch) | |
| tree | fba74833a7e89d6c19160a0d7e02355c5215c8df /app/controllers/users_controller.rb | |
| parent | 09c4d27ae48ceb181f86657043af2a129c17dabf (diff) | |
| parent | ebd8b7f60f41358df562625a4692f352b86b8c80 (diff) | |
| download | gitlab-ce-180ec7113e358a7f8388e1436dc0670a11ba68df.tar.gz | |
Merge branch 'bvl-security-patches' into 'master'
Security patches -> `master`
See merge request !11230
Diffstat (limited to 'app/controllers/users_controller.rb')
| -rw-r--r-- | app/controllers/users_controller.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ca89ed221c6..ba22b2f9d29 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -128,12 +128,11 @@ class UsersController < ApplicationController end def load_snippets - @snippets = SnippetsFinder.new.execute( + @snippets = SnippetsFinder.new( current_user, - filter: :by_user, - user: user, + author: user, scope: params[:scope] - ).page(params[:page]) + ).execute.page(params[:page]) end def projects_for_current_user |