Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 27 insertions, 11 deletions

diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 9bac86bad08..8b6c4ca0d3e 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -2,12 +2,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     abstract_type (0.0.7)
-    activesupport (6.0.3.4)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.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)
@@ -19,6 +19,14 @@ GEM
       rack-test (>= 1.1.0, < 2.0)
       rest-client (>= 2.0.2, < 3.0)
       rspec (~> 3.8)
+    allure-rspec (2.14.1)
+      allure-ruby-commons (= 2.14.1)
+      rspec-core (>= 3.8, < 4)
+    allure-ruby-commons (2.14.1)
+      mime-types (>= 3.3, < 4)
+      oj (>= 3.10, < 4)
+      require_all (>= 2, < 4)
+      uuid (>= 2.3, < 3)
     ast (2.4.1)
     binding_ninja (0.2.3)
     byebug (9.1.0)
@@ -44,7 +52,7 @@ GEM
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
@@ -66,7 +74,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     jwt (2.2.2)
@@ -74,6 +82,8 @@ GEM
       rake
     launchy (2.4.3)
       addressable (~> 2.3)
+    macaddr (1.7.2)
+      systemu (~> 2.6.5)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.9.0)
@@ -82,7 +92,7 @@ GEM
     mime-types-data (3.2020.0425)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
-    minitest (5.14.2)
+    minitest (5.14.4)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
@@ -96,6 +106,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+    oj (3.11.5)
     parallel (1.19.2)
     parallel_tests (2.29.0)
       parallel
@@ -119,6 +130,7 @@ GEM
       rack (>= 1.0, < 3)
     rake (12.3.3)
     regexp_parser (1.6.0)
+    require_all (3.0.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -154,10 +166,11 @@ GEM
     selenium-webdriver (3.142.6)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
+    systemu (2.6.5)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
@@ -169,6 +182,8 @@ GEM
       equalizer (~> 0.0.9)
       parser (>= 2.6.5)
       procto (~> 0.0.2)
+    uuid (2.3.9)
+      macaddr (~> 1.0)
     watir (6.18.0)
       regexp_parser (>= 1.2, < 3)
       selenium-webdriver (>= 3.8)
@@ -180,8 +195,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 6.0.3.3)
+  activesupport (~> 6.1.3.2)
   airborne (~> 0.3.4)
+  allure-rspec (~> 2.14.1)
   capybara (~> 3.29.0)
   capybara-screenshot (~> 1.0.23)
   chemlab (~> 0.5)