From dd6372012def4c0a645711b6916e7dde020df255 Mon Sep 17 00:00:00 2001 From: rhymes Date: Wed, 6 Feb 2019 21:48:28 +0100 Subject: [PATCH] Upgrade Ruby to 2.6.1 (#1711) * Upgrade Ruby to 2.6.1 Ruby 2.6.1 contains a fix for Net::HTTP * Add 2.6.1 to .ruby-version as well * Add 2.6.1 to Travis CI as well --- .ruby-version | 2 +- .travis.yml | 2 +- Dockerfile | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- README.md | 2 +- docs/installation/linux.md | 2 +- docs/installation/mac-os.md | 2 +- docs/installation/windows.md | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.ruby-version b/.ruby-version index e70b4523a..6a6a3d8e3 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.0 +2.6.1 diff --git a/.travis.yml b/.travis.yml index f53bbff1d..d205f6ebb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ cache: - node_modules - $HOME/.nvm rvm: - - 2.6.0 + - 2.6.1 addons: postgresql: '9.6' chrome: stable diff --git a/Dockerfile b/Dockerfile index 5909aad0e..a95bcafa8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6.0 +FROM ruby:2.6.1 # Make nodejs and yarn as dependencies RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - diff --git a/Gemfile b/Gemfile index f5781c0e7..7c6b51436 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ # rubocop:disable LineLength source "https://rubygems.org" -ruby "2.6.0" +ruby "2.6.1" # Enforce git to transmitted via https. # workaround until bundler 2.0 is released. diff --git a/Gemfile.lock b/Gemfile.lock index 87e77cb5c..50b6399dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1070,7 +1070,7 @@ DEPENDENCIES zonebie (~> 0.6.1) RUBY VERSION - ruby 2.6.0p0 + ruby 2.6.1p33 BUNDLED WITH 1.17.3 diff --git a/README.md b/README.md index 46406de9d..b281ad13e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@

- ruby version + ruby version rails version diff --git a/docs/installation/linux.md b/docs/installation/linux.md index 87fcba75e..941d15e7b 100644 --- a/docs/installation/linux.md +++ b/docs/installation/linux.md @@ -5,7 +5,7 @@ These prerequisites assume you're working on a Linux-based operating system but ### Ruby 1. If you don't already have a Ruby version manager, we highly recommend [rbenv](https://github.com/rbenv/rbenv). Please follow their [installation guide](https://github.com/rbenv/rbenv#installation). -2. With the Ruby version manager, install the Ruby version listed on our badge. (ie with rbenv: `rbenv install 2.6.0`) +2. With the Ruby version manager, install the Ruby version listed on our badge. (ie with rbenv: `rbenv install 2.6.1`) For very detailed rbenv installation directions on several distros, please visit [DigitalOcean's guide](https://www.digitalocean.com/community/tutorials/how-to-install-ruby-on-rails-with-rbenv-on-ubuntu-18-04). diff --git a/docs/installation/mac-os.md b/docs/installation/mac-os.md index 2f045a03d..9869ece2c 100644 --- a/docs/installation/mac-os.md +++ b/docs/installation/mac-os.md @@ -3,7 +3,7 @@ ### Ruby 1. If you don't already have a Ruby version manager, we highly recommend [rbenv](https://github.com/rbenv/rbenv). Please follow their [installation guide](https://github.com/rbenv/rbenv#installation). -2. With the Ruby version manager, install the Ruby version listed on our badge. (ie with rbenv: `rbenv install 2.6.0`) +2. With the Ruby version manager, install the Ruby version listed on our badge. (ie with rbenv: `rbenv install 2.6.1`) ### Yarn diff --git a/docs/installation/windows.md b/docs/installation/windows.md index 879a14704..29bfe5fcc 100644 --- a/docs/installation/windows.md +++ b/docs/installation/windows.md @@ -36,8 +36,8 @@ git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build echo 'export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.bashrc exec $SHELL -rbenv install 2.6.0 -rbenv global 2.6.0 +rbenv install 2.6.1 +rbenv global 2.6.1 ruby -v ```