diff options
author | Robert Speicher <robert@gitlab.com> | 2016-03-17 21:46:30 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-03-17 21:46:30 +0000 |
commit | f18132f011fe7150769d566e0154fbfd7281da2f (patch) | |
tree | 255a9c703a8c0b2304208cc0bf556c556b7aa501 | |
parent | fed33aae75dfda6de333d2b8a965280e90d72607 (diff) | |
parent | e0f0d503872bb92e5b34c2eb70c61ce944e75ac2 (diff) | |
download | gitlab-ce-f18132f011fe7150769d566e0154fbfd7281da2f.tar.gz |
Merge branch '8-4-git-2-7-4' into '8-4-stable'
Bump Git version requirement to 2.7.4 (for 8.4)
[ci skip]
See merge request !3283
-rw-r--r-- | CHANGELOG | 3 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | doc/install/installation.md | 9 |
3 files changed, 9 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index b0cf4a9a4b9..a9fcf5bca21 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.4.6 + - Bump Git version requirement to 2.7.4 + v 8.4.5 - No CE-specific changes 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 bb3fef93889..66d436738c4 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 @@ -136,7 +137,7 @@ use 64-bit Linux. You can find downloads for other platforms at the [Go download page](https://golang.org/dl). curl -O --progress https://storage.googleapis.com/golang/go1.5.3.linux-amd64.tar.gz - echo '43afe0c5017e502630b1aea4d44b8a7f059bf60d7f29dfd58db454d4e4e0ae53 go1.5.3.linux-amd64.tar.gz' | shasum -c - && \ + echo '43afe0c5017e502630b1aea4d44b8a7f059bf60d7f29dfd58db454d4e4e0ae53 go1.5.3.linux-amd64.tar.gz' | shasum -a256 -c - && \ sudo tar -C /usr/local -xzf go1.5.3.linux-amd64.tar.gz sudo ln -sf /usr/local/go/bin/{go,godoc,gofmt} /usr/local/bin/ rm go1.5.3.linux-amd64.tar.gz |