diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:39 +0300 |
| commit | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (patch) | |
| tree | 70945aa6721a271fc8057efa13c3216a03fbac45 /.gitlab | |
| parent | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 4daab8e4c1f..3ef28e02e9d 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -80,6 +80,9 @@ - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*" - "doc/api/graphql/reference/*" # Files in this folder are auto-generated +.frontend-dependency-patterns: &frontend-dependency-patterns + - "{package.json,yarn.lock}" + .qa-patterns: &qa-patterns - ".dockerignore" - "qa/**/*" @@ -270,6 +273,9 @@ rules: - <<: *if-master-refs when: on_success + - <<: *if-merge-request + changes: *frontend-dependency-patterns + when: on_success ################ # Memory rules # |