diff options
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 140 |
1 files changed, 67 insertions, 73 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8c9b1c7388..baac1cee7e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -23,74 +23,66 @@ GIT queue_classic (3.2.0.RC1) pg (>= 0.17, < 2.0) -GIT - remote: https://github.com/robin850/sdoc.git - revision: 0e340352f3ab2f196c8a8743f83c2ee286e4f71c - branch: upgrade - specs: - sdoc (1.0.0.rc2) - rdoc (~> 5.0) - PATH remote: . specs: - actioncable (5.2.0.beta2) - actionpack (= 5.2.0.beta2) + actioncable (6.0.0.alpha) + actionpack (= 6.0.0.alpha) nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.2.0.beta2) - actionpack (= 5.2.0.beta2) - actionview (= 5.2.0.beta2) - activejob (= 5.2.0.beta2) + websocket-driver (>= 0.6.1) + actionmailer (6.0.0.alpha) + actionpack (= 6.0.0.alpha) + actionview (= 6.0.0.alpha) + activejob (= 6.0.0.alpha) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.0.beta2) - actionview (= 5.2.0.beta2) - activesupport (= 5.2.0.beta2) + actionpack (6.0.0.alpha) + actionview (= 6.0.0.alpha) + activesupport (= 6.0.0.alpha) 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.beta2) - activesupport (= 5.2.0.beta2) + actionview (6.0.0.alpha) + activesupport (= 6.0.0.alpha) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.0.beta2) - activesupport (= 5.2.0.beta2) + activejob (6.0.0.alpha) + activesupport (= 6.0.0.alpha) globalid (>= 0.3.6) - 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) + activemodel (6.0.0.alpha) + activesupport (= 6.0.0.alpha) + activerecord (6.0.0.alpha) + activemodel (= 6.0.0.alpha) + activesupport (= 6.0.0.alpha) arel (>= 9.0) - activestorage (5.2.0.beta2) - actionpack (= 5.2.0.beta2) - activerecord (= 5.2.0.beta2) + activestorage (6.0.0.alpha) + actionpack (= 6.0.0.alpha) + activerecord (= 6.0.0.alpha) marcel (~> 0.3.1) - activesupport (5.2.0.beta2) + activesupport (6.0.0.alpha) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - 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) + rails (6.0.0.alpha) + actioncable (= 6.0.0.alpha) + actionmailer (= 6.0.0.alpha) + actionpack (= 6.0.0.alpha) + actionview (= 6.0.0.alpha) + activejob (= 6.0.0.alpha) + activemodel (= 6.0.0.alpha) + activerecord (= 6.0.0.alpha) + activestorage (= 6.0.0.alpha) + activesupport (= 6.0.0.alpha) bundler (>= 1.3.0) - railties (= 5.2.0.beta2) + railties (= 6.0.0.alpha) sprockets-rails (>= 2.0.0) - railties (5.2.0.beta2) - actionpack (= 5.2.0.beta2) - activesupport (= 5.2.0.beta2) + railties (6.0.0.alpha) + actionpack (= 6.0.0.alpha) + activesupport (= 6.0.0.alpha) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -115,7 +107,7 @@ GEM archive-zip (0.7.0) io-like (~> 0.3.0) arel (9.0.0) - ast (2.3.0) + ast (2.4.0) aws-partitions (1.20.0) aws-sdk-core (3.3.0) aws-partitions (~> 1.0) @@ -216,7 +208,7 @@ GEM em-socksify (>= 0.3) eventmachine (>= 1.0.3) http_parser.rb (>= 0.6.0) - em-socksify (0.3.1) + em-socksify (0.3.2) eventmachine (>= 1.0.0.beta.4) erubi (1.7.0) et-orbi (1.0.8) @@ -274,7 +266,7 @@ GEM hiredis (0.6.1-java) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (0.9.1) + i18n (1.0.0) concurrent-ruby (~> 1.0) io-like (0.3.0) jdbc-mysql (5.1.44) @@ -313,11 +305,11 @@ GEM mini_magick (4.8.0) mini_mime (0.1.4) mini_portile2 (2.3.0) - minitest (5.11.1) + minitest (5.11.3) minitest-bisect (1.4.0) minitest-server (~> 1.0) path_expander (~> 1.0) - minitest-server (1.0.4) + minitest-server (1.0.5) minitest (~> 5.0) mocha (1.3.0) metaclass (~> 0.0.1) @@ -329,12 +321,12 @@ GEM multi_json (1.12.2) multipart-post (2.0.0) mustache (1.0.5) - mustermann (1.0.0) - mysql2 (0.4.9) - mysql2 (0.4.9-x64-mingw32) - mysql2 (0.4.9-x86-mingw32) - nio4r (2.1.0) - nio4r (2.1.0-java) + mustermann (1.0.2) + mysql2 (0.4.10) + mysql2 (0.4.10-x64-mingw32) + mysql2 (0.4.10-x86-mingw32) + nio4r (2.2.0) + nio4r (2.2.0-java) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) nokogiri (1.8.1-java) @@ -343,9 +335,9 @@ GEM nokogiri (1.8.1-x86-mingw32) mini_portile2 (~> 2.3.0) os (0.9.6) - parallel (1.12.0) - parser (2.4.0.0) - ast (~> 2.2) + parallel (1.12.1) + parser (2.5.0.2) + ast (~> 2.4.0) path_expander (1.0.2) pg (1.0.0) pg (1.0.0-x64-mingw32) @@ -360,10 +352,10 @@ GEM selenium-webdriver thor racc (1.4.14) - rack (2.0.3) + rack (2.0.4) rack-cache (1.7.0) rack (>= 0.4) - rack-protection (2.0.0) + rack-protection (2.0.1) rack rack-test (0.8.0) rack (>= 1.0, < 3) @@ -372,11 +364,10 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rainbow (2.2.2) - rake - rake (12.2.1) + rainbow (3.0.0) + rake (12.3.0) rb-fsevent (0.10.2) - rdoc (5.1.0) + rdoc (6.0.1) redcarpet (3.2.3) redis (4.0.1) redis-namespace (1.6.0) @@ -397,11 +388,11 @@ GEM resque (~> 1.26) rufus-scheduler (~> 3.2) retriable (3.1.1) - rubocop (0.51.0) + rubocop (0.52.1) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) + parser (>= 2.4.0.2, < 3.0) powerpack (~> 0.1) - rainbow (>= 2.2.2, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.9.0) @@ -421,6 +412,8 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sdoc (1.0.0) + rdoc (>= 5.0) selenium-webdriver (3.5.1) childprocess (~> 0.5) rubyzip (~> 1.0) @@ -438,10 +431,10 @@ GEM faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - sinatra (2.0.0) + sinatra (2.0.1) mustermann (~> 1.0) rack (~> 2.0) - rack-protection (= 2.0.0) + rack-protection (= 2.0.1) tilt (~> 2.0) sneakers (2.5.0) bunny (~> 2.6.4) @@ -524,6 +517,7 @@ DEPENDENCIES capybara (~> 2.15) chromedriver-helper coffee-rails + connection_pool dalli (>= 2.2.1) delayed_job delayed_job_active_record @@ -536,7 +530,7 @@ DEPENDENCIES mini_magick minitest-bisect mocha - mysql2 (>= 0.4.4) + mysql2 (>= 0.4.10) nokogiri (>= 1.8.1) pg (>= 0.18.0) psych (~> 2.0) @@ -556,7 +550,7 @@ DEPENDENCIES resque-scheduler rubocop (>= 0.47) sass-rails - sdoc! + sdoc (~> 1.0) sequel sidekiq sneakers |