diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 15:00:22 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 15:00:22 +0100 |
commit | 45709d6987db87b38e5a16c18ea3b2d9e55fba98 (patch) | |
tree | 854dcee1c7c85f518f46616f1a2b6af87df77c5b /Gemfile.lock | |
parent | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (diff) | |
parent | 51182843d49d04621c3d3069f44f365fd9f415e5 (diff) |
Merge branch 'master' into glitch-soc/master
Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 83 |
1 files changed, 31 insertions, 52 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 44b858947..6527c468c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,19 +14,6 @@ GIT posix-spawn (0.3.13) GIT - remote: https://github.com/ruby-rdf/json-ld.git - revision: e742697a0906e74e8bb777ef98137bc3955d981d - ref: e742697a0906e74e8bb777ef98137bc3955d981d - specs: - json-ld (3.0.2) - htmlentities (~> 4.3) - json-canonicalization (~> 0.1) - link_header (~> 0.0, >= 0.0.8) - multi_json (~> 1.13) - rack (>= 1.6, < 3.0) - rdf (~> 3.0, >= 3.0.8) - -GIT remote: https://github.com/tmm1/http_parser.rb revision: 54b17ba8c7d8d20a16dfc65d1775241833219cf2 ref: 54b17ba8c7d8d20a16dfc65d1775241833219cf2 @@ -93,7 +80,7 @@ GEM tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - airbrussh (1.3.4) + airbrussh (1.4.0) sshkit (>= 1.6.1, != 1.7.0) annotate (3.0.3) activerecord (>= 3.2, < 7.0) @@ -121,7 +108,6 @@ GEM aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) bcrypt (3.1.12) - benchmark-ips (2.7.2) better_errors (2.5.1) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -133,7 +119,7 @@ GEM bootsnap (1.4.5) msgpack (~> 1.0) brakeman (4.7.2) - browser (2.7.1) + browser (3.0.3) builder (3.2.4) bullet (6.1.0) activesupport (>= 3.0.0) @@ -153,7 +139,7 @@ GEM capistrano-rails (1.4.0) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano-rbenv (2.1.4) + capistrano-rbenv (2.1.6) capistrano (~> 3.1) sshkit (~> 1.3) capistrano-yarn (2.0.2) @@ -184,19 +170,10 @@ GEM connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.5) + crass (1.0.6) css_parser (1.7.1) addressable debug_inspector (0.0.3) - derailed_benchmarks (1.4.3) - benchmark-ips (~> 2) - get_process_mem (~> 0) - heapy (~> 0) - memory_profiler (~> 0) - rack (>= 1) - rake (> 10, < 14) - ruby-statistics (>= 2.1) - thor (~> 0.19) devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -241,8 +218,8 @@ GEM tzinfo excon (0.71.0) fabrication (2.21.0) - faker (2.10.0) - i18n (>= 1.6, < 1.8) + faker (2.10.1) + i18n (>= 1.6, < 2) faraday (1.0.0) multipart-post (>= 1.2, < 3) fast_blank (1.0.0) @@ -270,8 +247,6 @@ GEM fuubar (2.5.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) - get_process_mem (0.2.5) - ffi (~> 1.0) globalid (0.4.2) activesupport (>= 4.2.0) goldfinger (2.1.1) @@ -292,8 +267,7 @@ GEM concurrent-ruby (~> 1.0) hashdiff (1.0.0) hashie (3.6.0) - heapy (0.1.4) - highline (2.0.1) + highline (2.0.3) hiredis (0.6.3) hkdf (0.3.0) html2text (0.2.1) @@ -313,9 +287,9 @@ GEM httplog (1.3.3) rack (>= 1.0) rainbow (>= 2.0.0) - i18n (1.7.0) + i18n (1.8.2) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.29) + i18n-tasks (0.9.30) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -331,7 +305,14 @@ GEM jaro_winkler (1.5.4) jmespath (1.4.0) json (2.3.0) - json-canonicalization (0.1.0) + json-canonicalization (0.2.0) + json-ld (3.1.0) + htmlentities (~> 4.3) + json-canonicalization (~> 0.1) + link_header (~> 0.0, >= 0.0.8) + multi_json (~> 1.14) + rack (~> 2.0) + rdf (~> 3.1) json-ld-preloaded (3.0.6) json-ld (~> 3.0) multi_json (~> 1.12) @@ -386,7 +367,7 @@ GEM mimemagic (0.3.3) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) + minitest (5.14.0) msgpack (1.3.1) multi_json (1.14.1) multipart-post (2.1.1) @@ -405,7 +386,7 @@ GEM concurrent-ruby (~> 1.0, >= 1.0.2) sidekiq (>= 3.5) statsd-ruby (~> 1.4, >= 1.4.0) - oj (3.10.0) + oj (3.10.1) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) @@ -417,7 +398,7 @@ GEM omniauth (~> 1.3, >= 1.3.2) ruby-saml (~> 1.7) orm_adapter (0.5.0) - ox (2.11.0) + ox (2.12.1) paperclip (6.0.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -428,7 +409,7 @@ GEM av (~> 0.9.0) paperclip (>= 2.5.2) parallel (1.19.1) - parallel_tests (2.30.0) + parallel_tests (2.30.1) parallel parser (2.7.0.2) ast (~> 2.4.0) @@ -436,7 +417,7 @@ GEM pastel (0.7.3) equatable (~> 0.6) tty-color (~> 0.5) - pg (1.2.1) + pg (1.2.2) pghero (2.4.1) activerecord (>= 5) pkg-config (1.4.0) @@ -508,7 +489,7 @@ GEM thor (>= 0.19.0, < 2.0) rainbow (3.0.0) rake (13.0.1) - rdf (3.1.0) + rdf (3.1.1) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) rdf-normalize (0.4.0) @@ -565,10 +546,10 @@ GEM rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) rspec-support (3.9.0) - rubocop (0.78.0) + rubocop (0.79.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) @@ -578,7 +559,6 @@ GEM ruby-progressbar (1.10.1) ruby-saml (1.9.0) nokogiri (>= 1.5.10) - ruby-statistics (2.1.1) rufus-scheduler (3.5.2) fugit (~> 1.1, >= 1.1.5) safe_yaml (1.0.5) @@ -660,11 +640,11 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.6) - unicode-display_width (1.6.0) + unicode-display_width (1.6.1) uniform_notifier (1.13.0) warden (1.2.8) rack (>= 2.0.6) - webmock (3.7.6) + webmock (3.8.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -710,7 +690,6 @@ DEPENDENCIES climate_control (~> 0.2) concurrent-ruby connection_pool - derailed_benchmarks devise (~> 4.7) devise-two-factor (~> 3.1) devise_pam_authenticatable2 (~> 9.2) @@ -738,7 +717,7 @@ DEPENDENCIES i18n-tasks (~> 0.9) idn-ruby iso-639 - json-ld! + json-ld json-ld-preloaded (~> 3.0) kaminari (~> 1.1) letter_opener (~> 1.7) @@ -758,7 +737,7 @@ DEPENDENCIES omniauth (~> 1.9) omniauth-cas (~> 1.1) omniauth-saml (~> 1.10) - ox (~> 2.11) + ox (~> 2.12) paperclip (~> 6.0) paperclip-av-transcoder (~> 0.6) parallel (~> 1.19) @@ -788,7 +767,7 @@ DEPENDENCIES rqrcode (~> 1.1) rspec-rails (~> 3.9) rspec-sidekiq (~> 3.0) - rubocop (~> 0.78) + rubocop (~> 0.79) rubocop-rails (~> 2.4) ruby-progressbar (~> 1.10) sanitize (~> 5.1) @@ -811,6 +790,6 @@ DEPENDENCIES tty-prompt (~> 0.20) twitter-text (~> 1.14) tzinfo-data (~> 1.2019) - webmock (~> 3.7) + webmock (~> 3.8) webpacker (~> 4.2) webpush |