diff options
author | Marin Jankovski <marin@gitlab.com> | 2017-12-15 20:23:49 +0000 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2017-12-15 20:23:49 +0000 |
commit | 1bc9fe3ba010dc5ad6283c175754b1797dae8eef (patch) | |
tree | 2f8d92680d16827ce3bf19e6fe083c1278f80303 | |
parent | b540b987648ae6e24bbbc01a7773b2e3209a47b0 (diff) | |
parent | b8878f54b522ae7107ad5c3f0dedaf33bb51a5c0 (diff) | |
download | gitlab-ce-1bc9fe3ba010dc5ad6283c175754b1797dae8eef.tar.gz |
Merge branch 'bump-git-2-14-3' into 'master'
Change CI config to use new base image
See merge request gitlab-org/gitlab-ce!15939
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | doc/install/installation.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19540e4331e..e4499b85fe1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.5-golang-1.8-git-2.13-chrome-62.0-node-8.x-yarn-1.2-postgresql-9.6" +image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.5-golang-1.8-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6" .default-cache: &default-cache key: "ruby-235-with-yarn" diff --git a/doc/install/installation.md b/doc/install/installation.md index 6c6e5db4cd9..56888b05609 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -80,7 +80,7 @@ Make sure you have the right version of Git installed # Install Git sudo apt-get install -y git-core - # Make sure Git is version 2.13.6 or higher + # Make sure Git is version 2.14.3 or higher git --version Is the system packaged Git too old? Remove it and compile from source. |