Merge branch 'pin-multi-xml-gem' into '16-6-stable-ee'

Pin multi-xml gem and cherry-pick GDK fixes into 16.6

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157205



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Jenny Kim <yjeankim@gitlab.com>
Approved-by: Thong Kuah <tkuah@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>
Co-authored-by: Mark Lapierre <mlapierre@gitlab.com>
Co-authored-by: Rémy Coutable <remy@rymai.me>

qa/Gemfile

@@ -44,6 +44,7 @@ gem 'nokogiri', '~> 1.15', '>= 1.15.4'
 gem 'deprecation_toolkit', '~> 2.0.3', require: false
 gem 'factory_bot', '~> 6.3.0'
+gem 'multi_xml', '0.6.0'
 group :development do
   gem 'pry-byebug', '~> 3.10.1', platform: :mri

qa/Gemfile.lock

@@ -41,7 +41,6 @@ GEM
       uuid (>= 2.3, < 3)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
@@ -214,8 +213,7 @@ GEM
     mini_portile2 (2.8.7)
     minitest (5.23.1)
     multi_json (1.15.0)
-    multi_xml (0.7.1)
-      bigdecimal (~> 3.1)
+    multi_xml (0.6.0)
     netrc (0.11.0)
     nokogiri (1.15.6)
       mini_portile2 (~> 2.8.2)
@@ -358,6 +356,7 @@ DEPENDENCIES
   gitlab_quality-test_tooling (~> 0.9.3)
   influxdb-client (~> 2.9)
   knapsack (~> 4.0)
+  multi_xml (= 0.6.0)
   nokogiri (~> 1.15, >= 1.15.4)
   octokit (~> 7.2.0)
   parallel (~> 1.23)

qa/gdk/Dockerfile.gdk

-ARG GDK_SHA=e8a2f3c30d3031c5574957efbaa917bacdeb3f1a
+ARG GDK_SHA=93d5a88e0695d4a4e0ea31f3e95e3d9fec80f2f1
 # Use tag prefix when running on 'stable' branch to make sure 'protected' image is used which is not deleted by registry cleanup
 ARG GDK_BASE_TAG_PREFIX