Merge branch 'sh-bump-git-2.16' into 'master'

Bump GitLab CI image to use git 2.16 See merge request gitlab-org/gitlab-ce!17440

Merge branch 'sh-bump-git-2.16' into 'master'
e66e7767 · DJ Mountney · ec2e54b3 · 5ed53d4a · e66e7767 · e66e7767
Commit e66e7767 authored Mar 01, 2018 by DJ Mountney
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

packed-refs spec/support/gitlab-git-test.git/packed-refs +1 -1

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.6-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6"
+image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.6-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6"

 .dedicated-runner: &dedicated-runner
  retry: 1

--- a/spec/support/gitlab-git-test.git/packed-refs
+++ b/spec/support/gitlab-git-test.git/packed-refs
-# pack-refs with: peeled fully-peeled 
+# pack-refs with: peeled fully-peeled sorted 
 0b4bc9a49b562e85de7cc9e834518ea6828729b9 refs/heads/feature
 12d65c8dd2b2676fa3ac47d955accc085a37a9c1 refs/heads/fix
 6473c90867124755509e100d0d35ebdc85a0b6ae refs/heads/fix-blob-path