diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-05 08:38:31 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-05 08:38:31 +0000 |
| commit | 1d5f2f9c333534b7004501bcfa52ca873d6a3403 (patch) | |
| tree | 7f905ecbb6b4d45ced22e71003521ba70f20cfb8 | |
| parent | f336133edceec122effc4dc88666ba0bf39ff15d (diff) | |
| parent | 5423e5464943e30c4eadf874f86fa86cd2d557ad (diff) | |
| download | gitlab-ce-1d5f2f9c333534b7004501bcfa52ca873d6a3403.tar.gz | |
Merge branch '37473-expose-project-visibility-as-ci-variable' into 'master'
Resolve "Expose project visibility as CI variable"
Closes #37473
See merge request gitlab-org/gitlab-ce!15193
| -rw-r--r-- | app/models/project.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/37473-expose-project-visibility-as-ci-variable.yml | 5 | ||||
| -rw-r--r-- | doc/ci/variables/README.md | 1 | ||||
| -rw-r--r-- | spec/models/ci/build_spec.rb | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 2f9b80d0514..b04aec550b1 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1492,7 +1492,8 @@ class Project < ActiveRecord::Base { key: 'CI_PROJECT_PATH', value: full_path, public: true }, { key: 'CI_PROJECT_PATH_SLUG', value: full_path_slug, public: true }, { key: 'CI_PROJECT_NAMESPACE', value: namespace.full_path, public: true }, - { key: 'CI_PROJECT_URL', value: web_url, public: true } + { key: 'CI_PROJECT_URL', value: web_url, public: true }, + { key: 'CI_PROJECT_VISIBILITY', value: Gitlab::VisibilityLevel.string_level(visibility_level), public: true } ] end diff --git a/changelogs/unreleased/37473-expose-project-visibility-as-ci-variable.yml b/changelogs/unreleased/37473-expose-project-visibility-as-ci-variable.yml new file mode 100644 index 00000000000..f6906a3b0e0 --- /dev/null +++ b/changelogs/unreleased/37473-expose-project-visibility-as-ci-variable.yml @@ -0,0 +1,5 @@ +--- +title: Expose project visibility as CI variable - CI_PROJECT_VISIBILITY +merge_request: 15193 +author: +type: added diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index 535ed351366..a9e6bda9916 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -66,6 +66,7 @@ future GitLab releases.** | **CI_PROJECT_PATH** | 8.10 | 0.5 | The namespace with project name | | **CI_PROJECT_PATH_SLUG** | 9.3 | all | `$CI_PROJECT_PATH` lowercased and with everything except `0-9` and `a-z` replaced with `-`. Use in URLs and domain names. | | **CI_PROJECT_URL** | 8.10 | 0.5 | The HTTP address to access project | +| **CI_PROJECT_VISIBILITY** | 10.3 | all | The project visibility (internal, private, public) | | **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 returns the address of the registry tied to the specific project | | **CI_REGISTRY_PASSWORD** | 9.0 | all | The password to use to push containers to the GitLab Container Registry | diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 41ecdb604f1..5ed2e1ca99a 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -1271,6 +1271,7 @@ describe Ci::Build do { key: 'CI_PROJECT_PATH_SLUG', value: project.full_path_slug, public: true }, { key: 'CI_PROJECT_NAMESPACE', value: project.namespace.full_path, public: true }, { key: 'CI_PROJECT_URL', value: project.web_url, public: true }, + { key: 'CI_PROJECT_VISIBILITY', value: 'private', public: true }, { key: 'CI_PIPELINE_ID', value: pipeline.id.to_s, public: true }, { key: 'CI_CONFIG_PATH', value: pipeline.ci_yaml_file_path, public: true }, { key: 'CI_REGISTRY_USER', value: 'gitlab-ci-token', public: true }, |