From: Damien Lespiau <damien.lespiau@intel.com>
Date: Sat, 26 Sep 2015 09:50:49 +0000 (+0100)
Subject: settings: Move DEFAULT_FROM_EMAIL to the core settings section
X-Git-Tag: v1.1.0~196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=347f54c5e349f62fafdc42068db0238a59be5d84;p=thirdparty%2Fpatchwork.git

settings: Move DEFAULT_FROM_EMAIL to the core settings section

DEFAULT_FROM_EMAIL is actually a django setting, not a patchwork one.

v2: Capitalize the 'E' of 'Email' (Stephen Finucane)

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Acked-by: Stephen Finucane <stephen.finucane@intel.com>
---

diff --git a/patchwork/settings/base.py b/patchwork/settings/base.py
index d00245d5..89d30c95 100644
--- a/patchwork/settings/base.py
+++ b/patchwork/settings/base.py
@@ -64,6 +64,9 @@ TEMPLATE_DIRS = (
     os.path.join(ROOT_DIR, 'templates'),
 )
 
+# Email
+
+DEFAULT_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>'
 
 #
 # Auth settings
@@ -99,7 +102,6 @@ STATICFILES_DIRS = [
 #
 
 DEFAULT_PATCHES_PER_PAGE = 100
-DEFAULT_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>'
 
 CONFIRMATION_VALIDITY_DAYS = 7