Move order lambda to list scope

- apply ordering to both list scopes in `Board`
- remove extra preloads

app/models/board.rb

@@ -4,8 +4,8 @@ class Board < ApplicationRecord
   belongs_to :group
   belongs_to :project
 
-  has_many :lists, -> { order(:list_type, :position) }, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
-  has_many :destroyable_lists, -> { lists.destroyable }, class_name: "List"
+  has_many :lists, -> { ordered }, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
+  has_many :destroyable_lists, -> { destroyable.ordered }, class_name: "List"
 
   validates :project, presence: true, if: :project_needed?
   validates :group, presence: true, unless: :project

app/models/list.rb

@@ -18,6 +18,7 @@ class List < ApplicationRecord
   scope :destroyable, -> { where(list_type: list_types.slice(*destroyable_types).values) }
   scope :movable, -> { where(list_type: list_types.slice(*movable_types).values) }
   scope :preload_associations, -> { preload(:board, :label) }
+  scope :ordered, -> { order(:list_type, :position) }
 
   class << self
     def destroyable_types

ee/app/models/ee/board.rb

@@ -23,7 +23,7 @@ module EE
 
       validates :name, presence: true
 
-      scope :with_associations, -> { preload(:destroyable_lists, :milestone, :board_labels, :labels, :assignee) }
+      scope :with_associations, -> { preload(:destroyable_lists, :labels, :assignee) }
     end
 
     override :scoped?