Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade ruby and rails #868

Merged
merged 8 commits into from
Jun 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.2
2.7.1
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ addons:
organization: "defra"

language: ruby
rvm: 2.4.2
rvm: 2.7.1
cache: bundler

# Travis CI uses shallow clone to speed up build times, but a truncated SCM
Expand Down Expand Up @@ -40,7 +40,7 @@ services:

before_install:
- export TZ=UTC
- gem install -v 1.17.3 bundler
- gem install bundler
- sudo apt-get install xvfb -y
- sudo apt-get install ttf-liberation -y
- sudo apt-get install wkhtmltopdf -y
Expand Down
13 changes: 9 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# frozen_string_literal: true

source "https://rubygems.org"
ruby "2.4.2"
ruby "2.7.1"

# Temporary workaround until we implement webpack assets
# See: https://github.com/sass/sassc-rails/issues/114
gem "sassc-rails"

# Declare your gem's dependencies in waste_carriers_engine.gemspec.
# Bundler will treat runtime dependencies like base dependencies, and
Expand All @@ -16,7 +20,7 @@ gem "govuk_template", "~> 0.23"
gem "jquery-rails"

# Use MongoDB as the database
gem "mongoid", "~> 5.2"
gem "mongoid"
# Implement document-level locking
gem "mongoid-locker"

Expand All @@ -38,12 +42,12 @@ group :development, :test do
# Apply our style guide to ensure consistency in how the code is written
gem "defra_ruby_style"
gem "dotenv-rails"
gem "rspec-rails", "~> 3.6"
gem "rspec-rails"
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem "web-console", "~> 2.0"
gem "web-console"

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem "spring"
Expand All @@ -57,6 +61,7 @@ end
group :test do
gem "database_cleaner"
gem "factory_bot_rails", require: false
gem "rails-controller-testing"
gem "simplecov", "~> 0.17.1", require: false
gem "timecop"
gem "webmock", "~> 3.4"
Expand Down
Loading