Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-16 01:27:35 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-03-16 01:28:33 +0300
commitc7a3d75973cc8126fb4743153ac1210ad8be5352 (patch)
tree037e8fa036c0905defde35221dcf7e369a2be57b
parent0424e72d297c32b5bbe23180540dff475bf65090 (diff)
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--CHANGELOG3
-rw-r--r--README.md2
-rw-r--r--doc/install/installation.md2
-rw-r--r--lib/tasks/gitlab/check.rake2
4 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c9923b161da..0cedba703a5 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.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 10f036d0d44..6c6463ee2db 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 d59872dc3a2..0b28b5b1313 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -911,7 +911,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}\""