Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-11-10 21:11:08 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-11-10 21:11:08 +0300
commit4e50b9ed316f3c99693a41274babcd67c63ee640 (patch)
tree21f0f3a7f73a7dd51b06ba62ad9cfa3eaab85c9f /lib/gitlab/data_builder
parent609943de5e2ee6c3bf0f09d3fb1d5fc38ed5a4ed (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/data_builder')
-rw-r--r--lib/gitlab/data_builder/build.rb2
-rw-r--r--lib/gitlab/data_builder/pipeline.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/data_builder/build.rb b/lib/gitlab/data_builder/build.rb
index 4640f85bb0a..f701f84291e 100644
--- a/lib/gitlab/data_builder/build.rb
+++ b/lib/gitlab/data_builder/build.rb
@@ -91,7 +91,7 @@ module Gitlab
end
def build_environment(build)
- return unless build.has_environment?
+ return unless build.has_environment_keyword?
{
name: build.expanded_environment_name,
diff --git a/lib/gitlab/data_builder/pipeline.rb b/lib/gitlab/data_builder/pipeline.rb
index 7753974b621..939eaa377aa 100644
--- a/lib/gitlab/data_builder/pipeline.rb
+++ b/lib/gitlab/data_builder/pipeline.rb
@@ -147,7 +147,7 @@ module Gitlab
end
def environment_hook_attrs(build)
- return unless build.has_environment?
+ return unless build.has_environment_keyword?
{
name: build.expanded_environment_name,