Add latest changes from gitlab-org/gitlab@master

app/models/project_authorization.rb

@@ -2,6 +2,7 @@
 class ProjectAuthorization < ApplicationRecord
   include FromUnion
+  prepend_if_ee('::EE::ProjectAuthorization') # rubocop: disable Cop/InjectEnterpriseEditionModule
   belongs_to :user
   belongs_to :project

app/models/project_ci_cd_setting.rb

@@ -36,3 +36,5 @@ class ProjectCiCdSetting < ApplicationRecord
     self.default_git_depth ||= DEFAULT_GIT_DEPTH
   end
 end
+
+ProjectCiCdSetting.prepend_if_ee('EE::ProjectCiCdSetting')

app/models/project_feature.rb

@@ -180,3 +180,5 @@ class ProjectFeature < ApplicationRecord
     project.team.member?(user, ProjectFeature.required_minimum_access_level(feature))
   end
 end
+
+ProjectFeature.prepend_if_ee('EE::ProjectFeature')

app/models/project_group_link.rb

@@ -52,3 +52,5 @@ class ProjectGroupLink < ApplicationRecord
     group.refresh_members_authorized_projects
   end
 end
+
+ProjectGroupLink.prepend_if_ee('EE::ProjectGroupLink')

app/models/project_import_data.rb

@@ -3,6 +3,8 @@
 require 'carrierwave/orm/activerecord'
 class ProjectImportData < ApplicationRecord
+  prepend_if_ee('::EE::ProjectImportData') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
   belongs_to :project, inverse_of: :import_data
   attr_encrypted :credentials,
                  key: Settings.attr_encrypted_db_key_base,

app/models/project_import_state.rb

@@ -99,3 +99,5 @@ class ProjectImportState < ApplicationRecord
     Gitlab::SidekiqStatus.set(jid, StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
   end
 end
+
+ProjectImportState.prepend_if_ee('EE::ProjectImportState')

app/models/project_services/chat_message/merge_message.rb

@@ -2,6 +2,8 @@
 module ChatMessage
   class MergeMessage < BaseMessage
+    prepend_if_ee('::EE::ChatMessage::MergeMessage') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
     attr_reader :merge_request_iid
     attr_reader :source_branch
     attr_reader :target_branch

app/models/project_services/hipchat_service.rb

@@ -309,3 +309,5 @@ class HipchatService < Service
     end
   end
 end
+
+HipchatService.prepend_if_ee('EE::HipchatService')

app/models/project_services/issue_tracker_service.rb

@@ -146,3 +146,5 @@ class IssueTrackerService < Service
     end
   end
 end
+
+IssueTrackerService.prepend_if_ee('EE::IssueTrackerService')

app/models/project_services/mock_deployment_service.rb

@@ -32,3 +32,5 @@ class MockDeploymentService < Service
     false
   end
 end
+
+MockDeploymentService.prepend_if_ee('EE::MockDeploymentService')

app/models/project_statistics.rb

@@ -97,3 +97,5 @@ class ProjectStatistics < ApplicationRecord
     end
   end
 end
+
+ProjectStatistics.prepend_if_ee('EE::ProjectStatistics')

app/models/project_team.rb

@@ -204,3 +204,5 @@ class ProjectTeam
     Member.on_project_and_ancestors(project).select(:user_id)
   end
 end
+
+ProjectTeam.prepend_if_ee('EE::ProjectTeam')

app/models/project_wiki.rb

@@ -225,3 +225,5 @@ class ProjectWiki
     @project.touch(:last_activity_at, :last_repository_updated_at)
   end
 end
+
+ProjectWiki.prepend_if_ee('EE::ProjectWiki')

app/models/prometheus_metric.rb

@@ -67,3 +67,5 @@ class PrometheusMetric < ApplicationRecord
     PrometheusMetricEnums.group_details.fetch(group.to_sym)
   end
 end
+
+PrometheusMetric.prepend_if_ee('EE::PrometheusMetric')

app/models/prometheus_metric_enums.rb

@@ -76,3 +76,5 @@ module PrometheusMetricEnums
     }.freeze
   end
 end
+
+PrometheusMetricEnums.prepend_if_ee('EE::PrometheusMetricEnums')

app/models/protected_branch.rb

@@ -41,3 +41,5 @@ class ProtectedBranch < ApplicationRecord
     project.protected_branches.select(:name)
   end
 end
+
+ProtectedBranch.prepend_if_ee('EE::ProtectedBranch')

app/models/push_event_payload.rb

@@ -22,3 +22,5 @@ class PushEventPayload < ApplicationRecord
     tag: 1
   }
 end
+
+PushEventPayload.prepend_if_ee('EE::PushEventPayload')

app/models/remote_mirror.rb

@@ -304,3 +304,5 @@ class RemoteMirror < ApplicationRecord
     saved_change_to_url? || saved_change_to_credentials?
   end
 end
+
+RemoteMirror.prepend_if_ee('EE::RemoteMirror')

app/models/repository.rb

@@ -1172,3 +1172,5 @@ class Repository
                                 project.full_path)
   end
 end
+
+Repository.prepend_if_ee('EE::Repository')

app/models/resource_label_event.rb

@@ -125,3 +125,5 @@ class ResourceLabelEvent < ApplicationRecord
     [self.class.name, created_at, user_id]
   end
 end
+
+ResourceLabelEvent.prepend_if_ee('EE::ResourceLabelEvent')