diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-10 00:09:13 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-10 00:09:13 +0000 |
commit | 23e66f03108f811dbb6f9aa4fc463f888666522d (patch) | |
tree | 2a47d8310bc918c10a5340aea3781f7728f65f28 /app/models | |
parent | d8d0344cc3602e2625b7bbd79360b3e5b20b8870 (diff) | |
download | gitlab-ce-23e66f03108f811dbb6f9aa4fc463f888666522d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/ci/build.rb | 1 | ||||
-rw-r--r-- | app/models/ci/pipeline.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 3f002b3ca6b..08e01eff85c 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -522,6 +522,7 @@ module Ci .append(key: 'CI_JOB_ID', value: id.to_s) .append(key: 'CI_JOB_URL', value: Gitlab::Routing.url_helpers.project_job_url(project, self)) .append(key: 'CI_JOB_TOKEN', value: token.to_s, public: false, masked: true) + .append(key: 'CI_JOB_STARTED_AT', value: started_at&.iso8601) .append(key: 'CI_BUILD_ID', value: id.to_s) .append(key: 'CI_BUILD_TOKEN', value: token.to_s, public: false, masked: true) .append(key: 'CI_REGISTRY_USER', value: ::Gitlab::Auth::CI_JOB_USER) diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 7418a091407..b63ec0c8a97 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -777,6 +777,7 @@ module Ci Gitlab::Ci::Variables::Collection.new.tap do |variables| variables.append(key: 'CI_PIPELINE_IID', value: iid.to_s) variables.append(key: 'CI_PIPELINE_SOURCE', value: source.to_s) + variables.append(key: 'CI_PIPELINE_CREATED_AT', value: created_at&.iso8601) variables.concat(predefined_commit_variables) |