From 4cb75361aab84dd6a8f6fd230212cebf7ebcb66f Mon Sep 17 00:00:00 2001
From: Jordan Hall <Jordan@libertyware.co.uk>
Date: Thu, 19 Dec 2019 22:23:18 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20support=20config=20mail=20domain?=
 =?UTF-8?q?=20setting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes #11414

- This enabled support for PR email-config-domain in Ghost repository.

- members settings changes from blog domain to config mail setting
---
 app/components/gh-members-lab-setting.js            | 2 ++
 app/templates/components/gh-members-lab-setting.hbs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/components/gh-members-lab-setting.js b/app/components/gh-members-lab-setting.js
index a768a5a5c8..5a3f7c20ee 100644
--- a/app/components/gh-members-lab-setting.js
+++ b/app/components/gh-members-lab-setting.js
@@ -11,6 +11,8 @@ export default Component.extend({
     config: service(),
     mediaQueries: service(),
 
+    mailDomain: computed.or('config.mail.domain', 'blogDomain'),
+
     mailgunRegion: computed('settings.bulkEmailSettings.baseUrl', function () {
         if (!this.settings.get('bulkEmailSettings.baseUrl')) {
             return US;
diff --git a/app/templates/components/gh-members-lab-setting.hbs b/app/templates/components/gh-members-lab-setting.hbs
index 318f29a2b6..13b58fe4bf 100644
--- a/app/templates/components/gh-members-lab-setting.hbs
+++ b/app/templates/components/gh-members-lab-setting.hbs
@@ -181,7 +181,7 @@
                     input=(action "setSubscriptionSettings" "fromAddress")
                     class="w20"
                 }}
-                <span class="gh-input-append"> @{{blogDomain}}</span>
+                <span class="gh-input-append"> @{{mailDomain}}</span>
             </div>
             <div class="f8 fw4 midgrey mt1">Your members will receive system emails from this address</div>
             {{/gh-form-group}}