aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-12-28 23:58:02 -0500
committerGitHub <noreply@github.com>2016-12-28 23:58:02 -0500
commit807299501b45e817a444435dc299f4fa7b4448ea (patch)
treeb4ce1f46f3a559f870056f1210da4ae003e35a28 /Gemfile.lock
parent181249135a1dca4885b2589b3ef6a2d0cb63b4e6 (diff)
parentc434b97628e414d8c8ad27894e3ebecb51b32e2b (diff)
downloadrails-807299501b45e817a444435dc299f4fa7b4448ea.tar.gz
rails-807299501b45e817a444435dc299f4fa7b4448ea.tar.bz2
rails-807299501b45e817a444435dc299f4fa7b4448ea.zip
Merge pull request #27488 from tarcieri/upgrade-nio4r-to-2-0
Upgrade to nio4r 2.0.0
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0cdfb2589c..2f6b8001ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ PATH
specs:
actioncable (5.1.0.alpha)
actionpack (= 5.1.0.alpha)
- nio4r (~> 1.2)
+ nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.0.alpha)
actionpack (= 5.1.0.alpha)
@@ -231,7 +231,7 @@ GEM
mysql2 (0.4.5)
mysql2 (0.4.5-x64-mingw32)
mysql2 (0.4.5-x86-mingw32)
- nio4r (1.2.1)
+ nio4r (2.0.0)
nokogiri (1.7.0)
mini_portile2 (~> 2.1.0)
nokogiri (1.7.0-x64-mingw32)