diff options
author | ThibG <thib@sitedethib.com> | 2019-06-20 19:19:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-20 19:19:30 +0200 |
commit | f717d7a92da83703d270af50310fa3483b503417 (patch) | |
tree | e512bfc11eae35fa601522672f47261a0972c484 /Gemfile.lock | |
parent | f4b008906dcfc3333ec533884aa10b65f8ae41a2 (diff) | |
parent | 3771a993b7e19bc0e756e7f727f10ddd14c10c93 (diff) |
Merge pull request #1134 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 73f0d63f5..057b929bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,8 +76,8 @@ GEM av (0.9.0) cocaine (~> 0.5.3) aws-eventstream (1.0.3) - aws-partitions (1.169.0) - aws-sdk-core (3.54.0) + aws-partitions (1.175.0) + aws-sdk-core (3.55.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) aws-sigv4 (~> 1.1) @@ -85,7 +85,7 @@ GEM aws-sdk-kms (1.21.0) aws-sdk-core (~> 3, >= 3.53.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.41.0) + aws-sdk-s3 (1.42.0) aws-sdk-core (~> 3, >= 3.53.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -129,7 +129,7 @@ GEM sshkit (~> 1.3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.22.0) + capybara (3.24.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -253,7 +253,7 @@ GEM railties (>= 4.0.1) hamster (3.0.0) concurrent-ruby (~> 1.0) - hashdiff (0.3.7) + hashdiff (0.4.0) hashie (3.6.0) heapy (0.1.4) highline (2.0.1) @@ -271,7 +271,7 @@ GEM domain_name (~> 0.5) http-form_data (2.1.1) http_accept_language (2.1.1) - httplog (1.3.0) + httplog (1.3.1) rack (>= 1.0) rainbow (>= 2.0.0) i18n (1.6.0) @@ -322,7 +322,7 @@ GEM letter_opener (~> 1.0) railties (>= 3.2) link_header (0.0.8) - lograge (0.11.1) + lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) railties (>= 4) @@ -384,7 +384,7 @@ GEM addressable (~> 2.5) http (~> 3.0) nokogiri (~> 1.8) - ox (2.10.1) + ox (2.11.0) paperclip (6.0.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -403,7 +403,7 @@ GEM equatable (~> 0.5.0) tty-color (~> 0.4.0) pg (1.1.4) - pghero (2.2.0) + pghero (2.2.1) activerecord pkg-config (1.3.7) premailer (1.11.1) @@ -534,15 +534,15 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.0.0) - rack (>= 2.0) + rubocop-rails (2.0.1) + rack (>= 1.1) rubocop (>= 0.70.0) ruby-progressbar (1.10.1) ruby-saml (1.9.0) nokogiri (>= 1.5.10) rufus-scheduler (3.5.2) fugit (~> 1.1, >= 1.1.5) - safe_yaml (1.0.4) + safe_yaml (1.0.5) sanitize (5.0.0) crass (~> 1.0.2) nokogiri (>= 1.8.0) @@ -624,10 +624,10 @@ GEM uniform_notifier (1.12.1) warden (1.2.8) rack (>= 2.0.6) - webmock (3.5.1) + webmock (3.6.0) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff + hashdiff (>= 0.4.0, < 2.0.0) webpacker (4.0.7) activesupport (>= 4.2) rack-proxy (>= 0.6.1) @@ -650,7 +650,7 @@ DEPENDENCIES active_record_query_trace (~> 1.6) addressable (~> 2.6) annotate (~> 2.7) - aws-sdk-s3 (~> 1.41) + aws-sdk-s3 (~> 1.42) better_errors (~> 2.5) binding_of_caller (~> 0.7) blurhash (~> 0.1) @@ -663,7 +663,7 @@ DEPENDENCIES capistrano-rails (~> 1.4) capistrano-rbenv (~> 2.1) capistrano-yarn (~> 2.0) - capybara (~> 3.22) + capybara (~> 3.24) charlock_holmes (~> 0.7.6) chewy (~> 5.0) cld3 (~> 3.2.4) @@ -714,7 +714,7 @@ DEPENDENCIES omniauth-cas (~> 1.1) omniauth-saml (~> 1.10) ostatus2 (~> 2.0) - ox (~> 2.10) + ox (~> 2.11) paperclip (~> 6.0) paperclip-av-transcoder (~> 0.6) parallel_tests (~> 2.29) @@ -762,7 +762,7 @@ DEPENDENCIES tty-prompt (~> 0.19) twitter-text (~> 1.14) tzinfo-data (~> 1.2019) - webmock (~> 3.5) + webmock (~> 3.6) webpacker (~> 4.0) webpush |