diff options
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 106 |
1 files changed, 40 insertions, 66 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c39b8b049e..ad75b2c9c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,14 +20,6 @@ GIT redis-namespace GIT - remote: git://github.com/mikel/mail.git - revision: f0efbd4850d1bc06cdcba6178c282eeaba9c8c43 - branch: master - specs: - mail (2.6.3.edge) - mime-types (>= 1.16, < 3) - -GIT remote: git://github.com/rack/rack.git revision: 96ae9b9fed8d6809383b6f48a5884437e76f8ca4 branch: master @@ -36,49 +28,6 @@ GIT json GIT - remote: git://github.com/rails/arel.git - revision: 899e8428c50c586e6c8d4884b542ac9fdf01e95f - branch: master - specs: - arel (7.0.0.alpha) - -GIT - remote: git://github.com/rails/globalid.git - revision: 4e74ec6bb60d735ef3c56080f9c9f1dee9cadaaf - branch: master - specs: - globalid (0.3.6) - activesupport (>= 4.1.0) - -GIT - remote: git://github.com/rails/jquery-rails.git - revision: 04fcfa29b859eef9479f89b6a799d00212902385 - branch: master - specs: - jquery-rails (4.0.5) - rails-dom-testing (~> 1.0) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - -GIT - remote: git://github.com/rails/sprockets-rails.git - revision: 06d84e952490d7d391592124f6e3b79f9c596674 - branch: master - specs: - sprockets-rails (3.0.0.beta3) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - -GIT - remote: git://github.com/rails/turbolinks.git - revision: ad583843fdaa0c1f61462a346a495981ca314460 - branch: master - specs: - turbolinks (3.0.0) - coffee-rails - -GIT remote: git://github.com/sass/sass.git revision: bce9509f396225d721501ea1070a6871b708abb1 branch: stable @@ -88,6 +37,14 @@ GIT PATH remote: . specs: + actioncable (5.0.0.alpha) + actionpack (= 5.0.0.alpha) + celluloid (~> 0.17.2) + coffee-rails (~> 4.1.0) + em-hiredis (~> 0.3.0) + faye-websocket (~> 0.10.0) + redis (~> 3.0) + websocket-driver (~> 0.6.1) actionmailer (5.0.0.alpha) actionpack (= 5.0.0.alpha) actionview (= 5.0.0.alpha) @@ -109,14 +66,14 @@ PATH rails-html-sanitizer (~> 1.0, >= 1.0.2) activejob (5.0.0.alpha) activesupport (= 5.0.0.alpha) - globalid (>= 0.3.0) + globalid (>= 0.3.6) activemodel (5.0.0.alpha) activesupport (= 5.0.0.alpha) builder (~> 3.1) activerecord (5.0.0.alpha) activemodel (= 5.0.0.alpha) activesupport (= 5.0.0.alpha) - arel (= 7.0.0.alpha) + arel (~> 7.0) activesupport (5.0.0.alpha) concurrent-ruby (~> 1.0) i18n (~> 0.7) @@ -125,6 +82,7 @@ PATH minitest (~> 5.1) tzinfo (~> 1.1) rails (5.0.0.alpha) + actioncable (= 5.0.0.alpha) actionmailer (= 5.0.0.alpha) actionpack (= 5.0.0.alpha) actionview (= 5.0.0.alpha) @@ -146,6 +104,7 @@ GEM remote: https://rubygems.org/ specs: amq-protocol (2.0.0) + arel (7.0.0) backburner (1.2.0) beaneater (~> 1.0) dante (> 0.1.5) @@ -191,11 +150,21 @@ GEM delayed_job_active_record (4.1.0) activerecord (>= 3.0, < 5) delayed_job (>= 3.0, < 5) + em-hiredis (0.3.0) + eventmachine (~> 1.0) + hiredis (~> 0.5.0) erubis (2.7.0) + eventmachine (1.0.8) execjs (2.6.0) + faye-websocket (0.10.2) + eventmachine (>= 0.12.0) + websocket-driver (>= 0.5.1) ffi (1.9.10) ffi (1.9.10-x64-mingw32) ffi (1.9.10-x86-mingw32) + globalid (0.3.6) + activesupport (>= 4.1.0) + hiredis (0.5.2) hitimes (1.2.3) hitimes (1.2.3-x86-mingw32) i18n (0.7.0) @@ -208,6 +177,8 @@ GEM rb-inotify (>= 0.9) loofah (2.0.3) nokogiri (>= 1.5.9) + mail (2.6.3) + mime-types (>= 1.16, < 3) metaclass (0.0.4) method_source (0.8.2) mime-types (2.99) @@ -218,21 +189,20 @@ GEM mono_logger (1.1.0) multi_json (1.11.2) mustache (1.0.2) - mysql (2.9.1) - mysql (2.9.1-x86-mingw32) mysql2 (0.4.2) mysql2 (0.4.2-x64-mingw32) mysql2 (0.4.2-x86-mingw32) - nokogiri (1.6.7) + nokogiri (1.6.7.1) mini_portile2 (~> 2.0.0.rc2) - nokogiri (1.6.7-x64-mingw32) + nokogiri (1.6.7.1-x64-mingw32) mini_portile2 (~> 2.0.0.rc2) - nokogiri (1.6.7-x86-mingw32) + nokogiri (1.6.7.1-x86-mingw32) mini_portile2 (~> 2.0.0.rc2) pg (0.18.4) pg (0.18.4-x64-mingw32) pg (0.18.4-x86-mingw32) psych (2.0.16) + puma (2.15.3) que (0.11.2) racc (1.4.14) rack-cache (1.5.1) @@ -290,6 +260,10 @@ GEM sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) + sprockets-rails (3.0.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) sqlite3 (1.3.11) sqlite3 (1.3.11-x64-mingw32) sqlite3 (1.3.11-x86-mingw32) @@ -301,6 +275,8 @@ GEM thread_safe (0.3.5) timers (4.1.1) hitimes + turbolinks (2.5.3) + coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) tzinfo-data (1.2015.7) @@ -313,6 +289,9 @@ GEM w3c_validators (1.2) json nokogiri + websocket-driver (0.6.3) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) PLATFORMS ruby @@ -323,7 +302,6 @@ DEPENDENCIES activerecord-jdbcmysql-adapter (>= 1.3.0) activerecord-jdbcpostgresql-adapter (>= 1.3.0) activerecord-jdbcsqlite3-adapter (>= 1.3.0) - arel! backburner bcrypt (~> 3.1.10) bcrypt-ruby (~> 3.0.0) @@ -333,19 +311,16 @@ DEPENDENCIES dalli (>= 2.2.1) delayed_job delayed_job_active_record - globalid! - jquery-rails! json kindlerb (= 0.1.1) listen (~> 3.0.5) - mail! minitest (< 5.3.4) mocha (~> 0.14) - mysql (>= 2.9.0) mysql2 (>= 0.4.0) - nokogiri (>= 1.6.7) + nokogiri (>= 1.6.7.1) pg (>= 0.18.0) psych (~> 2.0) + puma qu-rails! qu-redis que @@ -363,11 +338,10 @@ DEPENDENCIES sequel sidekiq sneakers - sprockets-rails (~> 3.0.0.beta3)! sqlite3 (~> 1.3.6) stackprof sucker_punch - turbolinks! + turbolinks tzinfo-data uglifier (>= 1.3.0) w3c_validators |