Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 7 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index e3bf7f6cb1b..99bed5421de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -254,7 +254,8 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindata (2.4.11)
-    binding_ninja (0.2.3)
+    binding_of_caller (1.0.0)
+      debug_inspector (>= 0.0.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
     browser (5.3.1)
@@ -344,6 +345,7 @@ GEM
       gitlab (~> 4.2, >= 4.2.0)
     database_cleaner (1.7.0)
     dead_end (3.1.1)
+    debug_inspector (1.1.0)
     deckar01-task_list (2.3.2)
       html-pipeline
     declarative (0.0.20)
@@ -1274,12 +1276,17 @@ GEM
     rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-parameterized (0.5.0)
-      binding_ninja (>= 0.2.3)
+    rspec-parameterized (1.0.0)
+      rspec-parameterized-core (< 2)
+      rspec-parameterized-table_syntax (< 2)
+    rspec-parameterized-core (1.0.0)
       parser
       proc_to_ast
       rspec (>= 2.13, < 4)
       unparser
+    rspec-parameterized-table_syntax (1.0.0)
+      binding_of_caller
+      rspec-parameterized-core (< 2)
     rspec-rails (6.0.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
@@ -1552,9 +1559,9 @@ GEM
     uniform_notifier (1.16.0)
     unleash (3.2.2)
       murmurhash3 (~> 0.1.6)
-    unparser (0.6.0)
+    unparser (0.6.7)
       diff-lcs (~> 1.3)
-      parser (>= 3.0.0)
+      parser (>= 3.2.0)
     uri_template (0.7.0)
     valid_email (0.1.3)
       activemodel
@@ -1621,7 +1628,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  CFPropertyList
+  CFPropertyList (~> 3.0.0)
   RedCloth (~> 4.3.2)
   acme-client (~> 2.0)
   activerecord-explain-analyze (~> 0.1)
@@ -1857,7 +1864,7 @@ DEPENDENCIES
   rouge (~> 3.30.0)
   rqrcode-rails3 (~> 0.1.7)
   rspec-benchmark (~> 0.6.0)
-  rspec-parameterized
+  rspec-parameterized (~> 1.0)
   rspec-rails (~> 6.0.1)
   rspec-retry (~> 0.6.1)
   rspec_junit_formatter