aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-09-30 09:27:50 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-09-30 09:27:50 +0200
commitaef14fec0aa2fd33442165f37abca119bd0cfb9c (patch)
tree1394151c5984a4c742bf307e1e59bc5bf610980e /activesupport
parent56625b2815d2eb1fffb40774df4cb66f34562a64 (diff)
parent33e506cb4a2d25aeb02a31889778cb3f4620237e (diff)
downloadrails-aef14fec0aa2fd33442165f37abca119bd0cfb9c.tar.gz
rails-aef14fec0aa2fd33442165f37abca119bd0cfb9c.tar.bz2
rails-aef14fec0aa2fd33442165f37abca119bd0cfb9c.zip
Merge pull request #21817 from jdantonio/clear-concurrent-ruby-warnings
Fixed concurrent-ruby warnings.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/activesupport.gemspec2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index d236dbd200..93878518d7 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -24,6 +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 'concurrent-ruby', '~> 1.0.0.pre2', '< 2.0.0'
+ s.add_dependency 'concurrent-ruby', '~> 1.0.0.pre3', '< 2.0.0'
s.add_dependency 'method_source'
end