diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-03-31 11:13:33 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-03-31 11:13:33 +0000 |
| commit | 53b21c1e8e27a284a8691a73276204a85694eeb8 (patch) | |
| tree | 8247c19925c4e5d825ba0729e7a7deea8c7c7667 /app/models | |
| parent | adb1cf82b64d6411bfbf0938a98b01b36ea1d20b (diff) | |
| parent | dc15abaa221615ae57ec27cd30645879c63af1c1 (diff) | |
| download | gitlab-ce-53b21c1e8e27a284a8691a73276204a85694eeb8.tar.gz | |
Merge branch 'forked-subquery-order' into 'master'
Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery
See merge request !10334
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index cbd741f96ed..95a766f2ede 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -635,8 +635,10 @@ class User < ActiveRecord::Base end def fork_of(project) - links = ForkedProjectLink.where(forked_from_project_id: project, forked_to_project_id: personal_projects) - + links = ForkedProjectLink.where( + forked_from_project_id: project, + forked_to_project_id: personal_projects.unscope(:order) + ) if links.any? links.first.forked_to_project else |