summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-11-15 17:27:08 +0000
committerRémy Coutable <remy@rymai.me>2018-11-15 17:27:08 +0000
commit97e3d5ce292d056a9dd15e16823b9570832db02a (patch)
tree60ae4aff05167f0983a52d95c89383400efb557e /.gitlab-ci.yml
parent42df618bbbec70d45b8e04a4aafa87cca9d5d742 (diff)
parent553eaf01f7f299842d0985325e11ff8f58ef9c03 (diff)
downloadgitlab-ce-97e3d5ce292d056a9dd15e16823b9570832db02a.tar.gz
Merge branch 'conditionally-build-assets-image' into 'master'
Add BUILD_ASSETS_IMAGE CI variable See merge request gitlab-org/gitlab-ce!23076
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82d2cb8d09f..b7f18673a58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,6 +32,7 @@ variables:
GET_SOURCES_ATTEMPTS: "3"
KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
+ BUILD_ASSETS_IMAGE: "false"
before_script:
- bundle --version