mirror of
https://gitlab.com/gitlab-org/gitlab-foss.git
synced 2025-07-25 16:03:48 +00:00
Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
@ -131,18 +131,19 @@ class EventFilter
|
||||
finder_query = -> (id_expression) { Event.where(Event.arel_table[:id].eq(id_expression)) }
|
||||
|
||||
if order_hint_column.present?
|
||||
order = Gitlab::Pagination::Keyset::Order.build([
|
||||
Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
|
||||
attribute_name: order_hint_column,
|
||||
order_expression: Event.arel_table[order_hint_column].desc,
|
||||
nullable: :nulls_last,
|
||||
distinct: false
|
||||
),
|
||||
Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
|
||||
attribute_name: :id,
|
||||
order_expression: Event.arel_table[:id].desc
|
||||
)
|
||||
])
|
||||
order = Gitlab::Pagination::Keyset::Order.build(
|
||||
[
|
||||
Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
|
||||
attribute_name: order_hint_column,
|
||||
order_expression: Event.arel_table[order_hint_column].desc,
|
||||
nullable: :nulls_last,
|
||||
distinct: false
|
||||
),
|
||||
Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
|
||||
attribute_name: :id,
|
||||
order_expression: Event.arel_table[:id].desc
|
||||
)
|
||||
])
|
||||
|
||||
finder_query = -> (_order_hint, id_expression) { Event.where(Event.arel_table[:id].eq(id_expression)) }
|
||||
end
|
||||
|
Reference in New Issue
Block a user