diff options
author | Robert Speicher <robert@gitlab.com> | 2016-03-15 22:27:35 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-03-15 22:27:35 +0000 |
commit | 5fd88cdd93ecf44f0d7a3b35a6256bcfae1a8787 (patch) | |
tree | 61c1074950785d37aa1c14866048fb993f5bebab | |
parent | a80b49ba1ac8ab54fd130ed889ecfbd0dccf81af (diff) | |
parent | cd683714eb6240bb3d42dabb3f6dc470fc930fb4 (diff) | |
download | gitlab-ce-5fd88cdd93ecf44f0d7a3b35a6256bcfae1a8787.tar.gz |
Merge branch 'git-2-7-3' into 'master'
Bump Git version requirement to 2.7.3
[ci skip]
See merge request !3240
-rw-r--r-- | CHANGELOG | 3 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | doc/install/installation.md | 2 | ||||
-rw-r--r-- | lib/tasks/gitlab/check.rake | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7f076f70c7c..b83940d2f16 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -40,6 +40,9 @@ v 8.6.0 (unreleased) - Move group activity to separate page - Continue parameters are checked to ensure redirection goes to the same instance +v 8.5.7 + - Bump Git version requirement to 2.7.3 + v 8.5.6 - Obtain a lease before querying LDAP diff --git a/README.md b/README.md index 3ec1d4a776c..208427fcf8c 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.3+ - Redis 2.8+ - MySQL or PostgreSQL diff --git a/doc/install/installation.md b/doc/install/installation.md index 4f011397269..362b27350cc 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.3 or higher git --version Is the system packaged Git too old? Remove it and compile from source. diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 581ab26db79..27ed57efe55 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -913,7 +913,7 @@ namespace :gitlab do end def check_git_version - required_version = Gitlab::VersionInfo.new(1, 7, 10) + required_version = Gitlab::VersionInfo.new(2, 7, 3) current_version = Gitlab::VersionInfo.parse(run(%W(#{Gitlab.config.git.bin_path} --version))) puts "Your git bin path is \"#{Gitlab.config.git.bin_path}\"" |