diff options
author | ThibG <thib@sitedethib.com> | 2019-09-19 00:22:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-19 00:22:39 +0200 |
commit | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (patch) | |
tree | 1a99988dd7a46824527e59ee1861aa72ad7412ce /Gemfile.lock | |
parent | ab646fac5f582fe9bef22d8b9a4995fbb4b42d7d (diff) | |
parent | 2ecc7106d7fc222ca84777fc279e9f46f80afd5a (diff) |
Merge pull request #1221 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 30e5fc1ff..092f69119 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -150,7 +150,7 @@ GEM sshkit (~> 1.3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.28.0) + capybara (3.29.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -231,7 +231,7 @@ GEM tzinfo excon (0.62.0) fabrication (2.20.2) - faker (2.2.2) + faker (2.3.0) i18n (~> 1.6.0) faraday (0.15.0) multipart-post (>= 1.2, < 3) @@ -323,7 +323,7 @@ GEM multi_json (~> 1.12) rdf (~> 3.0) jsonapi-renderer (0.2.2) - jwt (2.2.1) + jwt (2.1.0) kaminari (1.1.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.1.1) @@ -381,7 +381,7 @@ GEM net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) net-ssh (5.2.0) - nio4r (2.4.0) + nio4r (2.5.1) nokogiri (1.10.4) mini_portile2 (~> 2.4.0) nokogumbo (2.0.1) @@ -447,7 +447,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.1) - puma (4.1.0) + puma (4.1.1) nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) @@ -640,7 +640,7 @@ GEM unf (~> 0.1.0) tzinfo (1.2.5) thread_safe (~> 0.1) - tzinfo-data (1.2019.2) + tzinfo-data (1.2019.3) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext @@ -649,7 +649,7 @@ GEM uniform_notifier (1.12.1) warden (1.2.8) rack (>= 2.0.6) - webmock (3.7.1) + webmock (3.7.3) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -657,7 +657,7 @@ GEM activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) - webpush (1.0.0) + webpush (0.3.8) hkdf (~> 0.2) jwt (~> 2.0) websocket-driver (0.7.0) @@ -688,7 +688,7 @@ DEPENDENCIES capistrano-rails (~> 1.4) capistrano-rbenv (~> 2.1) capistrano-yarn (~> 2.0) - capybara (~> 3.28) + capybara (~> 3.29) charlock_holmes (~> 0.7.6) chewy (~> 5.0) cld3 (~> 3.2.4) @@ -703,7 +703,7 @@ DEPENDENCIES doorkeeper (~> 5.1) dotenv-rails (~> 2.7) fabrication (~> 2.20) - faker (~> 2.2) + faker (~> 2.3) fast_blank (~> 1.0) fastimage fog-core (<= 2.1.0) |