Merge branch 'dependabot/bundler/mail-2.8.1' into develop

mysociety · Feb 10, 2023 · 44cc939 · 44cc939
2 parents ebf592a + 4ec03ff
commit 44cc939
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -101,7 +101,7 @@ gem 'jquery-ui-rails', '~> 6.0.0'
 gem 'json', '~> 2.6.2'
 gem 'holidays', '~> 8.6.0'
 gem 'iso_country_codes', '~> 0.7.8'
-gem 'mail', '~> 2.8.0'
+gem 'mail', '~> 2.8.1'
 gem 'maxmind-db', '~> 1.0.0'
 gem 'mahoro', '~> 0.5'
 gem 'nokogiri', '~> 1.14.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -293,7 +293,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mahoro (0.5)
-    mail (2.8.0.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -579,7 +579,7 @@ DEPENDENCIES
   listen (>= 3.0.5, < 3.8.1)
   locale (~> 2.1.3)
   mahoro (~> 0.5)
-  mail (~> 2.8.0)
+  mail (~> 2.8.1)
   matrix (~> 0.4.2)
   maxmind-db (~> 1.0.0)
   mime-types (< 3.0.0)

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -118,8 +118,7 @@
 
   config.action_mailer.delivery_method = AlaveteliConfiguration.production_mailer_delivery_method.to_sym
 
-  case AlaveteliConfiguration.production_mailer_delivery_method.to_sym
-  when :smtp
+  if AlaveteliConfiguration.production_mailer_delivery_method.to_sym == :smtp
     config.action_mailer.smtp_settings = {
       :address => AlaveteliConfiguration.smtp_mailer_address,
       :port => AlaveteliConfiguration.smtp_mailer_port,
@@ -129,11 +128,6 @@
       :authentication => AlaveteliConfiguration.smtp_mailer_authentication,
       :enable_starttls_auto => AlaveteliConfiguration.smtp_mailer_enable_starttls_auto
     }
-  when :sendmail
-    config.action_mailer.sendmail_settings = {
-      location: '/usr/sbin/sendmail',
-      arguments: %w[-i]
-    }
   end
 
   exception_notifier_prefix = '[ERROR] '