Merge branch 'refactor-ci-pipeline-config-source-enum' into 'master'

Refactor Ci::Pipeline's config_sources enum

Closes gitlab-ee#8244

See merge request gitlab-org/gitlab-ce!23799

2 files changed, 11 insertions, 5 deletions

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index d06022a0fb7..2cdb4780412 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -68,11 +68,7 @@ module Ci
     # this `Hash` with new values.
     enum_with_nil source: ::Ci::PipelineEnums.sources
 
-    enum_with_nil config_source: {
-      unknown_source: nil,
-      repository_source: 1,
-      auto_devops_source: 2
-    }
+    enum_with_nil config_source: ::Ci::PipelineEnums.config_sources
 
     # We use `Ci::PipelineEnums.failure_reasons` here so that EE can more easily
     # extend this `Hash` with new values.
diff --git a/app/models/ci/pipeline_enums.rb b/app/models/ci/pipeline_enums.rb
index c0f16066e0b..2994aaae4aa 100644
--- a/app/models/ci/pipeline_enums.rb
+++ b/app/models/ci/pipeline_enums.rb
@@ -25,5 +25,15 @@ module Ci
         merge_request: 10
       }
     end
+
+    # Returns the `Hash` to use for creating the `config_sources` enum for
+    # `Ci::Pipeline`.
+    def self.config_sources
+      {
+        unknown_source: nil,
+        repository_source: 1,
+        auto_devops_source: 2
+      }
+    end
   end
 end