[DRE-commits] [gitlab] 03/03: switch to sendmail by default

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit 4841aff2d45660aa0950cee8e6ca11016a98b532
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Feb 16 12:58:43 2016 +0530

    switch to sendmail by default
---
 debian/changelog             | 3 ++-
 debian/conf/smtp_settings.rb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7bc8665..fb73b66 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 <praveen at debian.org>  Tue, 16 Feb 2016 12:54:54 +0530
+ -- Pirate Praveen <praveen at debian.org>  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 13b2931..0f7201d 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 = {}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git