diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-12 13:49:58 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-12 13:49:58 +0100 |
| commit | 83ad5de637b884d97b3350a468b9a66c71507dca (patch) | |
| tree | 6344200848b6da6b24a1fdbdb3cc2c4745ee6366 /app/models/ci/pipeline.rb | |
| parent | 7f5703484b957718d4f9f576cf8ac22acc45c8de (diff) | |
| parent | d94b162129ed7d3131efe7822a4f0c6b4991fb8e (diff) | |
| download | gitlab-ce-83ad5de637b884d97b3350a468b9a66c71507dca.tar.gz | |
Merge branch 'master' into fl-eslint-vue-house-keepingfl-eslint-vue-house-keeping
* master: (47 commits)
Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter
i18n: document how to use links without splitting sentences
Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb"
Add CI job to check Gemfile.rails5.lock
Add navigation theme documentation
Move Gitaly branch/tag/ref RPC's to opt-out
Add CI_{PIPELINE,JOB}_URL
Resolve "Update docs as GKE cluster creation label has changed from "project ID" to "project""
fixed/enhanced command-line documentation
Use nip.io instead of xip.io
[Rails5] Update Gitlab.rails5.lock
Fix typo in doc/development/README.md
Update import screenshot without LFS warning
Hide overflow on hr
Resolve "Milestone and labels dropdowns are misplaced with collapsed sidebar"
Fix collapse sidebar button color
Remove .row and .col-sm-12
Relax expectation in spec/models/project_spec.rb
fix padding in commit info
GitHub Rake importer: Fail with a clearer explanation if GitLab username is wrong
...
Diffstat (limited to 'app/models/ci/pipeline.rb')
| -rw-r--r-- | app/models/ci/pipeline.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 0878356e87a..f430f18ca9a 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -549,7 +549,10 @@ module Ci def persisted_variables Gitlab::Ci::Variables::Collection.new.tap do |variables| - variables.append(key: 'CI_PIPELINE_ID', value: id.to_s) if persisted? + break variables unless persisted? + + variables.append(key: 'CI_PIPELINE_ID', value: id.to_s) + variables.append(key: 'CI_PIPELINE_URL', value: Gitlab::Routing.url_helpers.project_pipeline_url(project, self)) end end |