diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-02 21:10:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-02 21:10:01 +0300 |
commit | e84a2fdfc862ac63fe4be9df2f940c22a0c9aba3 (patch) | |
tree | 8a64589231ede24f385d2819b3440fca001e482d /.gitlab | |
parent | 1c2ff01b694fd06be15bc20279eef71ee5adf402 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 27 | ||||
-rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 11 |
2 files changed, 0 insertions, 38 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index a772c1b847f..33aab8554e7 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -317,30 +317,3 @@ bundle-size-review: expire_in: 31d paths: - bundle-size-review - -.startup-css-check-base: - extends: - - .frontend-test-base - script: - - *yarn-install - - run_timed_command "yarn generate:startup_css" - - yarn check:startup_css - -startup-css-check: - extends: - - .startup-css-check-base - - .frontend:rules:startup-css-check - needs: - - job: "compile-test-assets" - - job: "rspec frontend_fixture" - - job: "rspec-ee frontend_fixture" - optional: true - -startup-css-check as-if-foss: - extends: - - .startup-css-check-base - - .as-if-foss - - .frontend:rules:startup-css-check-as-if-foss - needs: - - job: "compile-test-assets as-if-foss" - - job: "rspec frontend_fixture as-if-foss" diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 0a937f132cd..fbc010f90b5 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -485,17 +485,6 @@ changes: *frontend-build-patterns allow_failure: true -.frontend:rules:startup-css-check: - rules: - - changes: *code-backstage-qa-patterns - -.frontend:rules:startup-css-check-as-if-foss: - rules: - - <<: *if-not-ee - when: never - - <<: *if-merge-request - changes: *code-backstage-qa-patterns - ################ # Memory rules # ################ |