aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
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.lock
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.lock')
-rw-r--r--Gemfile.lock8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ba3024b667..e8b40c56e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,9 +99,9 @@ GIT
GIT
remote: git://github.com/ruby-concurrency/concurrent-ruby.git
- revision: c0e52022e5388ed984935bbd59f281c501071760
+ revision: 10ceb96c146d2937b66e7a444445e5ab9edbeb7c
specs:
- concurrent-ruby (1.0.0.pre2)
+ concurrent-ruby (1.0.0.pre3)
PATH
remote: .
@@ -136,7 +136,7 @@ PATH
activesupport (= 5.0.0.alpha)
arel (= 7.0.0.alpha)
activesupport (5.0.0.alpha)
- concurrent-ruby (~> 1.0.0.pre2, < 2.0.0)
+ concurrent-ruby (~> 1.0.0.pre3, < 2.0.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
method_source
@@ -314,7 +314,7 @@ DEPENDENCIES
benchmark-ips
byebug
coffee-rails (~> 4.1.0)
- concurrent-ruby (~> 1.0.0.pre2)!
+ concurrent-ruby (~> 1.0.0.pre3)!
dalli (>= 2.2.1)
delayed_job
delayed_job_active_record