Merge branch 'master' into cleanupRankingEmail

mitre-cyber-academy · Mar 1, 2019 · 021d07b · 021d07b
2 parents f7eee93 + e33d4ff
commit 021d07b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -132,12 +132,12 @@ GEM
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
-    haml-rails (1.0.0)
-      actionpack (>= 4.0.1)
-      activesupport (>= 4.0.1)
+    haml-rails (2.0.0)
+      actionpack (>= 5.1)
+      activesupport (>= 5.1)
       haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
-      railties (>= 4.0.1)
+      railties (>= 5.1)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
@@ -297,7 +297,7 @@ GEM
       unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
-    ruby_parser (3.11.0)
+    ruby_parser (3.12.0)
       sexp_processor (~> 4.9)
     rubyzip (1.2.2)
     sass (3.7.2)
@@ -336,7 +336,7 @@ GEM
       ref
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.9)
     tins (1.20.2)
     ttfunk (1.5.1)
     tzinfo (1.2.5)