diff --git a/debian/changelog b/debian/changelog index 7bc866599d..fb73b66814 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ gitlab (8.4.3+dfsg-8) UNRELEASED; urgency=medium * Install tmpfiles.d/gitlab.conf (Closes: #814713) + * Switch to sendmail method by default. - -- Pirate Praveen Tue, 16 Feb 2016 12:54:54 +0530 + -- Pirate Praveen Tue, 16 Feb 2016 12:58:17 +0530 gitlab (8.4.3+dfsg-7) unstable; urgency=medium diff --git a/debian/conf/smtp_settings.rb b/debian/conf/smtp_settings.rb index 13b2931a82..0f7201db34 100644 --- a/debian/conf/smtp_settings.rb +++ b/debian/conf/smtp_settings.rb @@ -8,7 +8,7 @@ # If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests if Rails.env.production? - Rails.application.config.action_mailer.delivery_method = :smtp + Rails.application.config.action_mailer.delivery_method = :sendmail Rails.application.config.action_mailer.default_options = {from: "#{ENV['GITLAB_EMAIL_FROM']}" || "#{Settings.gitlab['email_from']}" || ''} ActionMailer::Base.sendmail_settings = {}