diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-12-21 14:02:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-21 14:02:12 -0500 |
| commit | 2bb71a5edf64b25d5fc5b8609f194bbe732474eb (patch) | |
| tree | 36e984c9bb6cdc1d6084c08de790f27d29acd0dd /railties | |
| parent | b00e46bd6d399d3b8c4707ede0716c3ec2c39eb7 (diff) | |
| parent | 555c1a3a5400dc257cee2ae5e209354f2dc4df8a (diff) | |
| download | rails-2bb71a5edf64b25d5fc5b8609f194bbe732474eb.tar.gz rails-2bb71a5edf64b25d5fc5b8609f194bbe732474eb.tar.bz2 rails-2bb71a5edf64b25d5fc5b8609f194bbe732474eb.zip | |
Merge pull request #34774 from rails/fix-app-boot-for-ruby-2-4
Fix app boot for Ruby 2.4
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/all.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb index b4a9c4e65f..7f4c625b39 100644 --- a/railties/lib/rails/all.rb +++ b/railties/lib/rails/all.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +# rubocop:disable Style/RedundantBegin + require "rails" %w( @@ -13,6 +15,8 @@ require "rails" rails/test_unit/railtie sprockets/railtie ).each do |railtie| - require railtie -rescue LoadError + begin + require railtie + rescue LoadError + end end |