diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-01-31 17:04:28 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-01-31 17:04:28 +0000 |
| commit | 9c34c023808b38303d4988a20f62645c552951e3 (patch) | |
| tree | 61247e6bee74297b78eebc1c9baed7f739723235 | |
| parent | a4d84192aec02372ab6ab0f5747fd63aaa19e4ec (diff) | |
| parent | c01f81fa084284719dc305486980b5e6c58d429f (diff) | |
| download | gitlab-ce-9c34c023808b38303d4988a20f62645c552951e3.tar.gz | |
Merge branch 'fix-install-docs' into 'master'
[ci skip] Fix example commands to refer to the correct versions
See merge request gitlab-org/gitlab-ce!16683
| -rw-r--r-- | changelogs/unreleased/fix-install-docs.yml | 5 | ||||
| -rw-r--r-- | doc/install/installation.md | 8 | ||||
| -rw-r--r-- | lib/system_check/app/git_version_check.rb | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/changelogs/unreleased/fix-install-docs.yml b/changelogs/unreleased/fix-install-docs.yml new file mode 100644 index 00000000000..c2c0dd1364b --- /dev/null +++ b/changelogs/unreleased/fix-install-docs.yml @@ -0,0 +1,5 @@ +--- +title: Update minimum git version to 2.9.5 +merge_request: 16683 +author: +type: other diff --git a/doc/install/installation.md b/doc/install/installation.md index 18e29271d0f..6eb8890cc4f 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -80,7 +80,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.14.3 or higher + # Make sure Git is version 2.9.5 or higher git --version Is the system packaged Git too old? Remove it and compile from source. @@ -93,9 +93,9 @@ Is the system packaged Git too old? Remove it and compile from source. # Download and compile from source cd /tmp - curl --remote-name --progress https://www.kernel.org/pub/software/scm/git/git-2.8.4.tar.gz - echo '626e319f8a24fc0866167ea5f6bf3e2f38f69d6cb2e59e150f13709ca3ebf301 git-2.8.4.tar.gz' | shasum -a256 -c - && tar -xzf git-2.8.4.tar.gz - cd git-2.8.4/ + curl --remote-name --progress https://www.kernel.org/pub/software/scm/git/git-2.14.3.tar.gz + echo '023ffff6d3ba8a1bea779dfecc0ed0bb4ad68ab8601d14435dd8c08416f78d7f git-2.14.3.tar.gz' | shasum -a256 -c - && tar -xzf git-2.14.3.tar.gz + cd git-2.14.3/ ./configure make prefix=/usr/local all diff --git a/lib/system_check/app/git_version_check.rb b/lib/system_check/app/git_version_check.rb index 6ee8c8874ec..44ec888c197 100644 --- a/lib/system_check/app/git_version_check.rb +++ b/lib/system_check/app/git_version_check.rb @@ -5,7 +5,7 @@ module SystemCheck set_check_pass -> { "yes (#{self.current_version})" } def self.required_version - @required_version ||= Gitlab::VersionInfo.new(2, 7, 3) + @required_version ||= Gitlab::VersionInfo.new(2, 9, 5) end def self.current_version |