Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Martinez <jmartinez@gitlab.com>2020-08-10 06:28:01 +0300
committerJaime Martinez <jmartinez@gitlab.com>2020-08-24 02:35:49 +0300
commit444d24d09112089c86c38c0e8effdf676b1a4897 (patch)
treef7e8368f60cda87672cde230fd325d02c66dc227 /.gitlab-ci.yml
parent356c2136b7890df3c2caa1820acafe3f44ea037a (diff)
Override dependency_scanning to run on MRs
(cherry picked from commit 7409b7856d8afd26a6ca646db4501c15fe4bcdc4)
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e121cb2..a6098fbe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,6 +60,12 @@ license_scanning:
- if: $CI_COMMIT_BRANCH == 'master'
when: on_success
+dependency_scanning:
+ stage: prepare
+ rules:
+ - if: '$CI_MERGE_REQUEST_ID'
+ - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+
# disable eslint-sast since html files are fixtures for testing
eslint-sast:
rules: