diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-03-17 02:16:42 +0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-03-17 02:16:42 +0300 |
| commit | 44c127447b5a3cfc7aaea6f19e18baf9f42ad500 (patch) | |
| tree | f386dbb06fec8c5fdec92812394ac63cf67183a0 /app/controllers/explore | |
| parent | ec20fdf366843e60ed30abb5322c3c1b8f471b4a (diff) | |
| parent | 59064aeeef8562a87d4d03efa9b11012a007e261 (diff) | |
Merge 4009-external-users into issue_12658
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 5b811db3068..8271ca87436 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.where(visibility_level: params[:visibility_level]) if params[:visibility_level].present? @projects = filter_projects(@projects) @projects = @projects.sort(@sort = params[:sort]) - @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank? + @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE) respond_to do |format| format.html @@ -23,7 +23,7 @@ class Explore::ProjectsController < Explore::ApplicationController def trending @projects = TrendingProjectsFinder.new.execute(current_user) @projects = filter_projects(@projects) - @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank? + @projects = @projects.page(params[:page]).per(PER_PAGE) respond_to do |format| format.html @@ -39,7 +39,7 @@ class Explore::ProjectsController < Explore::ApplicationController @projects = ProjectsFinder.new.execute(current_user) @projects = filter_projects(@projects) @projects = @projects.reorder('star_count DESC') - @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank? + @projects = @projects.page(params[:page]).per(PER_PAGE) respond_to do |format| format.html |