Merge branch 'master' into CVE-2019-15587

sharesight · Oct 24, 2019 · 67159bc · 67159bc
2 parents 2f7582e + 548214e
commit 67159bc
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -232,7 +232,8 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    haml (4.0.7)
+    haml (5.1.2)
+      temple (>= 0.8.0)
       tilt
     hike (1.2.3)
     hooks (0.4.1)
@@ -394,6 +395,7 @@ GEM
       tilt (~> 1.1)
     string-urlize (1.0.2)
       i18n (~> 0.5)
+    temple (0.8.2)
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (1.4.1)
@@ -442,4 +444,4 @@ DEPENDENCIES
   uglifier
 
 BUNDLED WITH
-   1.16.6
+   1.17.3