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

3 files changed, 16 insertions, 8 deletions

diff --git a/spec/config/application_spec.rb b/spec/config/application_spec.rb
index 994cea4c84f..e6b8da690a2 100644
--- a/spec/config/application_spec.rb
+++ b/spec/config/application_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Gitlab::Application do # rubocop:disable RSpec/FilePath
   using RSpec::Parameterized::TableSyntax
 
-  FILTERED_PARAM = ActiveSupport::ParameterFilter::FILTERED
+  filtered_param = ActiveSupport::ParameterFilter::FILTERED
 
   context 'when parameters are logged' do
     describe 'rails does not leak confidential parameters' do
@@ -19,11 +19,11 @@ describe Gitlab::Application do # rubocop:disable RSpec/FilePath
       where(:input_url, :output_query) do
         '/'                                      | {}
         '/?safe=1'                               | { 'safe' => '1' }
-        '/?private_token=secret'                 | { 'private_token' => FILTERED_PARAM }
-        '/?mixed=1&private_token=secret'         | { 'mixed' => '1', 'private_token' => FILTERED_PARAM }
-        '/?note=secret&noteable=1&prefix_note=2' | { 'note' => FILTERED_PARAM, 'noteable' => '1', 'prefix_note' => '2' }
-        '/?note[note]=secret&target_type=1'      | { 'note' => FILTERED_PARAM, 'target_type' => '1' }
-        '/?safe[note]=secret&target_type=1'      | { 'safe' => { 'note' => FILTERED_PARAM }, 'target_type' => '1' }
+        '/?private_token=secret'                 | { 'private_token' => filtered_param }
+        '/?mixed=1&private_token=secret'         | { 'mixed' => '1', 'private_token' => filtered_param }
+        '/?note=secret&noteable=1&prefix_note=2' | { 'note' => filtered_param, 'noteable' => '1', 'prefix_note' => '2' }
+        '/?note[note]=secret&target_type=1'      | { 'note' => filtered_param, 'target_type' => '1' }
+        '/?safe[note]=secret&target_type=1'      | { 'safe' => { 'note' => filtered_param }, 'target_type' => '1' }
       end
 
       with_them do
diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb
index fcef4e7a9b0..bd8269fb2c5 100644
--- a/spec/config/mail_room_spec.rb
+++ b/spec/config/mail_room_spec.rb
@@ -53,7 +53,8 @@ describe 'mail_room.yml' do
         email: 'gitlab-incoming@gmail.com',
         password: '[REDACTED]',
         name: 'inbox',
-        idle_timeout: 60
+        idle_timeout: 60,
+        expunge_deleted: true
       }
       expected_options = {
         redis_url: gitlab_redis_queues.url,
diff --git a/spec/config/smime_signature_settings_spec.rb b/spec/config/smime_signature_settings_spec.rb
index 4f076a92b16..7e7b42b129a 100644
--- a/spec/config/smime_signature_settings_spec.rb
+++ b/spec/config/smime_signature_settings_spec.rb
@@ -6,6 +6,7 @@ describe SmimeSignatureSettings do
   describe '.parse' do
     let(:default_smime_key) { Rails.root.join('.gitlab_smime_key') }
     let(:default_smime_cert) { Rails.root.join('.gitlab_smime_cert') }
+    let(:default_smime_ca_certs) { nil }
 
     it 'sets correct default values to disabled' do
       parsed_settings = described_class.parse(nil)
@@ -13,6 +14,7 @@ describe SmimeSignatureSettings do
       expect(parsed_settings['enabled']).to be(false)
       expect(parsed_settings['key_file']).to eq(default_smime_key)
       expect(parsed_settings['cert_file']).to eq(default_smime_cert)
+      expect(parsed_settings['ca_certs_file']).to eq(default_smime_ca_certs)
     end
 
     context 'when providing custom values' do
@@ -24,6 +26,7 @@ describe SmimeSignatureSettings do
         expect(parsed_settings['enabled']).to be(false)
         expect(parsed_settings['key_file']).to eq(default_smime_key)
         expect(parsed_settings['cert_file']).to eq(default_smime_cert)
+        expect(parsed_settings['ca_certs_file']).to eq(default_smime_ca_certs)
       end
 
       it 'enables smime with default key and cert' do
@@ -36,15 +39,18 @@ describe SmimeSignatureSettings do
         expect(parsed_settings['enabled']).to be(true)
         expect(parsed_settings['key_file']).to eq(default_smime_key)
         expect(parsed_settings['cert_file']).to eq(default_smime_cert)
+        expect(parsed_settings['ca_certs_file']).to eq(default_smime_ca_certs)
       end
 
       it 'enables smime with custom key and cert' do
         custom_key = '/custom/key'
         custom_cert = '/custom/cert'
+        custom_ca_certs = '/custom/ca_certs'
         custom_settings = Settingslogic.new({
           'enabled' => true,
           'key_file' => custom_key,
-          'cert_file' => custom_cert
+          'cert_file' => custom_cert,
+          'ca_certs_file' => custom_ca_certs
         })
 
         parsed_settings = described_class.parse(custom_settings)
@@ -52,6 +58,7 @@ describe SmimeSignatureSettings do
         expect(parsed_settings['enabled']).to be(true)
         expect(parsed_settings['key_file']).to eq(custom_key)
         expect(parsed_settings['cert_file']).to eq(custom_cert)
+        expect(parsed_settings['ca_certs_file']).to eq(custom_ca_certs)
       end
     end
   end