From patchwork Sat Sep 26 14:06:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Lespiau X-Patchwork-Id: 523092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BF2F3140775 for ; Sun, 27 Sep 2015 00:06:47 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id AC3B91A05BE for ; Sun, 27 Sep 2015 00:06:47 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lists.ozlabs.org (Postfix) with ESMTP id 664601A0437 for ; Sun, 27 Sep 2015 00:06:34 +1000 (AEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 26 Sep 2015 07:06:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,592,1437462000"; d="scan'208";a="813739465" Received: from kevinjry-mobl1.ger.corp.intel.com (HELO strange.ger.corp.intel.com) ([10.252.2.140]) by orsmga002.jf.intel.com with ESMTP; 26 Sep 2015 07:06:30 -0700 From: Damien Lespiau To: patchwork@lists.ozlabs.org Subject: [PATCH 1/3] settings: Move DEFAULT_FROM_EMAIL to the core settings section Date: Sat, 26 Sep 2015 15:06:26 +0100 Message-Id: <1443276388-10502-2-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1443276388-10502-1-git-send-email-damien.lespiau@intel.com> References: <1443276388-10502-1-git-send-email-damien.lespiau@intel.com> X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" DEFAULT_FROM_EMAIL is actually a django setting, not a patchwork one. Signed-off-by: Damien Lespiau Acked-by: Stephen Finucane --- patchwork/settings/base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/patchwork/settings/base.py b/patchwork/settings/base.py index d00245d..d47cd6d 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 ' # # Auth settings @@ -99,7 +102,6 @@ STATICFILES_DIRS = [ # DEFAULT_PATCHES_PER_PAGE = 100 -DEFAULT_FROM_EMAIL = 'Patchwork ' CONFIRMATION_VALIDITY_DAYS = 7