diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 12:07:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 12:07:48 +0300 |
| commit | 5bd24a54ef4ce3a38a860eb53b66d062c2382971 (patch) | |
| tree | 5f5e65571dfcb2c62c27600ee7655dec4b44c923 /.gitlab | |
| parent | 74673d04d25ffed35cbcf17cd42969bed0a4e705 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/docs.gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 07375fca611..cd0e4085e10 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -24,7 +24,8 @@ - apk add --update openssl - wget $CI_PROJECT_URL/raw/$CI_COMMIT_SHA/scripts/trigger-build-docs - chmod 755 trigger-build-docs - - gem install gitlab --no-document + - gem install httparty --no-document --version 0.17.3 + - gem install gitlab --no-document --version 4.13.0 # Always trigger a docs build in gitlab-docs only on docs-only branches. # Useful to preview the docs changes live. diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 0c83f87eac6..5bd19309528 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -244,7 +244,9 @@ webpack-dev-server: dependencies: ["setup-test-env", "compile-assets pull-cache"] variables: WEBPACK_MEMORY_TEST: "true" + WEBPACK_VENDOR_DLL: "true" script: + - yarn webpack-vendor - node --expose-gc node_modules/.bin/webpack-dev-server --config config/webpack.config.js artifacts: name: webpack-dev-server |