summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-05-09 09:46:02 +0000
committerRémy Coutable <remy@rymai.me>2019-05-09 09:46:02 +0000
commitab37a664aed7bd747ebc30213db3d3fe0e5c76c1 (patch)
treed7321c1caf923689500c863fdb978ecece33b94b /doc
parent615e57c7c51849493b87a9c2a9c0abdc00404201 (diff)
parenta50951d73a973efddf3079b38a99ded3e885f568 (diff)
downloadgitlab-ce-ab37a664aed7bd747ebc30213db3d3fe0e5c76c1.tar.gz
Merge branch 'sh-upgrade-ruby-2.6.3-ce' into 'master'
Upgrade Ruby version to 2.6.3 See merge request gitlab-org/gitlab-ce!28117
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/caching/index.md2
-rw-r--r--doc/install/installation.md6
-rw-r--r--doc/update/upgrading_from_source.md6
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/ci/caching/index.md b/doc/ci/caching/index.md
index e079483e2b5..3f72fe3e9eb 100644
--- a/doc/ci/caching/index.md
+++ b/doc/ci/caching/index.md
@@ -289,7 +289,7 @@ jobs inherit it. Gems are installed in `vendor/ruby/` and are cached per-branch:
#
# https://gitlab.com/gitlab-org/gitlab-ce/tree/master/lib/gitlab/ci/templates/Ruby.gitlab-ci.yml
#
-image: ruby:2.5
+image: ruby:2.6
# Cache gems in between builds
cache:
diff --git a/doc/install/installation.md b/doc/install/installation.md
index c694f0ed691..f16bc04af34 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -163,9 +163,9 @@ Download Ruby and compile it:
```sh
mkdir /tmp/ruby && cd /tmp/ruby
-curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.3.tar.gz
-echo 'f919a9fbcdb7abecd887157b49833663c5c15fda ruby-2.5.3.tar.gz' | shasum -c - && tar xzf ruby-2.5.3.tar.gz
-cd ruby-2.5.3
+curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.3.tar.gz
+echo '2347ed6ca5490a104ebd5684d2b9b5eefa6cd33c ruby-2.6.3.tar.gz' | shasum -c - && tar xzf ruby-2.6.3.tar.gz
+cd ruby-2.6.3
./configure --disable-install-rdoc
make
diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md
index fea89669831..5118726cb0a 100644
--- a/doc/update/upgrading_from_source.md
+++ b/doc/update/upgrading_from_source.md
@@ -52,9 +52,9 @@ Download Ruby and compile it:
```bash
mkdir /tmp/ruby && cd /tmp/ruby
-curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.3.tar.gz
-echo 'f919a9fbcdb7abecd887157b49833663c5c15fda ruby-2.5.3.tar.gz' | shasum -c - && tar xzf ruby-2.5.3.tar.gz
-cd ruby-2.5.3
+curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.3.tar.gz
+echo '2347ed6ca5490a104ebd5684d2b9b5eefa6cd33c ruby-2.6.3.tar.gz' | shasum -c - && tar xzf ruby-2.6.3.tar.gz
+cd ruby-2.6.3
./configure --disable-install-rdoc
make