Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 0 deletions

diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 9bac86bad08..84ac3e0d69d 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -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.13.10)
+      allure-ruby-commons (= 2.13.10)
+      rspec-core (>= 3.8, < 4)
+    allure-ruby-commons (2.13.10)
+      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)
@@ -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)
@@ -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,6 +166,7 @@ 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)
@@ -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)
@@ -182,6 +197,7 @@ PLATFORMS
 DEPENDENCIES
   activesupport (~> 6.0.3.3)
   airborne (~> 0.3.4)
+  allure-rspec (~> 2.13.10)
   capybara (~> 3.29.0)
   capybara-screenshot (~> 1.0.23)
   chemlab (~> 0.5)