diff options
| author | Josh Frye <joshfng@gmail.com> | 2016-02-06 12:36:46 -0500 |
|---|---|---|
| committer | Josh Frye <joshfng@gmail.com> | 2016-02-09 10:10:41 -0500 |
| commit | 8b4e9720d948d0f0fe61ba7344158560e639393f (patch) | |
| tree | 933c37ed98f5f505054c1f5a27c484ac4e386e95 /app/controllers/explore | |
| parent | 30e022a2feec7450c4173038d3fdfef0d6242953 (diff) | |
| download | gitlab-ce-8b4e9720d948d0f0fe61ba7344158560e639393f.tar.gz | |
Extract events rendering to own action.
Diffstat (limited to 'app/controllers/explore')
| -rw-r--r-- | app/controllers/explore/projects_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb index 317ad835006..1afa77bb02b 100644 --- a/app/controllers/explore/projects_controller.rb +++ b/app/controllers/explore/projects_controller.rb @@ -8,7 +8,7 @@ class Explore::ProjectsController < Explore::ApplicationController @projects = @projects.search(params[:search]) if params[:search].present? @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present? @projects = @projects.sort(@sort = params[:sort]) - @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE) + @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE) if !params[:filter_projects].present? respond_to do |format| format.html @@ -24,7 +24,7 @@ class Explore::ProjectsController < Explore::ApplicationController @projects = TrendingProjectsFinder.new.execute(current_user) @projects = @projects.non_archived @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present? - @projects = @projects.page(params[:page]).per(PER_PAGE) + @projects = @projects.page(params[:page]).per(PER_PAGE) if !params[:filter_projects].present? respond_to do |format| format.html @@ -40,7 +40,7 @@ class Explore::ProjectsController < Explore::ApplicationController @projects = ProjectsFinder.new.execute(current_user) @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present? @projects = @projects.reorder('star_count DESC') - @projects = @projects.page(params[:page]).per(PER_PAGE) + @projects = @projects.page(params[:page]).per(PER_PAGE) if !params[:filter_projects].present? respond_to do |format| format.html |