Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/design_management/design.rb')
-rw-r--r--app/models/design_management/design.rb14
1 files changed, 4 insertions, 10 deletions
diff --git a/app/models/design_management/design.rb b/app/models/design_management/design.rb
index deda814d689..57bb250829d 100644
--- a/app/models/design_management/design.rb
+++ b/app/models/design_management/design.rb
@@ -79,16 +79,10 @@ module DesignManagement
joins(join.join_sources).where(actions[:event].not_eq(deletion))
end
- scope :ordered, -> (project) do
- # TODO: Always order by relative position after the feature flag is removed
- # https://gitlab.com/gitlab-org/gitlab/-/issues/34382
- if Feature.enabled?(:reorder_designs, project, default_enabled: true)
- # We need to additionally sort by `id` to support keyset pagination.
- # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17788/diffs#note_230875678
- order(:relative_position, :id)
- else
- in_creation_order
- end
+ scope :ordered, -> do
+ # We need to additionally sort by `id` to support keyset pagination.
+ # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17788/diffs#note_230875678
+ order(:relative_position, :id)
end
scope :in_creation_order, -> { reorder(:id) }