Skip to content

Commit

Permalink
Update Rails to latest version and add bootsnap gem
Browse files Browse the repository at this point in the history
Bootsnap is included by default in Rails 5.2, requires no
configuration and claims to enable faster boot times.
After the upgrade, there were some tests failing due to how locale
fallback was setup. I changed `true` to one element array and it seems
to be working properly.
  • Loading branch information
Maciej Szlosarczyk committed Aug 9, 2018
1 parent 89a98b2 commit a4b0348
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 58 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
source 'https://rubygems.org'

gem 'bootsnap', require: false
gem 'figaro', '~> 1.1.0'
gem 'jbuilder'
gem 'pg', '~> 1.0.0'
gem 'rails', '~> 5.2.0'
gem 'rails', '~> 5.2.1'
gem 'recaptcha', require: 'recaptcha/rails'
gem 'sass-rails'
gem 'simpleidn', '0.0.7' # For Punycode
Expand Down
114 changes: 58 additions & 56 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,60 @@ GEM
remote: https://rubygems.org/
specs:
SyslogLogger (2.0)
actioncable (5.2.0)
actionpack (= 5.2.0)
actioncable (5.2.1)
actionpack (= 5.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
actionmailer (5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.0)
actionview (= 5.2.0)
activesupport (= 5.2.0)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.0)
activesupport (= 5.2.0)
actionview (5.2.1)
activesupport (= 5.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.0)
activesupport (= 5.2.0)
activejob (5.2.1)
activesupport (= 5.2.1)
globalid (>= 0.3.6)
activemodel (5.2.0)
activesupport (= 5.2.0)
activerecord (5.2.0)
activemodel (= 5.2.0)
activesupport (= 5.2.0)
activemodel (5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
arel (>= 9.0)
activestorage (5.2.0)
actionpack (= 5.2.0)
activerecord (= 5.2.0)
activestorage (5.2.1)
actionpack (= 5.2.1)
activerecord (= 5.2.1)
marcel (~> 0.3.1)
activesupport (5.2.0)
activesupport (5.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
arel (9.0.0)
bootsnap (1.3.1)
msgpack (~> 1.0)
builder (3.2.3)
capybara (3.1.0)
capybara (3.5.1)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.0)
xpath (~> 3.1)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crack (0.4.3)
Expand All @@ -62,13 +64,13 @@ GEM
docile (1.3.1)
erubi (1.7.1)
execjs (2.7.0)
ffi (1.9.23)
ffi (1.9.25)
figaro (1.1.1)
thor (~> 0.14)
globalid (0.4.1)
activesupport (>= 4.2.0)
hashdiff (0.3.7)
i18n (1.0.1)
i18n (1.1.0)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
Expand All @@ -82,62 +84,62 @@ GEM
mini_mime (>= 0.1.1)
marcel (0.3.2)
mimemagic (~> 0.3.2)
method_source (0.8.2)
method_source (0.9.0)
mimemagic (0.3.2)
mina (0.3.8)
open4 (~> 1.3.4)
rake
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
msgpack (1.2.4)
multi_json (1.13.1)
nio4r (2.3.1)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
open4 (1.3.4)
pg (1.0.0)
pry (0.10.4)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
method_source (~> 0.9.0)
public_suffix (3.0.2)
puma (3.11.4)
puma (3.12.0)
rack (2.0.5)
rack-test (1.0.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.0)
actioncable (= 5.2.0)
actionmailer (= 5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
activemodel (= 5.2.0)
activerecord (= 5.2.0)
activestorage (= 5.2.0)
activesupport (= 5.2.0)
rails (5.2.1)
actioncable (= 5.2.1)
actionmailer (= 5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
activemodel (= 5.2.1)
activerecord (= 5.2.1)
activestorage (= 5.2.1)
activesupport (= 5.2.1)
bundler (>= 1.3.0)
railties (= 5.2.0)
railties (= 5.2.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.0)
actionpack (= 5.2.0)
activesupport (= 5.2.0)
railties (5.2.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
thor (>= 0.19.0, < 2.0)
raindrops (0.19.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
recaptcha (4.8.0)
recaptcha (4.11.1)
json
safe_yaml (1.0.4)
sass (3.5.6)
sass (3.5.7)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -154,7 +156,6 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
simpleidn (0.0.7)
slop (3.6.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand All @@ -167,34 +168,35 @@ GEM
tilt (2.0.8)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.10)
uglifier (4.1.17)
execjs (>= 0.3.0, < 3)
unicorn (5.4.0)
unicorn (5.4.1)
kgio (~> 2.6)
raindrops (~> 0.7)
webmock (3.4.1)
webmock (3.4.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (3.0.0)
xpath (3.1.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
SyslogLogger (= 2.0)
bootsnap
capybara
figaro (~> 1.1.0)
jbuilder
mina (~> 0.3.8)
pg (~> 1.0.0)
pry
puma
rails (~> 5.2.0)
rails (~> 5.2.1)
recaptcha
sass-rails
simplecov
Expand All @@ -204,4 +206,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
1.16.2
1.16.3
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Application < Rails::Application
config.secret_key_base = Figaro.env.secret_key_base

# Fallback to default locale if text is missing
config.i18n.fallbacks = true
config.i18n.fallbacks = [:en]

# Mailer configuration
config.action_mailer.default_url_options = { host: ENV['mailer_host'] }
Expand Down
1 change: 1 addition & 0 deletions config/boot.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)

require 'bundler/setup' # Set up gems listed in the Gemfile.
require 'bootsnap/setup'
1 change: 1 addition & 0 deletions test/integration/contact_requests_confirmation_test.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# encoding: utf-8
require 'test_helper'

class ContactRequestsConfirmationTest < ActionDispatch::IntegrationTest
Expand Down

0 comments on commit a4b0348

Please sign in to comment.