diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-26 03:09:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-26 03:09:13 +0300 |
commit | 89a4f4761d7964623e7a97cde7f142ffb23edb5a (patch) | |
tree | fcdb913c8be09124ae7bd3f19b42a1b38ca8442a /app/models | |
parent | 3e78ae6ec18bcd692f8250091e053db40801bf09 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/ci/build.rb | 13 | ||||
-rw-r--r-- | app/models/ci/pipeline.rb | 5 |
2 files changed, 5 insertions, 13 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 3e80456a6f2..6c90645e997 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -539,7 +539,6 @@ module Ci .concat(job_variables) .concat(environment_changed_page_variables) .concat(persisted_environment_variables) - .concat(deploy_freeze_variables) .to_runner_variables end end @@ -595,18 +594,6 @@ module Ci end end - def deploy_freeze_variables - Gitlab::Ci::Variables::Collection.new.tap do |variables| - break variables unless freeze_period? - - variables.append(key: 'CI_DEPLOY_FREEZE', value: 'true') - end - end - - def freeze_period? - Ci::FreezePeriodStatus.new(project: project).execute - end - def dependency_variables return [] if all_dependencies.empty? diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 14d62d0901f..0eb37242b79 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -604,6 +604,10 @@ module Ci project.deployment_platform&.active? end + def freeze_period? + Ci::FreezePeriodStatus.new(project: project).execute + end + def has_warnings? number_of_warnings.positive? end @@ -714,6 +718,7 @@ module Ci end variables.append(key: 'CI_KUBERNETES_ACTIVE', value: 'true') if has_kubernetes_active? + variables.append(key: 'CI_DEPLOY_FREEZE', value: 'true') if freeze_period? if external_pull_request_event? && external_pull_request variables.concat(external_pull_request.predefined_variables) |