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

2 files changed, 2 insertions, 1 deletions

diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb
index 206f2744281..289e18be0d7 100644
--- a/spec/config/mail_room_spec.rb
+++ b/spec/config/mail_room_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe 'mail_room.yml' do
     cmd = "puts ERB.new(File.read(#{absolute_path(mailroom_config_path).inspect})).result"
 
     output, status = Gitlab::Popen.popen(%W(ruby -rerb -e #{cmd}), absolute_path('config'), vars)
-    raise "Error interpreting #{mailroom_config_path}: #{output}" unless status.zero?
+    raise "Error interpreting #{mailroom_config_path}: #{output}" unless status == 0
 
     YAML.load(output)
   end
diff --git a/spec/config/object_store_settings_spec.rb b/spec/config/object_store_settings_spec.rb
index 4a800261625..36938c74afa 100644
--- a/spec/config/object_store_settings_spec.rb
+++ b/spec/config/object_store_settings_spec.rb
@@ -18,6 +18,7 @@ RSpec.describe ObjectStoreSettings do
           'region' => 'us-east-1'
         }
       end
+
       let(:config) do
         {
           'lfs' => { 'enabled' => true },