diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-07-20 14:00:25 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-07-20 14:00:25 +0200 |
| commit | 8eafdafdda25071dcad4ce143d5c65c1ca278730 (patch) | |
| tree | 31af0b91f1ca79a182fe72118602915042ef3e59 | |
| parent | f62cbe618bc2a17bb4ed85179d42f223854cb1a5 (diff) | |
| download | gitlab-ce-ci-predefined-variables.tar.gz | |
Fix review commentsci-predefined-variables
| -rw-r--r-- | app/models/project.rb | 5 | ||||
| -rw-r--r-- | doc/ci/variables/README.md | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 71e22087187..a2a91888a54 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1182,7 +1182,10 @@ class Project < ActiveRecord::Base { key: 'CI_REGISTRY', value: Gitlab.config.registry.host_port, public: true } ] - variables << { key: 'CI_REGISTRY_IMAGE', value: container_registry_repository_url, public: true } if container_registry_enabled? + if container_registry_enabled? + variables << { key: 'CI_REGISTRY_IMAGE', value: container_registry_repository_url, public: true } + end + variables end diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index c9eebec801d..4bf610f0e9a 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -44,7 +44,7 @@ The `API_TOKEN` will take the Secure Variable value: `SECURE`. | **CI_PROJECT_DIR** | all | all | The full path where the repository is cloned and where the build is run | | **CI_REGISTRY** | 8.10 | 0.5 | If the Container Registry is enabled it returns the address of GitLab's Container Registry | | **CI_REGISTRY_IMAGE** | 8.10 | 0.5 | If the Container Registry is enabled for the project it returnes the address of the registry tied to the specific project | -| **CI_RUNNER_ID** | 8.10 | 0.5 | The unique id of the used runner | +| **CI_RUNNER_ID** | 8.10 | 0.5 | The unique id of runner being used | | **CI_RUNNER_DESCRIPTION** | 8.10 | 0.5 | The description of the runner as saved in GitLab | | **CI_RUNNER_TAGS** | 8.10 | 0.5 | The defined runner tags | |