diff options
| author | Phil Hughes <me@iamphill.com> | 2018-10-23 07:44:43 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-10-23 07:44:43 +0000 |
| commit | 10bb8297ebe5fc01540b20c3fd365234779b6837 (patch) | |
| tree | 84b9b9e1de1263cdc4d8ee6e80694bfe31e48087 | |
| parent | 9b5685379efcb6ce43c8f8b38404152a8dc3ad9b (diff) | |
| parent | 77ea33304a903408c84798fcddf571781a5d6c31 (diff) | |
| download | gitlab-ce-10bb8297ebe5fc01540b20c3fd365234779b6837.tar.gz | |
Merge branch 'qa-run-karma' into 'master'
Run karma for qa-* branches
See merge request gitlab-org/gitlab-ce!22464
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c652b6c75e2..b3593df8b13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -723,7 +723,7 @@ gitlab:assets:compile: - public/assets/ karma: - <<: *dedicated-no-docs-and-no-qa-pull-cache-job + <<: *dedicated-no-docs-pull-cache-job <<: *use-pg dependencies: - compile-assets |