diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2015-09-16 19:52:57 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2015-09-16 19:52:57 -0500 |
| commit | 1ef2ce95d507c3d21598f26dd8a0e77dfc3c33cf (patch) | |
| tree | dc7a80b0f77f98e9f1a6898644f4961cac2c2d60 /app/controllers/snippets_controller.rb | |
| parent | 4c98357f16b1acfa793d8a5b28c7147e21f20356 (diff) | |
| parent | c99473e57ca90f95c4e31fc1582fb94731257442 (diff) | |
| download | gitlab-ce-1ef2ce95d507c3d21598f26dd8a0e77dfc3c33cf.tar.gz | |
Merge branch 'master' into notification-levels
Diffstat (limited to 'app/controllers/snippets_controller.rb')
| -rw-r--r-- | app/controllers/snippets_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index 8e7e45c781f..9f9f9a92f11 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -24,13 +24,9 @@ class SnippetsController < ApplicationController scope: params[:scope] }). page(params[:page]).per(PER_PAGE) - if @user == current_user - render 'current_user_index' - else - render 'user_index' - end + render 'index' else - @snippets = SnippetsFinder.new.execute(current_user, filter: :all).page(params[:page]).per(PER_PAGE) + redirect_to(current_user ? dashboard_snippets_path : explore_snippets_path) end end |