Add latest changes from gitlab-org/gitlab@master

1 files changed, 28 insertions, 91 deletions

diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index c6baa49a4c3..c2b876e3b04 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.0.3.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     airborne (0.3.4)
@@ -19,8 +15,6 @@ GEM
       rack-test (>= 1.1.0, < 2.0)
       rest-client (>= 2.0.2, < 3.0)
       rspec (~> 3.8)
-    ast (2.4.1)
-    binding_ninja (0.2.3)
     byebug (9.1.0)
     capybara (3.29.0)
       addressable
@@ -30,93 +24,55 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (~> 1.5)
       xpath (~> 3.2)
-    capybara-screenshot (1.0.24)
+    capybara-screenshot (1.0.23)
       capybara (>= 1.0, < 4)
       launchy
     childprocess (3.0.0)
-    coderay (1.1.3)
-    concord (0.1.5)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
+    coderay (1.1.2)
     concurrent-ruby (1.1.6)
     debase (0.2.4.1)
       debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.9)
-    diff-lcs (1.4.4)
+    debase-ruby_core_source (0.10.6)
+    diff-lcs (1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    equalizer (0.0.11)
-    faker (1.9.6)
+    faker (1.9.3)
       i18n (>= 0.7)
-    ffi (1.13.1)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    gitlab (4.11.0)
-      httparty (~> 0.14, >= 0.14.0)
-      terminal-table (~> 1.5, >= 1.5.1)
-    gitlab-qa (5.15.0)
-      activesupport (~> 6.0.2)
-      gitlab (~> 4.11.0)
-      http (= 4.3.0)
-      nokogiri (~> 1.10)
-      table_print (= 1.5.6)
-    http (4.3.0)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
+    gitlab-qa (4.0.0)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.3.0)
-    http-parser (1.2.1)
-      ffi-compiler (>= 1.0, < 2.0)
-    httparty (0.18.1)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
-    i18n (1.8.3)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
-    knapsack (1.18.0)
+    knapsack (1.17.1)
       rake
-    launchy (2.5.0)
-      addressable (~> 2.7)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
-    method_source (1.0.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    method_source (0.9.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mime-types-data (3.2020.0425)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.1)
-    multi_xml (0.6.0)
     netrc (0.11.0)
-    nokogiri (1.10.10)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    parallel (1.19.2)
-    parallel_tests (2.32.0)
+    parallel (1.17.0)
+    parallel_tests (2.29.0)
       parallel
-    parser (2.7.1.4)
-      ast (~> 2.4.1)
-    proc_to_ast (0.1.0)
-      coderay
-      parser
-      unparser
-    procto (0.0.3)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     pry-byebug (3.5.1)
       byebug (~> 9.1)
       pry (~> 0.10)
-    public_suffix (4.0.5)
-    rack (2.2.3)
+    public_suffix (4.0.1)
+    rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rake (12.3.3)
-    regexp_parser (1.7.1)
+    rake (12.3.0)
+    regexp_parser (1.6.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -129,32 +85,23 @@ GEM
       rspec-mocks (~> 3.9.0)
     rspec-core (3.9.2)
       rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-parameterized (0.4.2)
-      binding_ninja (>= 0.2.3)
-      parser
-      proc_to_ast
-      rspec (>= 2.13, < 4)
-      unparser
-    rspec-retry (0.6.2)
+    rspec-retry (0.6.1)
       rspec-core (> 3.3)
     rspec-support (3.9.3)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby-debug-ide (0.7.2)
       rake (>= 0.8.1)
-    rubyzip (2.3.0)
-    selenium-webdriver (3.142.7)
+    rubyzip (1.3.0)
+    selenium-webdriver (3.142.6)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    table_print (1.5.6)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
     timecop (0.9.1)
     tzinfo (1.2.7)
@@ -162,18 +109,9 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
-    unparser (0.4.7)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      concord (~> 0.1.5)
-      diff-lcs (~> 1.3)
-      equalizer (~> 0.0.9)
-      parser (>= 2.6.5)
-      procto (~> 0.0.2)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.3.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -194,7 +132,6 @@ DEPENDENCIES
   rest-client (~> 2.1.0)
   rotp (~> 3.1.0)
   rspec (~> 3.7)
-  rspec-parameterized (~> 0.4.2)
   rspec-retry (~> 0.6.1)
   rspec_junit_formatter (~> 0.4.1)
   ruby-debug-ide (~> 0.7.0)