diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-12 15:59:39 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-12 15:59:39 +0000 |
| commit | 80c1626b2776b300acaaee85d11012b96893d004 (patch) | |
| tree | 23b8e8ea25812a2311b9c1fe0197a96a8e734731 | |
| parent | 0a22ff267b2d3d787d3da44d927caac7bd442832 (diff) | |
| parent | da64e97e0c84f0e3354126bc427c34f7a0924d52 (diff) | |
| download | gitlab-ce-80c1626b2776b300acaaee85d11012b96893d004.tar.gz | |
Merge branch '40994-fix-ee-ce-compatible-test' into 'master'
Make GITLAB_FEATURES in build_spec compatible with EE
Closes #40994
See merge request gitlab-org/gitlab-ce!17023
| -rw-r--r-- | spec/models/ci/build_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 78fcbf6d47e..2b6b6a61182 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -1413,7 +1413,7 @@ describe Ci::Build do [ { key: 'CI', value: 'true', public: true }, { key: 'GITLAB_CI', value: 'true', public: true }, - { key: 'GITLAB_FEATURES', value: '', public: true }, + { key: 'GITLAB_FEATURES', value: project.namespace.features.join(','), public: true }, { key: 'CI_SERVER_NAME', value: 'GitLab', public: true }, { key: 'CI_SERVER_VERSION', value: Gitlab::VERSION, public: true }, { key: 'CI_SERVER_REVISION', value: Gitlab::REVISION, public: true }, |