diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-21 14:35:28 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-21 14:35:28 -0700 |
| commit | 7b223f3838b0ee9ff70bc8096290a8e0f9847642 (patch) | |
| tree | 7cd43842a0042e28d3f716d574c041eb98f86c50 /.gitlab-ci.yml | |
| parent | 841a5ef5be66a9a770cccf0d1520b501d0857155 (diff) | |
| parent | ce57827268e30fc787fa8d7fe18231b0bb6298b7 (diff) | |
| download | gitlab-ce-7b223f3838b0ee9ff70bc8096290a8e0f9847642.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7a091da6ae..376f0a3f2ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -259,7 +259,7 @@ setup-test-env: <<: *default-cache script: - node --version - - yarn install --pure-lockfile --cache-folder .yarn-cache + - yarn install --frozen-lockfile --cache-folder .yarn-cache - bundle exec rake gettext:po_to_json - bundle exec rake gitlab:assets:compile - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' @@ -508,7 +508,7 @@ gitlab:assets:compile: WEBPACK_REPORT: "true" NO_COMPRESSION: "true" script: - - yarn install --pure-lockfile --production --cache-folder .yarn-cache + - yarn install --frozen-lockfile --production --cache-folder .yarn-cache - bundle exec rake gettext:po_to_json - bundle exec rake gitlab:assets:compile artifacts: |