diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile index 662b6da02..afb7084bb 100644 --- a/.gitpod.dockerfile +++ b/.gitpod.dockerfile @@ -1,7 +1,7 @@ FROM gitpod/workspace-postgres # Install Ruby -ENV RUBY_VERSION=2.7.0 +ENV RUBY_VERSION=2.7.1 RUN bash -lc "rvm install ruby-$RUBY_VERSION && rvm use ruby-$RUBY_VERSION --default" # Install Redis. diff --git a/.ruby-version b/.ruby-version index 24ba9a38d..860487ca1 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.0 +2.7.1 diff --git a/.travis.yml b/.travis.yml index 68763c074..f8bd72552 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ cache: - node_modules - $HOME/.nvm rvm: - - 2.7.0 + - 2.7.1 addons: postgresql: '9.6' chrome: 'stable' diff --git a/Dockerfile b/Dockerfile index 865061351..416815344 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.0-alpine3.10 +FROM ruby:2.7.1-alpine3.10 #------------------------------------------------------------------------------ # diff --git a/Gemfile.lock b/Gemfile.lock index 13a90aaa3..67892fd64 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1020,7 +1020,7 @@ DEPENDENCIES zonebie (~> 0.6.1) RUBY VERSION - ruby 2.7.0p0 + ruby 2.7.1p83 BUNDLED WITH 2.1.4 diff --git a/README.md b/README.md index d811663ae..93b492b1f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@

- ruby version + ruby version rails version diff --git a/docs/Gemfile b/docs/Gemfile index 03dcd7500..9c546de5b 100644 --- a/docs/Gemfile +++ b/docs/Gemfile @@ -1,7 +1,11 @@ # frozen_string_literal: true +ruby_version = File.read( + File.join(File.dirname(File.dirname(__FILE__)), ".ruby-version"), +).strip + source "https://rubygems.org" -ruby "2.7.0" +ruby ruby_version gem "activerecord", "~> 5.2.3" # Databases on Rails gem "yard", "~> 0.9.19" # YARD is a documentation generation tool for the Ruby programming language diff --git a/docs/installation/linux.md b/docs/installation/linux.md index 2723706f9..8f3c9587d 100644 --- a/docs/installation/linux.md +++ b/docs/installation/linux.md @@ -15,7 +15,7 @@ but they have only been tested on Ubuntu 18.04._ [rbenv](https://github.com/rbenv/rbenv). Please follow their [installation guide](https://github.com/rbenv/rbenv#installation). 1. With the Ruby version manager, install the Ruby version listed on our badge. - (ie with rbenv: `rbenv install 2.7.0`) + (ie with rbenv: `rbenv install $(cat .ruby-version)`) 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.md b/docs/installation/mac.md index f49d9c135..673063674 100644 --- a/docs/installation/mac.md +++ b/docs/installation/mac.md @@ -12,7 +12,7 @@ title: macOS [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. - (i.e. with rbenv: `rbenv install 2.7.0`) + (i.e. with rbenv: `rbenv install $(cat .ruby-version)`) ### Yarn diff --git a/docs/installation/windows.md b/docs/installation/windows.md index b3ce2b229..940ec46d7 100644 --- a/docs/installation/windows.md +++ b/docs/installation/windows.md @@ -51,8 +51,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.7.0 -rbenv global 2.7.0 +rbenv install $(cat .ruby-version) +rbenv global $(cat .ruby-version) ruby -v ```