summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorMike Greiling <mgreiling@gitlab.com>2017-06-13 15:20:26 +0000
committerMike Greiling <mgreiling@gitlab.com>2017-06-13 15:20:26 +0000
commita526e619d96aa95a55110e540363c34ab782defc (patch)
tree09e41597fac96b94bcf2f7423811d34ca4997d92 /.gitlab-ci.yml
parentf79caeaa454473802fe648f142bcf73684ffdbdc (diff)
downloadgitlab-ce-a526e619d96aa95a55110e540363c34ab782defc.tar.gz
Revert "Merge branch 'karma-headless-chrome' into 'master'"
This reverts merge request !12036
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a69757411f..b442e48a3d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -441,7 +441,6 @@ gitlab:assets:compile:
- webpack-report/
karma:
- image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.7-chrome-59.0-node-7.1-postgresql-9.6"
stage: test
<<: *use-pg
<<: *dedicated-runner