Merge branch 'app-models-2' into 'master'

Move prepend to last line in app models - 2

See merge request gitlab-org/gitlab!31827

app/models/group_milestone.rb

 # frozen_string_literal: true
 # Group Milestones are milestones that can be shared among many projects within the same group
 class GroupMilestone < GlobalMilestone
-  include_if_ee('::EE::GroupMilestone') # rubocop: disable Cop/InjectEnterpriseEditionModule
   attr_reader :group, :milestones
 
   def self.build_collection(group, projects, params)
@@ -46,3 +45,5 @@ class GroupMilestone < GlobalMilestone
     true
   end
 end
+
+GroupMilestone.include_if_ee('::EE::GroupMilestone')

app/models/list.rb

@@ -3,8 +3,6 @@
 class List < ApplicationRecord
   include Importable
 
-  prepend_if_ee('::EE::List') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
   belongs_to :board
   belongs_to :label
   has_many :list_user_preferences
@@ -104,3 +102,5 @@ class List < ApplicationRecord
     throw(:abort) unless destroyable? # rubocop:disable Cop/BanCatchThrow
   end
 end
+
+List.prepend_if_ee('::EE::List')

app/models/members_preloader.rb

 # frozen_string_literal: true
 
 class MembersPreloader
-  prepend_if_ee('EE::MembersPreloader') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
   attr_reader :members
 
   def initialize(members)
@@ -16,3 +14,5 @@ class MembersPreloader
     ActiveRecord::Associations::Preloader.new.preload(members.map(&:user), :u2f_registrations)
   end
 end
+
+MembersPreloader.prepend_if_ee('EE::MembersPreloader')

changelogs/unreleased/app-models-2.yml

+---
+title: Move prepend to last line in app models 2
+merge_request: 31827
+author: Rajendra Kadam
+type: fixed