summaryrefslogtreecommitdiff
path: root/app/controllers/snippets_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-10-07 10:05:59 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-10-07 10:05:59 +0000
commitc0306f78d2686202aa56cf862a7c787d07c85d1a (patch)
tree3181e97345b8947361b280002dc22820e883c908 /app/controllers/snippets_controller.rb
parentbbc52b000008c9020d2a38dafc09ff3341a69cae (diff)
parentfd8d1d9b62066766c96610b7d42b20fa0e84b0ac (diff)
downloadgitlab-ce-c0306f78d2686202aa56cf862a7c787d07c85d1a.tar.gz
Merge branch 't1254-snippets-refactoring' into 'master'
Snippets refactoring: rename public to internal. STEP 1 See merge request !1157
Diffstat (limited to 'app/controllers/snippets_controller.rb')
-rw-r--r--app/controllers/snippets_controller.rb8
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)