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

Move prepend to last line in app models - 1

See merge request gitlab-org/gitlab!31826

app/models/commit_status.rb

@@ -7,8 +7,6 @@ class CommitStatus < ApplicationRecord
   include Presentable
   include EnumWithNil
 
-  prepend_if_ee('::EE::CommitStatus') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
   self.table_name = 'ci_builds'
 
   belongs_to :user
@@ -292,3 +290,5 @@ class CommitStatus < ApplicationRecord
     end
   end
 end
+
+CommitStatus.prepend_if_ee('::EE::CommitStatus')

app/models/global_milestone.rb

@@ -2,7 +2,6 @@
 # Global Milestones are milestones that can be shared across multiple projects
 class GlobalMilestone
   include Milestoneish
-  include_if_ee('::EE::GlobalMilestone') # rubocop: disable Cop/InjectEnterpriseEditionModule
 
   STATE_COUNT_HASH = { opened: 0, closed: 0, all: 0 }.freeze
 
@@ -105,3 +104,5 @@ class GlobalMilestone
     true
   end
 end
+
+GlobalMilestone.include_if_ee('::EE::GlobalMilestone')

changelogs/unreleased/app-models-1.yml

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