diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-27 19:46:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-27 19:46:53 +0000 |
| commit | ad1c34c03de42ebc5279f338f6304e77930d34d4 (patch) | |
| tree | e0fc830af3a684bef60ffe850d5cb2e3b6e401e5 | |
| parent | b1a082345cee74a633bc8536e00b09fc5c425a60 (diff) | |
| download | gitlab-ce-ad1c34c03de42ebc5279f338f6304e77930d34d4.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-1-stable-ee
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 3aa8ab1591a..318ac20435e 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -15,6 +15,9 @@ variables: SETUP_DB: "false" WEBPACK_VENDOR_DLL: "true" + # Disable warnings in browserslist which can break on backports + # https://github.com/browserslist/browserslist/blob/a287ec6/node.js#L367-L384 + BROWSERSLIST_IGNORE_OLD_DATA: "true" stage: prepare script: - *yarn-install @@ -164,6 +167,10 @@ graphql-schema-dump: extends: - .default-retry - .yarn-cache + variables: + # Disable warnings in browserslist which can break on backports + # https://github.com/browserslist/browserslist/blob/a287ec6/node.js#L367-L384 + BROWSERSLIST_IGNORE_OLD_DATA: "true" stage: test eslint-as-if-foss: diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 0dfc353820f..179c00b479c 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -235,6 +235,9 @@ update-gitaly-binaries-cache: variables: SETUP_DB: "false" ENABLE_SPRING: "1" + # Disable warnings in browserslist which can break on backports + # https://github.com/browserslist/browserslist/blob/a287ec6/node.js#L367-L384 + BROWSERSLIST_IGNORE_OLD_DATA: "true" update-static-analysis-cache: extends: |