diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-06 19:48:40 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-06 19:48:40 +0800 |
| commit | 98a4aca6b5ce503543b0e325212265a365e64d75 (patch) | |
| tree | 0c639fc91c9bebc06eecd1e5f0a2764577b97d28 /app/controllers/projects | |
| parent | 06b4ea243fef27fa79a201148f07c25df375f57d (diff) | |
| parent | d062af91ca10bb0c48136ad9b9204b02d41fdf8c (diff) | |
| download | gitlab-ce-98a4aca6b5ce503543b0e325212265a365e64d75.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits_if_not_head
* upstream/master:
Show CI status as Favicon on Pipelines, Job and MR pages
STL file viewer
Wait for the PDF to be loaded before doing anything
remove unnecessary lease as cron job
Search for opened MRs - include reopened MRs
ProjectsFinder should handle more options
Clearly show who triggered the pipeline in email
Make it possible to preview pipeline success/failed emails
Add remove_concurrent_index to database helper
fix project authorizations migration issue
attempt to fix migration
Revert schema.rb
attempt to fix db failure
Periodically mark projects that are stuck in importing as failed
Fix html structure to prevent tooltip from not hidding
Enable creation of deploy keys with write access via the API
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 |