aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock208
1 files changed, 95 insertions, 113 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 86f6ed3baf..21328870d4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,17 +7,6 @@ GIT
pg (>= 0.17, < 0.20)
GIT
- remote: https://github.com/jeremy/resque-scheduler.git
- revision: 7cccf7d8db4dbbf54bf549a98b6cbb38106dbed2
- branch: redis-rb-4.0
- specs:
- resque-scheduler (4.3.0)
- mono_logger (~> 1.0)
- redis (>= 3.3, < 5)
- resque (~> 1.26)
- rufus-scheduler (~> 3.2)
-
-GIT
remote: https://github.com/matthewd/rb-inotify.git
revision: 856730aad4b285969e8dd621e44808a7c5af4242
branch: close-handling
@@ -35,24 +24,6 @@ GIT
websocket
GIT
- remote: https://github.com/rails/arel.git
- revision: 42510bf71472e2e35d9becb546edd05562672344
- specs:
- arel (9.0.0.alpha)
-
-GIT
- remote: https://github.com/rails/sass-rails.git
- revision: bb5c1d34e8acad2e2960cc785184ffe17d7b3bca
- branch: 5-0-stable
- specs:
- sass-rails (5.0.6)
- railties (>= 4.0.0, < 6)
- sass (~> 3.1)
- sprockets (>= 2.8, < 4.0)
- sprockets-rails (>= 2.0, < 4.0)
- tilt (>= 1.1, < 3)
-
-GIT
remote: https://github.com/robin850/sdoc.git
revision: 0e340352f3ab2f196c8a8743f83c2ee286e4f71c
branch: upgrade
@@ -63,62 +34,62 @@ GIT
PATH
remote: .
specs:
- actioncable (5.2.0.alpha)
- actionpack (= 5.2.0.alpha)
+ actioncable (5.2.0.beta2)
+ actionpack (= 5.2.0.beta2)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
- actionmailer (5.2.0.alpha)
- actionpack (= 5.2.0.alpha)
- actionview (= 5.2.0.alpha)
- activejob (= 5.2.0.alpha)
+ actionmailer (5.2.0.beta2)
+ actionpack (= 5.2.0.beta2)
+ actionview (= 5.2.0.beta2)
+ activejob (= 5.2.0.beta2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.2.0.alpha)
- actionview (= 5.2.0.alpha)
- activesupport (= 5.2.0.alpha)
+ actionpack (5.2.0.beta2)
+ actionview (= 5.2.0.beta2)
+ activesupport (= 5.2.0.beta2)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.2.0.alpha)
- activesupport (= 5.2.0.alpha)
+ actionview (5.2.0.beta2)
+ activesupport (= 5.2.0.beta2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.2.0.alpha)
- activesupport (= 5.2.0.alpha)
+ activejob (5.2.0.beta2)
+ activesupport (= 5.2.0.beta2)
globalid (>= 0.3.6)
- activemodel (5.2.0.alpha)
- activesupport (= 5.2.0.alpha)
- activerecord (5.2.0.alpha)
- activemodel (= 5.2.0.alpha)
- activesupport (= 5.2.0.alpha)
- arel (= 9.0.0.alpha)
- activestorage (5.2.0.alpha)
- actionpack (= 5.2.0.alpha)
- activerecord (= 5.2.0.alpha)
- activesupport (5.2.0.alpha)
+ activemodel (5.2.0.beta2)
+ activesupport (= 5.2.0.beta2)
+ activerecord (5.2.0.beta2)
+ activemodel (= 5.2.0.beta2)
+ activesupport (= 5.2.0.beta2)
+ arel (>= 9.0)
+ activestorage (5.2.0.beta2)
+ actionpack (= 5.2.0.beta2)
+ activerecord (= 5.2.0.beta2)
+ activesupport (5.2.0.beta2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
- rails (5.2.0.alpha)
- actioncable (= 5.2.0.alpha)
- actionmailer (= 5.2.0.alpha)
- actionpack (= 5.2.0.alpha)
- actionview (= 5.2.0.alpha)
- activejob (= 5.2.0.alpha)
- activemodel (= 5.2.0.alpha)
- activerecord (= 5.2.0.alpha)
- activestorage (= 5.2.0.alpha)
- activesupport (= 5.2.0.alpha)
+ rails (5.2.0.beta2)
+ actioncable (= 5.2.0.beta2)
+ actionmailer (= 5.2.0.beta2)
+ actionpack (= 5.2.0.beta2)
+ actionview (= 5.2.0.beta2)
+ activejob (= 5.2.0.beta2)
+ activemodel (= 5.2.0.beta2)
+ activerecord (= 5.2.0.beta2)
+ activestorage (= 5.2.0.beta2)
+ activesupport (= 5.2.0.beta2)
bundler (>= 1.3.0)
- railties (= 5.2.0.alpha)
+ railties (= 5.2.0.beta2)
sprockets-rails (>= 2.0.0)
- railties (5.2.0.alpha)
- actionpack (= 5.2.0.alpha)
- activesupport (= 5.2.0.alpha)
+ railties (5.2.0.beta2)
+ actionpack (= 5.2.0.beta2)
+ activesupport (= 5.2.0.beta2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@@ -137,11 +108,12 @@ GEM
activerecord-jdbcsqlite3-adapter (1.3.24)
activerecord-jdbc-adapter (~> 1.3.24)
jdbc-sqlite3 (>= 3.7.2, < 3.9)
- addressable (2.5.1)
- public_suffix (~> 2.0, >= 2.0.2)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
amq-protocol (2.2.0)
archive-zip (0.7.0)
io-like (~> 0.3.0)
+ arel (9.0.0)
ast (2.3.0)
aws-partitions (1.20.0)
aws-sdk-core (3.3.0)
@@ -222,21 +194,19 @@ GEM
concurrent-ruby (1.0.5-java)
connection_pool (2.2.1)
cookiejar (0.3.3)
+ crass (1.0.3)
curses (1.0.2)
daemons (1.2.4)
dalli (2.7.6)
dante (0.2.0)
- declarative (0.0.9)
+ declarative (0.0.10)
declarative-option (0.1.0)
- delayed_job (4.1.3)
+ delayed_job (4.1.4)
activesupport (>= 3.0, < 5.2)
delayed_job_active_record (4.1.2)
activerecord (>= 3.0, < 5.2)
delayed_job (>= 3.0, < 5)
digest-crc (0.4.1)
- em-hiredis (0.3.1)
- eventmachine (~> 1.0)
- hiredis (~> 0.6.0)
em-http-request (1.1.5)
addressable (>= 2.3.4)
cookiejar (!= 0.3.1)
@@ -245,14 +215,11 @@ GEM
http_parser.rb (>= 0.6.0)
em-socksify (0.3.1)
eventmachine (>= 1.0.0.beta.4)
- erubi (1.6.1)
- et-orbi (1.0.5)
+ erubi (1.7.0)
+ et-orbi (1.0.8)
tzinfo
event_emitter (0.2.6)
eventmachine (1.2.5)
- eventmachine (1.2.5-java)
- eventmachine (1.2.5-x64-mingw32)
- eventmachine (1.2.5-x86-mingw32)
execjs (2.7.0)
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
@@ -273,27 +240,27 @@ GEM
ffi (1.9.18-java)
ffi (1.9.18-x64-mingw32)
ffi (1.9.18-x86-mingw32)
- globalid (0.4.0)
+ globalid (0.4.1)
activesupport (>= 4.2.0)
- google-api-client (0.13.1)
+ google-api-client (0.17.3)
addressable (~> 2.5, >= 2.5.1)
- googleauth (~> 0.5)
+ googleauth (>= 0.5, < 0.7.0)
httpclient (>= 2.8.1, < 3.0)
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- google-cloud-core (1.0.0)
+ google-cloud-core (1.1.0)
google-cloud-env (~> 1.0)
- googleauth (~> 0.5.1)
google-cloud-env (1.0.1)
faraday (~> 0.11)
- google-cloud-storage (1.4.0)
+ google-cloud-storage (1.9.0)
digest-crc (~> 0.4)
- google-api-client (~> 0.13.0)
- google-cloud-core (~> 1.0)
- googleauth (0.5.3)
+ google-api-client (~> 0.17.0)
+ google-cloud-core (~> 1.1)
+ googleauth (~> 0.6.2)
+ googleauth (0.6.2)
faraday (~> 0.12)
- jwt (~> 1.4)
+ jwt (>= 1.4, < 3.0)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
@@ -303,7 +270,8 @@ GEM
hiredis (0.6.1-java)
http_parser.rb (0.6.0)
httpclient (2.8.3)
- i18n (0.8.6)
+ i18n (0.9.1)
+ concurrent-ruby (~> 1.0)
io-like (0.3.0)
jdbc-mysql (5.1.44)
jdbc-postgres (9.4.1206)
@@ -311,7 +279,7 @@ GEM
jmespath (1.3.1)
json (2.1.0)
json (2.1.0-java)
- jwt (1.5.6)
+ jwt (2.1.0)
kindlerb (1.2.0)
mustache
nokogiri
@@ -324,19 +292,20 @@ GEM
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
- loofah (2.0.3)
+ loofah (2.1.1)
+ crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
memoist (0.16.0)
metaclass (0.0.4)
- method_source (0.8.2)
+ method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_magick (4.8.0)
mini_mime (0.1.4)
- mini_portile2 (2.2.0)
+ mini_portile2 (2.3.0)
minitest (5.10.3)
minitest-bisect (1.4.0)
minitest-server (~> 1.0)
@@ -350,7 +319,7 @@ GEM
msgpack (1.1.0-java)
msgpack (1.1.0-x64-mingw32)
msgpack (1.1.0-x86-mingw32)
- multi_json (1.12.1)
+ multi_json (1.12.2)
multipart-post (2.0.0)
mustache (1.0.5)
mustermann (1.0.0)
@@ -358,13 +327,14 @@ GEM
mysql2 (0.4.9-x64-mingw32)
mysql2 (0.4.9-x86-mingw32)
nio4r (2.1.0)
- nokogiri (1.8.0)
- mini_portile2 (~> 2.2.0)
- nokogiri (1.8.0-java)
- nokogiri (1.8.0-x64-mingw32)
- mini_portile2 (~> 2.2.0)
- nokogiri (1.8.0-x86-mingw32)
- mini_portile2 (~> 2.2.0)
+ nio4r (2.1.0-java)
+ nokogiri (1.8.1)
+ mini_portile2 (~> 2.3.0)
+ nokogiri (1.8.1-java)
+ nokogiri (1.8.1-x64-mingw32)
+ mini_portile2 (~> 2.3.0)
+ nokogiri (1.8.1-x86-mingw32)
+ mini_portile2 (~> 2.3.0)
os (0.9.6)
parallel (1.12.0)
parser (2.4.0.0)
@@ -375,7 +345,7 @@ GEM
pg (0.19.0-x86-mingw32)
powerpack (0.1.1)
psych (2.2.4)
- public_suffix (2.0.5)
+ public_suffix (3.0.1)
puma (3.9.1)
puma (3.9.1-java)
que (0.14.0)
@@ -388,7 +358,7 @@ GEM
rack (>= 0.4)
rack-protection (2.0.0)
rack
- rack-test (0.7.0)
+ rack-test (0.8.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
@@ -414,6 +384,11 @@ GEM
redis-namespace (~> 1.3)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
+ resque-scheduler (4.3.1)
+ mono_logger (~> 1.0)
+ redis (>= 3.3, < 5)
+ resque (~> 1.26)
+ rufus-scheduler (~> 3.2)
retriable (3.1.1)
rubocop (0.51.0)
parallel (~> 1.10)
@@ -427,11 +402,17 @@ GEM
rubyzip (1.2.1)
rufus-scheduler (3.4.2)
et-orbi (~> 1.0)
- sass (3.5.1)
+ sass (3.5.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
+ sass-rails (5.0.7)
+ railties (>= 4.0.0, < 6)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (>= 1.1, < 3)
selenium-webdriver (3.5.1)
childprocess (~> 0.5)
rubyzip (~> 1.0)
@@ -444,10 +425,10 @@ GEM
rack-protection (>= 1.5.0)
redis (>= 3.3.4, < 5)
sigdump (0.2.4)
- signet (0.7.3)
+ signet (0.8.1)
addressable (~> 2.3)
faraday (~> 0.9)
- jwt (~> 1.5)
+ jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
sinatra (2.0.0)
mustermann (~> 1.0)
@@ -503,6 +484,8 @@ GEM
websocket (1.2.4)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
+ websocket-driver (0.6.5-java)
+ websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xpath (2.1.0)
nokogiri (~> 1.3)
@@ -517,7 +500,6 @@ DEPENDENCIES
activerecord-jdbcmysql-adapter (>= 1.3.0)
activerecord-jdbcpostgresql-adapter (>= 1.3.0)
activerecord-jdbcsqlite3-adapter (>= 1.3.0)
- arel!
aws-sdk-s3
azure-storage
backburner
@@ -533,18 +515,18 @@ DEPENDENCIES
dalli (>= 2.2.1)
delayed_job
delayed_job_active_record
- em-hiredis
- google-cloud-storage (~> 1.3)
+ google-cloud-storage (~> 1.8)
hiredis
json (>= 2.0.0)
kindlerb (~> 1.2.0)
libxml-ruby
listen (>= 3.0.5, < 3.2)
mini_magick
+ minitest (~> 5.10.0)
minitest-bisect
mocha
mysql2 (>= 0.4.4)
- nokogiri (>= 1.6.8)
+ nokogiri (>= 1.8.1)
pg (>= 0.18.0)
psych (~> 2.0)
puma
@@ -560,9 +542,9 @@ DEPENDENCIES
redis (~> 4.0)
redis-namespace
resque
- resque-scheduler!
+ resque-scheduler
rubocop (>= 0.47)
- sass-rails!
+ sass-rails
sdoc!
sequel
sidekiq
@@ -579,4 +561,4 @@ DEPENDENCIES
websocket-client-simple!
BUNDLED WITH
- 1.15.4
+ 1.16.1