Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42

7 files changed, 48 insertions, 34 deletions

diff --git a/vendor/assets/javascripts/vue-virtual-scroller/src/components/RecycleScroller.vue b/vendor/assets/javascripts/vue-virtual-scroller/src/components/RecycleScroller.vue
index f6838ddbb92..e319b199cb0 100644
--- a/vendor/assets/javascripts/vue-virtual-scroller/src/components/RecycleScroller.vue
+++ b/vendor/assets/javascripts/vue-virtual-scroller/src/components/RecycleScroller.vue
@@ -146,7 +146,7 @@ export default {
         const items = this.items
         const field = this.sizeField
         const minItemSize = this.minItemSize
-        let computedMinSize = 10000
+        let computedMinSize = this.buffer
         let accumulator = 0
         let current
         for (let i = 0, l = items.length; i < l; i++) {
diff --git a/vendor/gems/mail-smtp_pool/.gitlab-ci.yml b/vendor/gems/mail-smtp_pool/.gitlab-ci.yml
index 260bc1aaa1f..30bdb77a81c 100644
--- a/vendor/gems/mail-smtp_pool/.gitlab-ci.yml
+++ b/vendor/gems/mail-smtp_pool/.gitlab-ci.yml
@@ -3,8 +3,3 @@ include:
     inputs:
       gem_name: "mail-smtp_pool"
       gem_path_prefix: "vendor/gems/"
-
-rspec:
-  parallel:
-    matrix:
-      - RUBY_VERSION: ["3.0"] # 3.1 & 3.2 aren't supported yet
diff --git a/vendor/gems/mail-smtp_pool/mail-smtp_pool.gemspec b/vendor/gems/mail-smtp_pool/mail-smtp_pool.gemspec
index 3d9036f19b1..85ff20f4485 100644
--- a/vendor/gems/mail-smtp_pool/mail-smtp_pool.gemspec
+++ b/vendor/gems/mail-smtp_pool/mail-smtp_pool.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   # Please maintain alphabetical order for dependencies
   spec.add_runtime_dependency 'connection_pool', '~> 2.0'
-  spec.add_runtime_dependency 'mail', '~> 2.7'
+  spec.add_runtime_dependency 'mail', '~> 2.8'
 
   # Please maintain alphabetical order for dev dependencies
   spec.add_development_dependency 'rspec', '~> 3.10.0'
diff --git a/vendor/gems/mail-smtp_pool/spec/lib/mail/smtp_pool/connection_spec.rb b/vendor/gems/mail-smtp_pool/spec/lib/mail/smtp_pool/connection_spec.rb
index 78426296406..70526a0d696 100644
--- a/vendor/gems/mail-smtp_pool/spec/lib/mail/smtp_pool/connection_spec.rb
+++ b/vendor/gems/mail-smtp_pool/spec/lib/mail/smtp_pool/connection_spec.rb
@@ -14,7 +14,7 @@ describe Mail::SMTPPool::Connection do
   end
 
   after do
-    MockSMTP.clear_deliveries
+    MockSMTP.reset
   end
 
   describe '#deliver!' do
@@ -58,7 +58,7 @@ describe Mail::SMTPPool::Connection do
 
       context 'with an SMTP error' do
         before do
-          expect(mock_smtp).to receive(:rset).once.and_raise(Net::SMTPServerBusy)
+          expect(mock_smtp).to receive(:rset).once.and_raise(Net::SMTPServerBusy, nil)
         end
 
         it 'creates a new SMTP connection' do
diff --git a/vendor/gems/mail-smtp_pool/spec/lib/mail/smtp_pool_spec.rb b/vendor/gems/mail-smtp_pool/spec/lib/mail/smtp_pool_spec.rb
index bbe5ef8b068..7c47116d0a6 100644
--- a/vendor/gems/mail-smtp_pool/spec/lib/mail/smtp_pool_spec.rb
+++ b/vendor/gems/mail-smtp_pool/spec/lib/mail/smtp_pool_spec.rb
@@ -46,7 +46,7 @@ describe Mail::SMTPPool do
     end
 
     after do
-      MockSMTP.clear_deliveries
+      MockSMTP.reset
     end
 
     it 'delivers mail using a connection from the pool' do
diff --git a/vendor/gems/mail-smtp_pool/spec/spec_helper.rb b/vendor/gems/mail-smtp_pool/spec/spec_helper.rb
index 4d339850381..849765e7881 100644
--- a/vendor/gems/mail-smtp_pool/spec/spec_helper.rb
+++ b/vendor/gems/mail-smtp_pool/spec/spec_helper.rb
@@ -2,21 +2,46 @@
 
 require 'mail/smtp_pool'
 
+# Based on https://github.com/mikel/mail/blob/2.8.1/spec/spec_helper.rb#L73-L155
+class Net::SMTP
+  class << self
+    alias unstubbed_new new
+  end
+
+  def self.new(*args)
+    MockSMTP.new
+  end
+end
+
 # Original mockup from ActionMailer
-# Based on https://github.com/mikel/mail/blob/22a7afc23f253319965bf9228a0a430eec94e06d/spec/spec_helper.rb#L74-L138
 class MockSMTP
+  attr_accessor :open_timeout, :read_timeout
+
+  def self.reset
+    test = Net::SMTP.unstubbed_new('example.com')
+    @@tls = test.tls?
+    @@starttls = test.starttls?
+
+    @@deliveries = []
+    @started = false
+  end
+
+  reset
+
   def self.deliveries
     @@deliveries
   end
 
-  def self.security
-    @@security
+  def self.tls
+    @@tls
+  end
+
+  def self.starttls
+    @@starttls
   end
 
   def initialize
-    @@deliveries = []
-    @@security = nil
-    @started = false
+    self.class.reset
   end
 
   def sendmail(mail, from, to)
@@ -50,35 +75,29 @@ class MockSMTP
     return true
   end
 
-  def self.clear_deliveries
-    @@deliveries = []
-  end
-
-  def self.clear_security
-    @@security = nil
-  end
-
   def enable_tls(context)
-    raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @@security && @@security != :enable_tls
-    @@security = :enable_tls
+    raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @@starttls == :always
+    @@tls = true
     context
   end
 
+  def disable_tls
+    @@tls = false
+  end
+
   def enable_starttls(context = nil)
-    raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @@security == :enable_tls
-    @@security = :enable_starttls
+    raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @@tls
+    @@starttls = :always
     context
   end
 
   def enable_starttls_auto(context)
-    raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @@security == :enable_tls
-    @@security = :enable_starttls_auto
+    raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @@tls
+    @@starttls = :auto
     context
   end
-end
 
-class Net::SMTP
-  def self.new(*args)
-    MockSMTP.new
+  def disable_starttls
+    @@starttls = false
   end
 end
diff --git a/vendor/project_templates/typo3_distribution.tar.gz b/vendor/project_templates/typo3_distribution.tar.gz
index 1de92d781af..b25f949011f 100644
--- a/vendor/project_templates/typo3_distribution.tar.gz
+++ b/vendor/project_templates/typo3_distribution.tar.gz