summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-02-20 21:36:35 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2017-02-20 21:36:35 +0000
commit881529495379505542033bf7fb0d91cdc5b51e8d (patch)
tree2cfc620ff363039c6a459b2b9c4843d3f794ea69
parent2cf17c429588d773de85f4440dbf5d6b39293c26 (diff)
parent50c621623e425f6d665f53807137091e91f3afb6 (diff)
downloadgitlab-ce-881529495379505542033bf7fb0d91cdc5b51e8d.tar.gz
Merge branch 'rename-karma-job' into 'master'
Rename karma job to rake karma See merge request !9342
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8619d7d3f8..433b3119fba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -240,7 +240,7 @@ rake db:seed_fu:
paths:
- log/development.log
-karma:
+rake karma:
cache:
paths:
- vendor/ruby
@@ -387,7 +387,7 @@ pages:
<<: *dedicated-runner
dependencies:
- coverage
- - karma
+ - rake karma
- lint:javascript:report
script:
- mv public/ .public/