diff options
author | Nick Thomas <nick@gitlab.com> | 2018-11-21 22:37:08 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-11-21 22:37:08 +0000 |
commit | 0b0db201c328f4a8ad164082be03712ddb36a446 (patch) | |
tree | a556689be9049eb1e3b2baeb598691cf383f4331 | |
parent | 62e0877d5a2290403975667eb679dc94a2340655 (diff) | |
parent | e178329b4561c729b432a5b66010973d60d2649c (diff) | |
download | gitlab-ce-0b0db201c328f4a8ad164082be03712ddb36a446.tar.gz |
Merge branch 'fj-47494-upgrade-git-to-2-18-0' into 'master'
Upgraded minimum Git version to 2.18.0
Closes #47494
See merge request gitlab-org/gitlab-ce!22803
-rw-r--r-- | changelogs/unreleased/fj-47494-upgrade-git-to-2-18-0.yml | 5 | ||||
-rw-r--r-- | doc/install/installation.md | 2 | ||||
-rw-r--r-- | lib/system_check/app/git_version_check.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/fj-47494-upgrade-git-to-2-18-0.yml b/changelogs/unreleased/fj-47494-upgrade-git-to-2-18-0.yml new file mode 100644 index 00000000000..0f01552ff7e --- /dev/null +++ b/changelogs/unreleased/fj-47494-upgrade-git-to-2-18-0.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade minimum required Git version to 2.18.0 +merge_request: 22803 +author: +type: other diff --git a/doc/install/installation.md b/doc/install/installation.md index cac97b63d92..06293b8caf5 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -79,7 +79,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.9.5 or higher + # Make sure Git is version 2.18.0 or higher git --version Is the system packaged Git too old? Remove it and compile from source. diff --git a/lib/system_check/app/git_version_check.rb b/lib/system_check/app/git_version_check.rb index 994af3ab53e..7c3e7759dd0 100644 --- a/lib/system_check/app/git_version_check.rb +++ b/lib/system_check/app/git_version_check.rb @@ -7,7 +7,7 @@ module SystemCheck set_check_pass -> { "yes (#{self.current_version})" } def self.required_version - @required_version ||= Gitlab::VersionInfo.new(2, 9, 5) + @required_version ||= Gitlab::VersionInfo.parse('2.18.0') end def self.current_version |