diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-18 00:56:36 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-18 00:56:36 +0300 |
| commit | 2debf52f63f0f0ea044022e80b9f9e87cb0bc565 (patch) | |
| tree | 344d60e66d134bb3822466cae1a7eb7ced691a33 | |
| parent | 157e4c9a0dd718e5c7370ee9ea8299a68d61beff (diff) | |
| parent | 28669c86bef2bb9b593931cd7eb4cd5ac463dbc8 (diff) | |
Merge branch '8-5-git-2-7-4' into '8-5-stable'
Bump Git version requirement to 2.7.4 (for 8.5)
[ci skip]
See merge request !3286
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | doc/install/installation.md | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index 0cedba703a5..bb7760bfcef 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,9 @@ v 8.6.0 (unreleased) - Add main language of a project in the list of projects (Tiago Botelho) - Add ability to show archived projects on dashboard, explore and group pages +v 8.5.8 + - Bump Git version requirement to 2.7.4 + v 8.5.7 - Bump Git version requirement to 2.7.3 diff --git a/README.md b/README.md index 208427fcf8c..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 2.7.3+ +- Git 2.7.4+ - Redis 2.8+ - MySQL or PostgreSQL diff --git a/doc/install/installation.md b/doc/install/installation.md index 2a99cde1887..446d2023424 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 2.7.3 or higher + # 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,9 +89,9 @@ Is the system packaged Git too old? Remove it and compile from source. # Download and compile from source cd /tmp - curl -O --progress https://www.kernel.org/pub/software/scm/git/git-2.7.3.tar.gz - echo '30d067499b61caddedaf1a407b4947244f14d10842d100f7c7c6ea1c288280cd git-2.7.3.tar.gz' | shasum -a256 -c - && tar -xzf git-2.7.3.tar.gz - cd git-2.7.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 |