summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-27 20:49:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-27 20:49:46 +0000
commite9f0f9e070400634838706953026be4083b8cc2a (patch)
treea737eda5a40cafa75483a448de59dcd5b5645ba1 /.gitlab
parenta6d8c2e0c68d326e3017b875668da8d16d8d299c (diff)
downloadgitlab-ce-e9f0f9e070400634838706953026be4083b8cc2a.tar.gz
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/frontend.gitlab-ci.yml7
-rw-r--r--.gitlab/ci/rails.gitlab-ci.yml3
2 files changed, 10 insertions, 0 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index 33aab8554e7..dc76a872cdb 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 68804b0f4c1..126cb73f526 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -210,6 +210,9 @@ update-setup-test-env-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: