diff options
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0cdfb2589c..f256186e29 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,12 @@ GIT websocket GIT + remote: https://github.com/rails/arel.git + revision: b26638ef041953992010590b31615c519fa0ea7d + specs: + arel (8.0.0) + +GIT remote: https://github.com/resque/resque.git revision: 835a4a7e61a2e33832dbf11975ecfab54af293c6 specs: @@ -54,7 +60,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) @@ -83,7 +89,7 @@ PATH activerecord (5.1.0.alpha) activemodel (= 5.1.0.alpha) activesupport (= 5.1.0.alpha) - arel (~> 7.0) + arel (~> 8.0) activesupport (5.1.0.alpha) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) @@ -114,7 +120,6 @@ GEM addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) amq-protocol (2.0.1) - arel (7.1.4) ast (2.3.0) backburner (1.3.1) beaneater (~> 1.0) @@ -193,6 +198,8 @@ GEM eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) ffi (1.9.14) + ffi (1.9.14-x64-mingw32) + ffi (1.9.14-x86-mingw32) globalid (0.3.7) activesupport (>= 4.1.0) hiredis (0.6.1) @@ -231,7 +238,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) @@ -373,6 +380,7 @@ DEPENDENCIES activerecord-jdbcmysql-adapter (>= 1.3.0) activerecord-jdbcpostgresql-adapter (>= 1.3.0) activerecord-jdbcsqlite3-adapter (>= 1.3.0) + arel! backburner bcrypt (~> 3.1.11) benchmark-ips |