diff options
| author | Keith Pitt <me@keithpitt.com> | 2014-10-08 16:33:53 +0800 |
|---|---|---|
| committer | Keith Pitt <me@keithpitt.com> | 2014-10-08 16:33:53 +0800 |
| commit | 4c7da578f200f0bc721cc2cae27eb2b25f96e8dd (patch) | |
| tree | 565b5b7746bc2cff8e46883b4d1836dfaa0246ef /app/controllers/snippets_controller.rb | |
| parent | 76594d474ca6d04c2e608e7b3df1229729288f14 (diff) | |
| parent | 928178deb9d582d7537a57983ff9e695f07dab1f (diff) | |
| download | gitlab-ce-4c7da578f200f0bc721cc2cae27eb2b25f96e8dd.tar.gz | |
Merge branch 'master' into buildbox-service
Conflicts:
app/models/project.rb
Diffstat (limited to 'app/controllers/snippets_controller.rb')
| -rw-r--r-- | app/controllers/snippets_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index 3927584235e..5904dbbceda 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -14,7 +14,7 @@ class SnippetsController < ApplicationController layout 'navless' def index - @snippets = Snippet.are_public.fresh.non_expired.page(params[:page]).per(20) + @snippets = Snippet.are_internal.fresh.non_expired.page(params[:page]).per(20) end def user_index @@ -26,15 +26,15 @@ class SnippetsController < ApplicationController if @user == current_user @snippets = case params[:scope] - when 'are_public' then - @snippets.are_public + when 'are_internal' then + @snippets.are_internal when 'are_private' then @snippets.are_private else @snippets end else - @snippets = @snippets.are_public + @snippets = @snippets.are_internal end @snippets = @snippets.page(params[:page]).per(20) |