diff options
| author | DJ Mountney <dj@gitlab.com> | 2018-03-01 07:14:30 +0000 |
|---|---|---|
| committer | DJ Mountney <dj@gitlab.com> | 2018-03-01 07:14:30 +0000 |
| commit | e66e776772c70b07d403b2124e9ef458e85db726 (patch) | |
| tree | edf3817e5e4c98d498c0685370eb241bef43b848 | |
| parent | ec2e54b36347e9817e7b0caa0c095a100e1e8c93 (diff) | |
| parent | 5ed53d4a612c6bd46d7c7b0f6f389c30a8b2c0a0 (diff) | |
| download | gitlab-ce-e66e776772c70b07d403b2124e9ef458e85db726.tar.gz | |
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
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | spec/support/gitlab-git-test.git/packed-refs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae762e7aa6e..8a0c9802c15 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.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 diff --git a/spec/support/gitlab-git-test.git/packed-refs b/spec/support/gitlab-git-test.git/packed-refs index 507e4ce785a..ea50e4ad3f6 100644 --- a/spec/support/gitlab-git-test.git/packed-refs +++ b/spec/support/gitlab-git-test.git/packed-refs @@ -1,4 +1,4 @@ -# 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 |