diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2016-05-02 15:04:59 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-05-02 15:05:03 -0700 |
| commit | 06dc3fba4623a77e3cc7fa04f97723462d47bf1e (patch) | |
| tree | 2b8fdc598c66b0f9f89915ef215daa5f2e291e35 | |
| parent | 98264a1343fad6bb6637893a37fd571916b4158c (diff) | |
| download | rails-06dc3fba4623a77e3cc7fa04f97723462d47bf1e.tar.gz rails-06dc3fba4623a77e3cc7fa04f97723462d47bf1e.tar.bz2 rails-06dc3fba4623a77e3cc7fa04f97723462d47bf1e.zip | |
Fix template resolver cache concurrency: "can't add a new key into hash during iteration"
Resolved by https://github.com/ruby-concurrency/concurrent-ruby/pull/529
Fixes #24627.
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 02fada726d..1508f3d3ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ PATH activesupport (= 5.0.0.beta4) arel (~> 7.0) activesupport (5.0.0.beta4) - concurrent-ruby (~> 1.0) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) @@ -116,7 +116,7 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.1) + concurrent-ruby (1.0.2) connection_pool (2.2.0) dalli (2.7.6) dante (0.2.0) diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index 71fe4d7253..c6ca969844 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -23,5 +23,5 @@ Gem::Specification.new do |s| s.add_dependency 'i18n', '~> 0.7' s.add_dependency 'tzinfo', '~> 1.1' s.add_dependency 'minitest', '~> 5.1' - s.add_dependency 'concurrent-ruby', '~> 1.0' + s.add_dependency 'concurrent-ruby', '~> 1.0', '>= 1.0.2' end |