Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 26 deletions

diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index ec5d7063182..1d86f3fba08 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -1,16 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    abstract_type (0.0.7)
     activesupport (6.1.4.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     airborne (0.3.4)
@@ -39,7 +35,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    capybara-screenshot (1.0.23)
+    capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
     chemlab (0.9.2)
@@ -53,9 +49,6 @@ GEM
     childprocess (4.1.0)
     coderay (1.1.2)
     colorize (0.8.1)
-    concord (0.1.5)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
     concurrent-ruby (1.1.10)
     confiner (0.3.0)
       gitlab (>= 4.17)
@@ -66,7 +59,6 @@ GEM
     diff-lcs (1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    equalizer (0.0.11)
     excon (0.92.4)
     faker (2.19.0)
       i18n (>= 1.6, < 2)
@@ -162,21 +154,18 @@ GEM
     httpclient (2.8.3)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
     influxdb-client (1.17.0)
     jwt (2.5.0)
     knapsack (4.0.0)
       rake
-    launchy (2.4.3)
-      addressable (~> 2.3)
+    launchy (2.5.0)
+      addressable (~> 2.7)
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
     macaddr (1.7.2)
       systemu (~> 2.6.5)
     memoist (0.16.2)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.9.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
@@ -204,7 +193,6 @@ GEM
       coderay
       parser
       unparser
-    procto (0.0.3)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -244,7 +232,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-parameterized (0.4.2)
+    rspec-parameterized (0.5.2)
       binding_ninja (>= 0.2.3)
       parser
       proc_to_ast
@@ -276,7 +264,6 @@ GEM
     table_print (1.5.7)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thread_safe (0.3.6)
     timecop (0.9.5)
     trailblazer-option (0.1.2)
     tzinfo (2.0.5)
@@ -286,14 +273,9 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (2.3.0)
-    unparser (0.4.7)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      concord (~> 0.1.5)
+    unparser (0.6.5)
       diff-lcs (~> 1.3)
-      equalizer (~> 0.0.9)
-      parser (>= 2.6.5)
-      procto (~> 0.0.2)
+      parser (>= 3.1.0)
     uuid (2.3.9)
       macaddr (~> 1.0)
     warning (1.3.0)
@@ -317,7 +299,7 @@ DEPENDENCIES
   airborne (~> 0.3.4)
   allure-rspec (~> 2.16.0)
   capybara (~> 3.35.0)
-  capybara-screenshot (~> 1.0.23)
+  capybara-screenshot (~> 1.0.26)
   chemlab (~> 0.9)
   chemlab-library-www-gitlab-com (~> 0.1)
   confiner (~> 0.3)
@@ -339,7 +321,7 @@ DEPENDENCIES
   rest-client (~> 2.1.0)
   rotp (~> 3.1.0)
   rspec (~> 3.10)
-  rspec-parameterized (~> 0.4.2)
+  rspec-parameterized (~> 0.5.2)
   rspec-retry (~> 0.6.1)
   rspec_junit_formatter (~> 0.4.1)
   ruby-debug-ide (~> 0.7.3)