aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
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 /Gemfile
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 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 70f58fe835..67cb2cce45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem 'rake', '>= 10.3'
# Active Support depends on a prerelease concurrent-ruby 1.0.0, so track
# latest master as it approaches release.
-gem 'concurrent-ruby', '~> 1.0.0.pre2', github: 'ruby-concurrency/concurrent-ruby'
+gem 'concurrent-ruby', '~> 1.0.0.pre3', github: 'ruby-concurrency/concurrent-ruby'
# Active Job depends on the URI::GID::MissingModelIDError, which isn't released yet.
gem 'globalid', github: 'rails/globalid', branch: 'master'