diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-18 00:51:45 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-18 00:51:45 +0300 |
| commit | d9a4e963eefbeef068bcf2a159321f57a8711d32 (patch) | |
| tree | 9c1a69741ae0f65e3e45fea77e0f05840face0e3 | |
| parent | 59166702b85983f1dc2c571cf2c921d89e6a8b2c (diff) | |
| parent | ee4d311ea681b7fd99b0ea98999c3669cf7e7000 (diff) | |
Merge branch '8-3-git-2-7-4' into '8-3-stable'
Bump Git version requirement to 2.7.4 (for 8.3)
[ci skip]
See merge request !3284
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | doc/install/installation.md | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index f8d187a856f..f8c429f146b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ Please view this file on the master branch, on stable branches it's out of date. +v 8.3.5 + - Bump Git version requirement to 2.7.4 + v 8.3.4 - Use gitlab-workhorse 0.5.4 (fixes API routing bug) diff --git a/README.md b/README.md index 3ec1d4a776c..afa60116ebb 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ GitLab is a Ruby on Rails application that runs on the following software: - Ubuntu/Debian/CentOS/RHEL - Ruby (MRI) 2.1 -- Git 1.7.10+ +- Git 2.7.4+ - Redis 2.8+ - MySQL or PostgreSQL diff --git a/doc/install/installation.md b/doc/install/installation.md index 046d1d77ebd..a63b6cae091 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -76,7 +76,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 1.7.10 or higher, for example 1.7.12 or 2.0.0 + # Make sure Git is version 2.7.4 or higher git --version Is the system packaged Git too old? Remove it and compile from source. @@ -89,8 +89,9 @@ Is the system packaged Git too old? Remove it and compile from source. # Download and compile from source cd /tmp - curl -L --progress https://www.kernel.org/pub/software/scm/git/git-2.4.3.tar.gz | tar xz - cd git-2.4.3/ + curl -O --progress https://www.kernel.org/pub/software/scm/git/git-2.7.4.tar.gz + echo '7104c4f5d948a75b499a954524cb281fe30c6649d8abe20982936f75ec1f275b git-2.7.4.tar.gz' | shasum -a256 -c - && tar -xzf git-2.7.4.tar.gz + cd git-2.7.4/ ./configure make prefix=/usr/local all |