diff options
| author | Andreas Brandl <abrandl@gitlab.com> | 2019-07-25 11:03:43 +0000 |
|---|---|---|
| committer | Andreas Brandl <abrandl@gitlab.com> | 2019-07-25 11:03:43 +0000 |
| commit | cb41470cddf890ce85f23751f2326ea50ea9b79f (patch) | |
| tree | 2cdbc125000981fba808f101e2eff72cbe7811d0 | |
| parent | 4fc9254f206a683b6276c01e7b65a9216ec1a9d2 (diff) | |
| parent | d5080eb5ffb0ffdb8133eee3039a4429c87a107d (diff) | |
| download | gitlab-ce-cb41470cddf890ce85f23751f2326ea50ea9b79f.tar.gz | |
Merge branch 'tc-revert-rails5-workaround' into 'master'
Revert "Workaround for Rails 5, where LIMIT..."
See merge request gitlab-org/gitlab-ce!30780
| -rw-r--r-- | lib/gitlab/database/subquery.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/database/subquery.rb b/lib/gitlab/database/subquery.rb index 10971d2b274..2a6f39c6a27 100644 --- a/lib/gitlab/database/subquery.rb +++ b/lib/gitlab/database/subquery.rb @@ -6,11 +6,7 @@ module Gitlab class << self def self_join(relation) t = relation.arel_table - # Work around a bug in Rails 5, where LIMIT causes trouble - # See https://gitlab.com/gitlab-org/gitlab-ce/issues/51729 - r = relation.limit(nil).arel - r.take(relation.limit_value) if relation.limit_value - t2 = r.as('t2') + t2 = relation.arel.as('t2') relation.unscoped.joins(t.join(t2).on(t[:id].eq(t2[:id])).join_sources.first) end |