Merge branch 'master' into glitch-soc/merge-upstream

2019-03-30 12:36:24 +01:00
parent b6fa500806 51625d3423
commit 4444d8f9b3
29 changed files with 454 additions and 182 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -127,7 +127,7 @@ GEM
      sshkit (~> 1.3)
    capistrano-yarn (2.0.2)
      capistrano (~> 3.0)
-    capybara (3.15.0)
+    capybara (3.16.0)
      addressable
      mini_mime (>= 0.1.3)
      nokogiri (~> 1.8)
@@ -672,7 +672,7 @@ DEPENDENCIES
  capistrano-rails (~> 1.4)
  capistrano-rbenv (~> 2.1)
  capistrano-yarn (~> 2.0)
-  capybara (~> 3.15)
+  capybara (~> 3.16)
  charlock_holmes (~> 0.7.6)
  chewy (~> 5.0)
  cld3 (~> 3.2.3)