diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 18:07:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 18:07:53 +0300 |
commit | d7a028e20d29b8c6d0e780ac168544dfbb712d3c (patch) | |
tree | f9fc9ea12e166aec6c4ffe476ba7a3566396b696 /lib | |
parent | 0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
3 files changed, 2 insertions, 81 deletions
diff --git a/lib/gitlab/ci/pipeline/chain/config/content.rb b/lib/gitlab/ci/pipeline/chain/config/content.rb index 66bead3a416..2008010b523 100644 --- a/lib/gitlab/ci/pipeline/chain/config/content.rb +++ b/lib/gitlab/ci/pipeline/chain/config/content.rb @@ -16,15 +16,9 @@ module Gitlab Gitlab::Ci::Pipeline::Chain::Config::Content::AutoDevops ].freeze - LEGACY_SOURCES = [ - Gitlab::Ci::Pipeline::Chain::Config::Content::Bridge, - Gitlab::Ci::Pipeline::Chain::Config::Content::LegacyRepository, - Gitlab::Ci::Pipeline::Chain::Config::Content::LegacyAutoDevops - ].freeze - def perform! if config = find_config - @pipeline.build_pipeline_config(content: config.content) if ci_root_config_content_enabled? + @pipeline.build_pipeline_config(content: config.content) @command.config_content = config.content @pipeline.config_source = config.source else @@ -39,21 +33,13 @@ module Gitlab private def find_config - sources.each do |source| + SOURCES.each do |source| config = source.new(@pipeline, @command) return config if config.exists? end nil end - - def sources - ci_root_config_content_enabled? ? SOURCES : LEGACY_SOURCES - end - - def ci_root_config_content_enabled? - Feature.enabled?(:ci_root_config_content, @command.project, default_enabled: true) - end end end end diff --git a/lib/gitlab/ci/pipeline/chain/config/content/legacy_auto_devops.rb b/lib/gitlab/ci/pipeline/chain/config/content/legacy_auto_devops.rb deleted file mode 100644 index 5e4bb84360c..00000000000 --- a/lib/gitlab/ci/pipeline/chain/config/content/legacy_auto_devops.rb +++ /dev/null @@ -1,34 +0,0 @@ -# frozen_string_literal: true - -module Gitlab - module Ci - module Pipeline - module Chain - module Config - class Content - class LegacyAutoDevops < Source - def content - strong_memoize(:content) do - next unless project&.auto_devops_enabled? - - template = Gitlab::Template::GitlabCiYmlTemplate.find(template_name) - template.content - end - end - - def source - :auto_devops_source - end - - private - - def template_name - 'Auto-DevOps' - end - end - end - end - end - end - end -end diff --git a/lib/gitlab/ci/pipeline/chain/config/content/legacy_repository.rb b/lib/gitlab/ci/pipeline/chain/config/content/legacy_repository.rb deleted file mode 100644 index fa4a97c6880..00000000000 --- a/lib/gitlab/ci/pipeline/chain/config/content/legacy_repository.rb +++ /dev/null @@ -1,31 +0,0 @@ -# frozen_string_literal: true - -module Gitlab - module Ci - module Pipeline - module Chain - module Config - class Content - class LegacyRepository < Source - def content - strong_memoize(:content) do - next unless project - next unless @pipeline.sha - next unless ci_config_path - - project.repository.gitlab_ci_yml_for(@pipeline.sha, ci_config_path) - rescue GRPC::NotFound, GRPC::Internal - nil - end - end - - def source - :repository_source - end - end - end - end - end - end - end -end |