diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-19 18:00:06 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-19 18:00:06 +0200 |
| commit | 1bf3cecf59821368cf3952188677b80a4407d883 (patch) | |
| tree | 50663e739dce52d51297193c99714047201e8e69 /activesupport/activesupport.gemspec | |
| parent | dcc941382b44eec0704c120cf1a73067c37ab79b (diff) | |
| parent | 56ac6e4768adb1f7055474d40a9e921380559c43 (diff) | |
| download | rails-1bf3cecf59821368cf3952188677b80a4407d883.tar.gz rails-1bf3cecf59821368cf3952188677b80a4407d883.tar.bz2 rails-1bf3cecf59821368cf3952188677b80a4407d883.zip | |
Merge pull request #21679 from jdantonio/replace-thread-safe
Replaced `ThreadSafe::Map` with successor `Concurrent::Map`.
Diffstat (limited to 'activesupport/activesupport.gemspec')
| -rw-r--r-- | activesupport/activesupport.gemspec | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index 67b6663915..d236dbd200 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -24,7 +24,6 @@ Gem::Specification.new do |s| s.add_dependency 'json', '~> 1.7', '>= 1.7.7' s.add_dependency 'tzinfo', '~> 1.1' s.add_dependency 'minitest', '~> 5.1' - s.add_dependency 'thread_safe','~> 0.3', '>= 0.3.4' - s.add_dependency 'concurrent-ruby', '~> 0.9.1' + s.add_dependency 'concurrent-ruby', '~> 1.0.0.pre2', '< 2.0.0' s.add_dependency 'method_source' end |