diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-16 17:16:36 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-16 17:16:36 +0300 |
| commit | 9f524bbe534208f552b6689ecc103ae7094e99b8 (patch) | |
| tree | a25a3f8adbb545d7a3684fe8018618f38e86c9e7 | |
| parent | 95637923e690f4938a7f37160cd0b31801001c78 (diff) | |
| parent | 514babb9b0f72a05ab89cb4b9c792792c1d687af (diff) | |
Merge branch 'update-git-to-2-18-0' into 'master'
Update Git version to 2.18.0
See merge request gitlab-org/gitlab-ce!20489
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | doc/install/installation.md | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a5bc158211..e7b28e540a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29" +image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29" .dedicated-runner: &dedicated-runner retry: 1 diff --git a/doc/install/installation.md b/doc/install/installation.md index 4b68090f8d3..8c7f80fd8e8 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -92,9 +92,9 @@ Is the system packaged Git too old? Remove it and compile from source. # Download and compile from source cd /tmp - curl --remote-name --progress https://www.kernel.org/pub/software/scm/git/git-2.16.3.tar.gz - echo 'dda229e9c73f4fbb7d4324e0d993e11311673df03f73b194c554c2e9451e17cd git-2.16.3.tar.gz' | shasum -a256 -c - && tar -xzf git-2.16.3.tar.gz - cd git-2.16.3/ + curl --remote-name --progress https://www.kernel.org/pub/software/scm/git/git-2.18.0.tar.gz + echo '94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4 git-2.18.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.18.0.tar.gz + cd git-2.18.0/ ./configure make prefix=/usr/local all |