diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-05-10 18:57:19 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-05-10 18:57:19 +0000 |
commit | 9c7d87ef0ec941b389cb5ef57a07ff0f43909305 (patch) | |
tree | 827aaf4dbb628eb31517aaf2960814a521430229 /app/controllers/projects/snippets_controller.rb | |
parent | 1e0df21a74017deb780023ed83f04dbbeed13899 (diff) | |
parent | 180ec7113e358a7f8388e1436dc0670a11ba68df (diff) | |
download | gitlab-ce-docs/hide-gcp-install.tar.gz |
Merge branch 'master' into 'docs/hide-gcp-install'docs/hide-gcp-install
# Conflicts:
# doc/install/README.md
Diffstat (limited to 'app/controllers/projects/snippets_controller.rb')
-rw-r--r-- | app/controllers/projects/snippets_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index 66f913f8f9d..3b2b0d9e502 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -23,12 +23,11 @@ class Projects::SnippetsController < Projects::ApplicationController respond_to :html def index - @snippets = SnippetsFinder.new.execute( + @snippets = SnippetsFinder.new( current_user, - filter: :by_project, project: @project, scope: params[:scope] - ) + ).execute @snippets = @snippets.page(params[:page]) if @snippets.out_of_range? && @snippets.total_pages != 0 redirect_to namespace_project_snippets_path(page: @snippets.total_pages) |