diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-03-31 11:13:33 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-04-03 11:17:38 -0700 |
| commit | c809ef11b5a98f564e2f9578c9433dceca2baa29 (patch) | |
| tree | 69d14b479c4075540118ddbad6fc8b4adbf5cacd | |
| parent | 36cfb0a7bd60285d1545be1fbc01452ab6c431e8 (diff) | |
| download | gitlab-ce-c809ef11b5a98f564e2f9578c9433dceca2baa29.tar.gz | |
Merge branch 'forked-subquery-order' into 'master'
Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery
See merge request !10334
| -rw-r--r-- | app/models/user.rb | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/forked-subquery-order.yml | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 0432b2aa6a1..e786abb98e1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -631,8 +631,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 diff --git a/changelogs/unreleased/forked-subquery-order.yml b/changelogs/unreleased/forked-subquery-order.yml new file mode 100644 index 00000000000..06fb8236783 --- /dev/null +++ b/changelogs/unreleased/forked-subquery-order.yml @@ -0,0 +1,4 @@ +--- +title: Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery +merge_request: +author: mhasbini |