Merge branch 'master' into dependabot/bundler/rubocop-0.81.0

digitaltom · Apr 14, 2020 · 45ad32c · 45ad32c
2 parents af2a00c + 497e9bf
commit 45ad32c
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -45,11 +45,11 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    angular-rails-templates (1.0.2)
-      railties (>= 4.2, < 6)
+    angular-rails-templates (1.1.0)
+      railties (>= 4.2, < 7)
       sprockets (>= 3.0, < 5)
       tilt
-    angular_rails_csrf (4.1.0)
+    angular_rails_csrf (4.2.0)
       railties (>= 3, < 7)
     ansi (1.5.0)
     arel (9.0.0)
@@ -99,7 +99,7 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     json (2.3.0)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -192,7 +192,8 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-rails (2.4.1)
+    rubocop-rails (2.5.2)
+      activesupport
       rack (>= 1.1)
       rubocop (>= 0.72.0)
     ruby-progressbar (1.10.1)
@@ -223,9 +224,9 @@ GEM
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     tins (1.21.1)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)