diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-15 12:52:55 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-15 12:52:55 +0000 |
commit | 2a2b65c4b97a039c553d829d56a58875cde91754 (patch) | |
tree | 022455dec95c3220950d3ae2ce5a5faf530a1fd8 /app/models/environment.rb | |
parent | 0e1c67d15cc2042907cd7e2ed2fb40f2b476a33c (diff) | |
parent | a830c49a3fcf684f89ea5068bbca8ccc1b83fc4c (diff) | |
download | gitlab-ce-2a2b65c4b97a039c553d829d56a58875cde91754.tar.gz |
Merge branch 'backstage/gb/refactor-ci-cd-variables-collections' into 'master'42762-project-settings-sections-cannot-be-expanded-after-submission-error
Introduce CI/CD variables collection
Closes #33042
See merge request gitlab-org/gitlab-ce!14439
Diffstat (limited to 'app/models/environment.rb')
-rw-r--r-- | app/models/environment.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb index 2b0a88ac5b4..9517723d9d9 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -65,10 +65,9 @@ class Environment < ActiveRecord::Base end def predefined_variables - [ - { key: 'CI_ENVIRONMENT_NAME', value: name, public: true }, - { key: 'CI_ENVIRONMENT_SLUG', value: slug, public: true } - ] + Gitlab::Ci::Variables::Collection.new + .append(key: 'CI_ENVIRONMENT_NAME', value: name) + .append(key: 'CI_ENVIRONMENT_SLUG', value: slug) end def recently_updated_on_branch?(ref) |