diff options
| author | Xavier Noria <fxn@hashref.com> | 2019-03-26 20:30:18 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2019-03-26 20:30:18 +0100 |
| commit | 379d7e8bfa9484d495c2051266852df908c0ea59 (patch) | |
| tree | 731af0ce8e298fd176d1ec6b7e6172cb731d3035 | |
| parent | d2f0cb1615797e89d815516f6e033c5d6415ded0 (diff) | |
| download | rails-379d7e8bfa9484d495c2051266852df908c0ea59.tar.gz rails-379d7e8bfa9484d495c2051266852df908c0ea59.tar.bz2 rails-379d7e8bfa9484d495c2051266852df908c0ea59.zip | |
bumps Zeitwerk and Bootsnap
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 18 | ||||
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 | ||||
| -rw-r--r-- | railties/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile.tt | 2 |
5 files changed, 16 insertions, 13 deletions
@@ -44,7 +44,7 @@ gem "libxml-ruby", platforms: :ruby gem "connection_pool", require: false # for railties app_generator_test -gem "bootsnap", ">= 1.4.0", require: false +gem "bootsnap", ">= 1.4.2", require: false # Active Job group :job do diff --git a/Gemfile.lock b/Gemfile.lock index d4c2808b38..7f512e6e14 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,7 @@ PATH i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 1.4, >= 1.4.2) + zeitwerk (~> 1.4, >= 1.4.3) rails (6.0.0.beta3) actioncable (= 6.0.0.beta3) actionmailbox (= 6.0.0.beta3) @@ -165,9 +165,7 @@ GEM childprocess faraday selenium-webdriver - bootsnap (1.4.0) - msgpack (~> 1.0) - bootsnap (1.4.0-java) + bootsnap (1.4.2) msgpack (~> 1.0) builder (3.2.3) bunny (2.13.0) @@ -319,10 +317,10 @@ GEM minitest-server (1.0.5) minitest (~> 5.0) mono_logger (1.1.0) - msgpack (1.2.6) - msgpack (1.2.6-java) - msgpack (1.2.6-x64-mingw32) - msgpack (1.2.6-x86-mingw32) + msgpack (1.2.9) + msgpack (1.2.9-java) + msgpack (1.2.9-x64-mingw32) + msgpack (1.2.9-x86-mingw32) multi_json (1.13.1) multipart-post (2.0.0) mustache (1.1.0) @@ -517,7 +515,7 @@ GEM websocket-extensions (0.1.3) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (1.4.2) + zeitwerk (1.4.3) PLATFORMS java @@ -537,7 +535,7 @@ DEPENDENCIES benchmark-ips blade blade-sauce_labs_plugin - bootsnap (>= 1.4.0) + bootsnap (>= 1.4.2) byebug capybara (>= 2.15) connection_pool diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index be041944f6..bf0fe0f76d 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -34,5 +34,5 @@ Gem::Specification.new do |s| s.add_dependency "tzinfo", "~> 1.1" s.add_dependency "minitest", "~> 5.1" s.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2" - s.add_dependency "zeitwerk", "~> 1.4", ">= 1.4.2" + s.add_dependency "zeitwerk", "~> 1.4", ">= 1.4.3" end diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 9d026ad4fd..df0d6d4fa0 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +* Applications running in `:zeitwerk` mode that use `bootsnap` need + to upgrade `bootsnap` to at least 1.4.2. + + *Xavier Noria* + * Add `config.disable_sandbox` option to Rails console. This setting will disable `rails console --sandbox` mode, preventing diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile.tt b/railties/lib/rails/generators/rails/app/templates/Gemfile.tt index 88cd502b53..d7221453e7 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile.tt +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile.tt @@ -28,7 +28,7 @@ ruby <%= "'#{RUBY_VERSION}'" -%> <% if depend_on_bootsnap? -%> # Reduces boot times through caching; required in config/boot.rb -gem 'bootsnap', '>= 1.4.1', require: false +gem 'bootsnap', '>= 1.4.2', require: false <%- end -%> <%- if options.api? -%> |