summaryrefslogtreecommitdiff
path: root/app/controllers/explore/projects_controller.rb
diff options
context:
space:
mode:
authorLuke Bennett <lbennett@gitlab.com>2018-09-24 14:39:00 +0100
committerLuke Bennett <lbennett@gitlab.com>2018-09-24 14:39:00 +0100
commit05afd11e16aecd43adfb869ae90aa6cae13916ec (patch)
tree63b31431981d48ac970853778dd01a5301bb9564 /app/controllers/explore/projects_controller.rb
parent086549d986a453e1b2dd0d09ffbd19d0487d9c51 (diff)
parent28086b203ae397e01d5e9870dfbddd66466450c2 (diff)
downloadgitlab-ce-05afd11e16aecd43adfb869ae90aa6cae13916ec.tar.gz
Merge remote-tracking branch 'origin/master' into ce-6983-promote-starting-a-gitlab-com-trial
Diffstat (limited to 'app/controllers/explore/projects_controller.rb')
-rw-r--r--app/controllers/explore/projects_controller.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index c7273606a85..03a2ee07fea 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -34,6 +34,7 @@ class Explore::ProjectsController < Explore::ApplicationController
end
end
+ # rubocop: disable CodeReuse/ActiveRecord
def starred
@projects = load_projects.reorder('star_count DESC')
@@ -46,9 +47,11 @@ class Explore::ProjectsController < Explore::ApplicationController
end
end
end
+ # rubocop: enable CodeReuse/ActiveRecord
private
+ # rubocop: disable CodeReuse/ActiveRecord
def load_projects
projects = ProjectsFinder.new(current_user: current_user, params: params)
.execute
@@ -58,4 +61,5 @@ class Explore::ProjectsController < Explore::ApplicationController
prepare_projects_for_rendering(projects)
end
+ # rubocop: enable CodeReuse/ActiveRecord
end