diff options
| author | Mark Fletcher <mark@gitlab.com> | 2017-09-19 09:55:22 +0300 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2017-09-20 01:27:16 +0300 |
| commit | c9d40927f877a9d4896edcd94c8525ba8eba3ffd (patch) | |
| tree | 19d0bc6aeac04b650fd68cb2b4e6aa1e34fcf4e7 | |
| parent | 63e0a42317cad084b982d1deff8737bd2a1bf2d1 (diff) | |
Employ ForkProjectsFinder in ForksController
| -rw-r--r-- | app/controllers/projects/forks_controller.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/controllers/projects/forks_controller.rb b/app/controllers/projects/forks_controller.rb index 3f83bef2c79..68978f8fdd1 100644 --- a/app/controllers/projects/forks_controller.rb +++ b/app/controllers/projects/forks_controller.rb @@ -9,14 +9,12 @@ class Projects::ForksController < Projects::ApplicationController def index base_query = project.forks.includes(:creator) - @forks = base_query.merge(ProjectsFinder.new(current_user: current_user).execute) + forks = ForkProjectsFinder.new(project, params: params.merge(search: params[:filter_projects]), current_user: current_user).execute @total_forks_count = base_query.size - @private_forks_count = @total_forks_count - @forks.size + @private_forks_count = @total_forks_count - forks.size @public_forks_count = @total_forks_count - @private_forks_count - @sort = params[:sort] || 'id_desc' - @forks = @forks.search(params[:filter_projects]) if params[:filter_projects].present? - @forks = @forks.order_by(@sort).page(params[:page]) + @forks = forks.page(params[:page]) respond_to do |format| format.html |