Add latest changes from gitlab-org/gitlab@master

7 files changed, 15 insertions, 1 deletions

diff --git a/app/models/ci/bridge.rb b/app/models/ci/bridge.rb
index 644716ba8e7..6c51f650b6a 100644
--- a/app/models/ci/bridge.rb
+++ b/app/models/ci/bridge.rb
@@ -56,3 +56,5 @@ module Ci
     end
   end
 end
+
+::Ci::Bridge.prepend_if_ee('::EE::Ci::Bridge')
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 72782827906..71c4501f57b 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -868,3 +868,5 @@ module Ci
     end
   end
 end
+
+Ci::Build.prepend_if_ee('EE::Ci::Build')
diff --git a/app/models/ci/build_runner_session.rb b/app/models/ci/build_runner_session.rb
index 8075c15bbaf..b46bbe69c7c 100644
--- a/app/models/ci/build_runner_session.rb
+++ b/app/models/ci/build_runner_session.rb
@@ -37,3 +37,5 @@ module Ci
     end
   end
 end
+
+Ci::BuildRunnerSession.prepend_if_ee('EE::Ci::BuildRunnerSession')
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb
index b4497d8af09..da2758507ce 100644
--- a/app/models/ci/job_artifact.rb
+++ b/app/models/ci/job_artifact.rb
@@ -198,3 +198,5 @@ module Ci
     end
   end
 end
+
+Ci::JobArtifact.prepend_if_ee('EE::Ci::JobArtifact')
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 29317cd530d..0c331b0b8c9 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -904,3 +904,5 @@ module Ci
     end
   end
 end
+
+Ci::Pipeline.prepend_if_ee('EE::Ci::Pipeline')
diff --git a/app/models/ci/pipeline_enums.rb b/app/models/ci/pipeline_enums.rb
index 0c2bd0aa8eb..cb92aef4bda 100644
--- a/app/models/ci/pipeline_enums.rb
+++ b/app/models/ci/pipeline_enums.rb
@@ -39,3 +39,5 @@ module Ci
     end
   end
 end
+
+Ci::PipelineEnums.prepend_if_ee('EE::Ci::PipelineEnums')
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index e0e905ebfa8..c4a4410e8fc 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -35,7 +35,7 @@ module Ci
 
     FORM_EDITABLE = %i[description tag_list active run_untagged locked access_level maximum_timeout_human_readable].freeze
 
-    self.ignored_columns = %i[is_shared]
+    self.ignored_columns += %i[is_shared]
 
     has_many :builds
     has_many :runner_projects, inverse_of: :runner, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
@@ -335,3 +335,5 @@ module Ci
     end
   end
 end
+
+Ci::Runner.prepend_if_ee('EE::Ci::Runner')