diff options
author | Starfall <root@starfall.blue> | 2020-04-11 20:04:46 -0500 |
---|---|---|
committer | Starfall <root@starfall.blue> | 2020-04-11 20:04:46 -0500 |
commit | 144ecfcfc7d9974117f1563084409a9558290a60 (patch) | |
tree | a26bd8374e4b8264dbae815fbfbd3b91ae51450b /Gemfile.lock | |
parent | 12d35783db1bb302d7540d8d3690ab6eed3dac3b (diff) |
Revert "Revert "Merge branch 'glitch'""
This reverts commit 12d35783db1bb302d7540d8d3690ab6eed3dac3b.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 63 |
1 files changed, 29 insertions, 34 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e33748197..16871e8e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,7 +127,7 @@ GEM bundler-audit (0.6.1) bundler (>= 1.2.0, < 3) thor (~> 0.18) - byebug (11.0.0) + byebug (11.1.1) capistrano (3.11.2) airbrussh (>= 1.0.0) i18n @@ -144,7 +144,7 @@ GEM sshkit (~> 1.3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.30.0) + capybara (3.31.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -202,14 +202,14 @@ GEM dotenv (= 2.7.5) railties (>= 3.2, < 6.1) e2mmap (0.1.0) - elasticsearch (7.3.0) - elasticsearch-api (= 7.3.0) - elasticsearch-transport (= 7.3.0) - elasticsearch-api (7.3.0) + elasticsearch (7.5.0) + elasticsearch-api (= 7.5.0) + elasticsearch-transport (= 7.5.0) + elasticsearch-api (7.5.0) multi_json elasticsearch-dsl (0.1.8) - elasticsearch-transport (7.3.0) - faraday + elasticsearch-transport (7.5.0) + faraday (>= 0.14, < 1) multi_json encryptor (3.0.0) equatable (0.6.1) @@ -220,7 +220,7 @@ GEM fabrication (2.21.0) faker (2.10.1) i18n (>= 1.6, < 2) - faraday (1.0.0) + faraday (0.17.3) multipart-post (>= 1.2, < 3) fast_blank (1.0.0) fastimage (2.1.7) @@ -270,8 +270,6 @@ GEM highline (2.0.3) hiredis (0.6.3) hkdf (0.3.0) - html2text (0.2.1) - nokogiri (~> 1.6) htmlentities (4.3.4) http (4.3.0) addressable (~> 2.3) @@ -313,10 +311,9 @@ GEM multi_json (~> 1.14) rack (~> 2.0) rdf (~> 3.1) - json-ld-preloaded (3.0.6) - json-ld (~> 3.0) - multi_json (~> 1.12) - rdf (~> 3.0) + json-ld-preloaded (3.1.0) + json-ld (~> 3.1) + rdf (~> 3.1) jsonapi-renderer (0.2.2) jwt (2.1.0) kaminari (1.1.1) @@ -335,7 +332,7 @@ GEM addressable (~> 2.3) letter_opener (1.7.0) launchy (~> 2.2) - letter_opener_web (1.3.4) + letter_opener_web (1.4.0) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) @@ -377,7 +374,7 @@ GEM net-ssh (>= 2.6.5, < 6.0.0) net-ssh (5.2.0) nio4r (2.5.2) - nokogiri (1.10.7) + nokogiri (1.10.8) mini_portile2 (~> 2.4.0) nokogumbo (2.0.1) nokogiri (~> 1.8, >= 1.8.4) @@ -420,7 +417,7 @@ GEM pg (1.2.2) pghero (2.4.1) activerecord (>= 5) - pkg-config (1.4.0) + pkg-config (1.4.1) premailer (1.11.1) addressable css_parser (>= 1.6.0) @@ -432,18 +429,18 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.7.0) + pry-byebug (3.8.0) byebug (~> 11.0) pry (~> 0.10) pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.3) - puma (4.3.1) + puma (4.3.2) nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) raabro (1.1.6) - rack (2.1.2) + rack (2.2.2) rack-attack (6.2.2) rack (>= 1.0, < 3) rack-cors (1.1.1) @@ -494,7 +491,7 @@ GEM link_header (~> 0.0, >= 0.0.8) rdf-normalize (0.4.0) rdf (~> 3.1) - redcarpet (3.4.0) + redcarpet (3.5.0) redis (4.1.3) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) @@ -553,7 +550,7 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.4.1) + rubocop-rails (2.4.2) rack (>= 1.1) rubocop (>= 0.72.0) ruby-progressbar (1.10.1) @@ -587,11 +584,10 @@ GEM simple_form (5.0.1) actionpack (>= 5.0) activemodel (>= 5.0) - simplecov (0.17.1) + simplecov (0.18.2) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) + simplecov-html (~> 0.11) + simplecov-html (0.12.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -683,7 +679,7 @@ DEPENDENCIES capistrano-rails (~> 1.4) capistrano-rbenv (~> 2.1) capistrano-yarn (~> 2.0) - capybara (~> 3.30) + capybara (~> 3.31) charlock_holmes (~> 0.7.7) chewy (~> 5.1) cld3 (~> 3.2.6) @@ -708,7 +704,6 @@ DEPENDENCIES hamlit-rails (~> 0.2) health_check! hiredis (~> 0.6) - html2text htmlentities (~> 4.3) http (~> 4.3) http_accept_language (~> 2.1) @@ -718,10 +713,10 @@ DEPENDENCIES idn-ruby iso-639 json-ld - json-ld-preloaded (~> 3.0) + json-ld-preloaded (~> 3.1) kaminari (~> 1.1) letter_opener (~> 1.7) - letter_opener_web (~> 1.3) + letter_opener_web (~> 1.4) link_header (~> 0.0) lograge (~> 0.11) makara (~> 0.4) @@ -749,11 +744,11 @@ DEPENDENCIES posix-spawn! premailer-rails private_address_check (~> 0.5) - pry-byebug (~> 3.7) + pry-byebug (~> 3.8) pry-rails (~> 0.3) puma (~> 4.3) pundit (~> 2.1) - rack (~> 2.1.2) + rack (~> 2.2.2) rack-attack (~> 6.2) rack-cors (~> 1.1) rails (~> 5.2.4) @@ -778,7 +773,7 @@ DEPENDENCIES sidekiq-unique-jobs (~> 6.0) simple-navigation (~> 4.1) simple_form (~> 5.0) - simplecov (~> 0.17) + simplecov (~> 0.18) sprockets (~> 3.7.2) sprockets-rails (~> 3.2) stackprof |