diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-27 20:47:10 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-27 20:47:10 +0000 |
commit | 5f7307f6d99a45d64bb0ebbe74e47c4a93277011 (patch) | |
tree | 70103d63bc9a130491e49edb4527953dcec4ee1e | |
parent | 6d2769114322a5a14d0abb3be832166f41f70a5e (diff) | |
download | gitlab-ce-5f7307f6d99a45d64bb0ebbe74e47c4a93277011.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-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 dfd595c2696..72e38dba0a4 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -11,6 +11,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 @@ -142,6 +145,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 b74c8ebf575..65eb4d12828 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -218,6 +218,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: |