Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 12 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 9f0b87d67a4..8b8cd1691e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -728,7 +728,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.11.0)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
@@ -989,7 +989,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
@@ -1023,19 +1023,12 @@ GEM
       actionpack (>= 5, < 7)
       redis-rack (>= 2.1.0, < 3)
       redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.2.0)
-      activesupport (>= 3, < 7)
-      redis-store (>= 1.3, < 2)
     redis-namespace (1.8.1)
       redis (>= 3.0.4)
-    redis-rack (2.1.2)
+    redis-rack (2.1.3)
       rack (>= 2.0.8, < 3)
       redis-store (>= 1.2, < 2)
-    redis-rails (5.0.2)
-      redis-actionpack (>= 5.0, < 6)
-      redis-activesupport (>= 5.0, < 6)
-      redis-store (>= 1.2, < 2)
-    redis-store (1.8.1)
+    redis-store (1.9.0)
       redis (>= 4, < 5)
     regexp_parser (2.1.1)
     regexp_property_values (1.0.0)
@@ -1596,8 +1589,8 @@ DEPENDENCIES
   re2 (~> 1.2.0)
   recaptcha (~> 4.11)
   redis (~> 4.1.4)
+  redis-actionpack (~> 5.2.0)
   redis-namespace (~> 1.8.1)
-  redis-rails (~> 5.0.2)
   request_store (~> 1.5)
   responders (~> 3.0)
   retriable (~> 3.1.2)