aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock181
1 files changed, 74 insertions, 107 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d7abc12b21..ad75b2c9c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -20,93 +20,31 @@ GIT
redis-namespace
GIT
- remote: git://github.com/mikel/mail.git
- revision: 9c313a401729b9aa9177878836829a61adf67b54
- branch: master
- specs:
- mail (2.6.3.edge)
- mime-types (>= 1.16, < 3)
-
-GIT
remote: git://github.com/rack/rack.git
- revision: 35599cfc2751e0ee611c0ff799924b8e7fe0c0b4
+ revision: 96ae9b9fed8d6809383b6f48a5884437e76f8ca4
branch: master
specs:
rack (2.0.0.alpha)
json
GIT
- remote: git://github.com/rails/arel.git
- revision: 3c429c5d86e9e2201c2a35d934ca6a8911c18e69
- branch: master
- specs:
- arel (7.0.0.alpha)
-
-GIT
- remote: git://github.com/rails/globalid.git
- revision: 1d8fca667740570d204fd955a0bd39ac539bac7f
- 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/sass-rails.git
- revision: 6e4eee736bcbfa5b2962467673c7a51abf434c67
- branch: master
- specs:
- sass-rails (6.0.0)
- railties (>= 4.0.0, < 5.0)
- sass (~> 3.4)
- sprockets (>= 4.0)
- sprockets-rails (< 4.0)
-
-GIT
- remote: git://github.com/rails/sprockets-rails.git
- revision: 93a45b1c463a063ec7cf4d160107b67aa3db7a1a
- 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/sprockets.git
- revision: 5a77f8b007b8ec61edd783c48baf9d971f1c684d
- branch: master
- specs:
- sprockets (4.0.0)
- rack (>= 1, < 3)
-
-GIT
- remote: git://github.com/rails/turbolinks.git
- revision: 83d4b3d2c52a681f07900c28adb28bc8da604733
- branch: master
- specs:
- turbolinks (3.0.0)
- coffee-rails
-
-GIT
remote: git://github.com/sass/sass.git
- revision: 4e3e1d5684cc29073a507578fc977434ff488c93
+ revision: bce9509f396225d721501ea1070a6871b708abb1
branch: stable
specs:
- sass (3.4.19)
+ sass (3.4.20)
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)
@@ -128,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)
@@ -144,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)
@@ -165,18 +104,19 @@ GEM
remote: https://rubygems.org/
specs:
amq-protocol (2.0.0)
- backburner (1.1.0)
+ arel (7.0.0)
+ backburner (1.2.0)
beaneater (~> 1.0)
dante (> 0.1.5)
bcrypt (3.1.10)
- bcrypt (3.1.10-x64-mingw32)
- bcrypt (3.1.10-x86-mingw32)
+ bcrypt-ruby (3.0.1)
+ bcrypt-ruby (3.0.1-x86-mingw32)
beaneater (1.0.0)
benchmark-ips (2.3.0)
builder (3.2.2)
- bunny (2.2.0)
+ bunny (2.2.1)
amq-protocol (>= 2.0.0)
- byebug (8.2.0)
+ byebug (8.2.1)
celluloid (0.17.2)
celluloid-essentials
celluloid-extras
@@ -200,21 +140,31 @@ GEM
coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.9.1.1)
+ coffee-script-source (1.10.0)
concurrent-ruby (1.0.0)
connection_pool (2.2.0)
- dalli (2.7.4)
+ dalli (2.7.5)
dante (0.2.0)
delayed_job (4.1.1)
activesupport (>= 3.0, < 5.0)
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)
@@ -227,9 +177,11 @@ 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.6.2)
+ mime-types (2.99)
mini_portile2 (2.0.0)
minitest (5.3.3)
mocha (0.14.0)
@@ -237,15 +189,23 @@ GEM
mono_logger (1.1.0)
multi_json (1.11.2)
mustache (1.0.2)
- mysql (2.9.1)
- mysql2 (0.4.1)
- nokogiri (1.6.7)
+ mysql2 (0.4.2)
+ mysql2 (0.4.2-x64-mingw32)
+ mysql2 (0.4.2-x86-mingw32)
+ nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
- pg (0.18.3)
- psych (2.0.15)
+ nokogiri (1.6.7.1-x64-mingw32)
+ mini_portile2 (~> 2.0.0.rc2)
+ 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.13)
- rack-cache (1.5.0)
+ racc (1.4.14)
+ rack-cache (1.5.1)
rack (>= 0.4)
rack-test (0.6.3)
rack (>= 1.0)
@@ -263,7 +223,7 @@ GEM
ffi (>= 0.5.0)
rdoc (4.2.0)
redcarpet (3.2.3)
- redis (3.2.1)
+ redis (3.2.2)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
resque (1.25.2)
@@ -277,19 +237,18 @@ GEM
redis (~> 3.0)
resque (~> 1.25)
rufus-scheduler (~> 3.0)
- rufus-scheduler (3.1.7)
+ rufus-scheduler (3.1.10)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
- sequel (4.27.0)
+ sequel (4.29.0)
serverengine (1.5.11)
sigdump (~> 0.2.2)
- sidekiq (3.5.1)
- celluloid (~> 0.17.2)
+ sidekiq (4.0.1)
+ concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
json (~> 1.0)
redis (~> 3.2, >= 3.2.1)
- redis-namespace (~> 1.5, >= 1.5.2)
sigdump (0.2.3)
sinatra (1.0)
rack (>= 1.0)
@@ -298,7 +257,16 @@ GEM
serverengine (~> 1.5.11)
thor
thread (~> 0.1.7)
+ 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)
stackprof (0.2.7)
sucker_punch (1.6.0)
celluloid (~> 0.17.2)
@@ -307,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)
@@ -319,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
@@ -329,28 +302,25 @@ 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)
benchmark-ips
byebug
coffee-rails (~> 4.1.0)
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
@@ -364,20 +334,17 @@ DEPENDENCIES
resque
resque-scheduler
sass!
- sass-rails!
sdoc (~> 0.4.0)
sequel
sidekiq
sneakers
- sprockets (~> 4.0)!
- sprockets-rails (~> 3.0.0.beta3)!
sqlite3 (~> 1.3.6)
stackprof
sucker_punch
- turbolinks!
+ turbolinks
tzinfo-data
uglifier (>= 1.3.0)
w3c_validators
BUNDLED WITH
- 1.10.6
+ 1.11.2