diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-13 14:01:48 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-13 14:01:48 +0100 |
| commit | 937e7f9e9669d4939cd6c5055a90339ff79d216b (patch) | |
| tree | 5f794b0f892fbbc117101097b805c2da5dcac45e /app/models/project.rb | |
| parent | 0cf0a7a898f06fc2a154683e76dc9199832c01c8 (diff) | |
| download | gitlab-ce-937e7f9e9669d4939cd6c5055a90339ff79d216b.tar.gz | |
Make predefined variables in a collection public by default
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 85a4d570e9a..c1d8d43f380 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1574,13 +1574,13 @@ class Project < ActiveRecord::Base visibility = Gitlab::VisibilityLevel.string_level(visibility_level) Gitlab::Ci::Variables::Collection.new.tap do |variables| - variables.append(key: 'CI_PROJECT_ID', value: id.to_s, public: true) - variables.append(key: 'CI_PROJECT_NAME', value: path, public: true) - variables.append(key: 'CI_PROJECT_PATH', value: full_path, public: true) - variables.append(key: 'CI_PROJECT_PATH_SLUG', value: full_path_slug, public: true) - variables.append(key: 'CI_PROJECT_NAMESPACE', value: namespace.full_path, public: true) - variables.append(key: 'CI_PROJECT_URL', value: web_url, public: true) - variables.append(key: 'CI_PROJECT_VISIBILITY', value: visibility, public: true) + variables.append(key: 'CI_PROJECT_ID', value: id.to_s) + variables.append(key: 'CI_PROJECT_NAME', value: path) + variables.append(key: 'CI_PROJECT_PATH', value: full_path) + variables.append(key: 'CI_PROJECT_PATH_SLUG', value: full_path_slug) + variables.append(key: 'CI_PROJECT_NAMESPACE', value: namespace.full_path) + variables.append(key: 'CI_PROJECT_URL', value: web_url) + variables.append(key: 'CI_PROJECT_VISIBILITY', value: visibility) variables.concat(container_registry_variables) variables.concat(auto_devops_variables) end @@ -1590,10 +1590,10 @@ class Project < ActiveRecord::Base Gitlab::Ci::Variables::Collection.new.tap do |variables| return variables unless Gitlab.config.registry.enabled - variables.append(key: 'CI_REGISTRY', value: Gitlab.config.registry.host_port, public: true) + variables.append(key: 'CI_REGISTRY', value: Gitlab.config.registry.host_port) if container_registry_enabled? - variables.append(key: 'CI_REGISTRY_IMAGE', value: container_registry_url, public: true) + variables.append(key: 'CI_REGISTRY_IMAGE', value: container_registry_url) end end end |