diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-04-06 21:35:01 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-04-06 21:35:01 +0100 |
| commit | 55811ac9900af81fb980c3649ee1c9aadedb3a44 (patch) | |
| tree | 437628918788ef02c879f59e64d109c1283fde27 /app/controllers/projects | |
| parent | 902054db59e02cb14c28ecffd9dff95994dbb01f (diff) | |
| parent | c3af43c3d263278bd39917c37a87022f8dc44e95 (diff) | |
| download | gitlab-ce-55811ac9900af81fb980c3649ee1c9aadedb3a44.tar.gz | |
Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/forks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/forks_controller.rb b/app/controllers/projects/forks_controller.rb index ba46e2528e6..1eb3800e49d 100644 --- a/app/controllers/projects/forks_controller.rb +++ b/app/controllers/projects/forks_controller.rb @@ -9,7 +9,7 @@ class Projects::ForksController < Projects::ApplicationController def index base_query = project.forks.includes(:creator) - @forks = base_query.merge(ProjectsFinder.new.execute(current_user)) + @forks = base_query.merge(ProjectsFinder.new(current_user: current_user).execute) @total_forks_count = base_query.size @private_forks_count = @total_forks_count - @forks.size @public_forks_count = @total_forks_count - @private_forks_count |