Merge branch 'qa-run-karma' into 'master'

Run karma for qa-* branches See merge request gitlab-org/gitlab-ce!22464

Merge branch 'qa-run-karma' into 'master'
Run karma for qa-* branches See merge request gitlab-org/gitlab-ce!22464
10bb8297 · Phil Hughes · 9b568537 · 77ea3330 · 10bb8297
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

.gitlab-ci.yml .gitlab-ci.yml +1 -1

未找到文件。
--- 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