summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2019-04-16 15:02:41 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2019-04-16 15:11:20 +0200
commit5a50e88de2d74bdf9520bb9d2f83b87d387d95a1 (patch)
tree20b2c4f51a0069d630a6917de1ed8cef24b60897 /.gitlab
parentc16619c527afdd00aa4dbbbf7544afb2f38477a8 (diff)
downloadgitlab-ce-5a50e88de2d74bdf9520bb9d2f83b87d387d95a1.tar.gz
Test using Git 2.21
Given Rails doesn't use the Git binary anymore, this shouldn't be a problem.
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/frontend.gitlab-ci.yml4
-rw-r--r--.gitlab/ci/rails.gitlab-ci.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index e38b878972d..5acfdb4e832 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -16,7 +16,7 @@
gitlab:assets:compile:
<<: *assets-compile-cache
extends: .dedicated-no-docs-pull-cache-job
- image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1
+ image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.21-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1
dependencies:
- setup-test-env
services:
@@ -234,4 +234,4 @@ jsdoc:
name: jsdoc
expire_in: 31d
paths:
- - jsdoc/ \ No newline at end of file
+ - jsdoc/
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index b926fb77a08..bdc6ce234b8 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -86,7 +86,7 @@
.rspec-metadata-pg-10: &rspec-metadata-pg-10
<<: *rspec-metadata
<<: *use-pg-10
- image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29"
+ image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.21-chrome-71.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29"
.rspec-metadata-mysql: &rspec-metadata-mysql
<<: *rspec-metadata