diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-04 12:10:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-04 12:10:47 +0300 |
| commit | 13f31ab91aeb5233a7b64f2740fee246294161fc (patch) | |
| tree | d47fa67102b45131f0dd04257e97ab955a134c17 /lib/gitlab/relative_positioning | |
| parent | bf3e636cc03f219a8411cdd723a364a08c8502b1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/relative_positioning')
| -rw-r--r-- | lib/gitlab/relative_positioning/item_context.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/gitlab/relative_positioning/item_context.rb b/lib/gitlab/relative_positioning/item_context.rb index ac0598d8d34..c9392636ef1 100644 --- a/lib/gitlab/relative_positioning/item_context.rb +++ b/lib/gitlab/relative_positioning/item_context.rb @@ -91,8 +91,7 @@ module Gitlab relation = yield relation if block_given? relation - .pluck(grouping_column, Arel.sql("#{calculation}(relative_position) AS position")) - .first&.last + .pick(grouping_column, Arel.sql("#{calculation}(relative_position) AS position"))&.last end def grouping_column @@ -164,8 +163,7 @@ module Gitlab .from(items_with_next_pos, :items) .where('next_pos IS NULL OR ABS(pos::bigint - next_pos::bigint) >= ?', MIN_GAP) .limit(1) - .pluck(:pos, :next_pos) - .first + .pick(:pos, :next_pos) return if gap.nil? || gap.first == default_end |