Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 33 insertions, 30 deletions

diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index ececdab80d5..9aeba236c96 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -1,20 +1,20 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2)
+    activesupport (6.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    airborne (0.2.13)
+    airborne (0.3.4)
       activesupport
       rack
-      rack-test (~> 0.6, >= 0.6.2)
-      rest-client (>= 1.7.3, < 3.0)
-      rspec (~> 3.1)
+      rack-test (>= 1.1.0, < 2.0)
+      rest-client (>= 2.0.2, < 3.0)
+      rspec (~> 3.8)
     byebug (9.1.0)
     capybara (3.29.0)
       addressable
@@ -34,11 +34,12 @@ GEM
       debase-ruby_core_source (>= 0.10.2)
     debase-ruby_core_source (0.10.6)
     diff-lcs (1.3)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     faker (1.9.3)
       i18n (>= 0.7)
     gitlab-qa (4.0.0)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (1.8.2)
@@ -48,14 +49,14 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     method_source (0.9.0)
-    mime-types (3.1)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2020.0425)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     netrc (0.11.0)
-    nokogiri (1.10.5)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parallel (1.17.0)
     parallel_tests (2.29.0)
@@ -67,33 +68,34 @@ GEM
       byebug (~> 9.1)
       pry (~> 0.10)
     public_suffix (4.0.1)
-    rack (2.0.7)
-    rack-test (0.8.3)
+    rack (2.2.2)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (12.3.0)
     regexp_parser (1.6.0)
-    rest-client (2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
+      rspec-support (~> 3.9.0)
     rspec-retry (0.6.1)
       rspec-core (> 3.3)
-    rspec-support (3.7.0)
+    rspec-support (3.9.3)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby-debug-ide (0.7.0)
+    ruby-debug-ide (0.7.2)
       rake (>= 0.8.1)
     rubyzip (1.3.0)
     selenium-webdriver (3.142.6)
@@ -101,11 +103,11 @@ GEM
       rubyzip (>= 1.2.2)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.7)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.3.0)
@@ -114,18 +116,19 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (= 6.0.2)
-  airborne (~> 0.2.13)
+  activesupport (~> 6.0.3)
+  airborne (~> 0.3.4)
   capybara (~> 3.29.0)
   capybara-screenshot (~> 1.0.23)
   debase (~> 0.2.4.1)
   faker (~> 1.6, >= 1.6.6)
   gitlab-qa
   knapsack (~> 1.17)
-  nokogiri (~> 1.10.5)
+  nokogiri (~> 1.10.9)
   parallel_tests (~> 2.29)
   pry-byebug (~> 3.5.1)
   rake (~> 12.3.0)
+  rest-client (~> 2.1.0)
   rspec (~> 3.7)
   rspec-retry (~> 0.6.1)
   rspec_junit_formatter (~> 0.4.1)