From b826a31799244a30f3d8c6d8b3c57594f7fabe98 Mon Sep 17 00:00:00 2001
From: Austin Burdine <acburdine@gmail.com>
Date: Wed, 20 May 2015 15:55:22 -0600
Subject: [PATCH] remove settings email

closes #5299
- removes settings/general email field from both client and server side
- fixes tests to reflect removal of email
---
 ghost/admin/app/models/setting.js              | 1 -
 ghost/admin/app/templates/settings/general.hbs | 5 -----
 ghost/admin/app/validators/setting.js          | 5 -----
 3 files changed, 11 deletions(-)

diff --git a/ghost/admin/app/models/setting.js b/ghost/admin/app/models/setting.js
index b30abfdbb9..6fef5968d4 100644
--- a/ghost/admin/app/models/setting.js
+++ b/ghost/admin/app/models/setting.js
@@ -7,7 +7,6 @@ var Setting = DS.Model.extend(NProgressSaveMixin, ValidationEngine, {
 
     title: DS.attr('string'),
     description: DS.attr('string'),
-    email: DS.attr('string'),
     logo: DS.attr('string'),
     cover: DS.attr('string'),
     defaultLang: DS.attr('string'),
diff --git a/ghost/admin/app/templates/settings/general.hbs b/ghost/admin/app/templates/settings/general.hbs
index cd5e53db7f..be024bcb2b 100644
--- a/ghost/admin/app/templates/settings/general.hbs
+++ b/ghost/admin/app/templates/settings/general.hbs
@@ -47,11 +47,6 @@
         </div>
 
         <fieldset>
-            <div class="form-group">
-                <label for="email-address">Email Address</label>
-                {{input id="email-address" class="gh-input" name="general[email-address]" type="email" value=model.email autocapitalize="off" autocorrect="off"}}
-                <p>Address to use for admin notifications</p>
-            </div>
 
             <div class="form-group">
                 <label for="postsPerPage">Posts per page</label>
diff --git a/ghost/admin/app/validators/setting.js b/ghost/admin/app/validators/setting.js
index 3f8bb24107..b82085e679 100644
--- a/ghost/admin/app/validators/setting.js
+++ b/ghost/admin/app/validators/setting.js
@@ -4,7 +4,6 @@ var SettingValidator = Ember.Object.create({
         var validationErrors = [],
             title = model.get('title'),
             description = model.get('description'),
-            email = model.get('email'),
             postsPerPage = model.get('postsPerPage'),
             isPrivate    = model.get('isPrivate'),
             password     = model.get('password');
@@ -17,10 +16,6 @@ var SettingValidator = Ember.Object.create({
             validationErrors.push({message: 'Description is too long'});
         }
 
-        if (!validator.isEmail(email) || !validator.isLength(email, 0, 254)) {
-            validationErrors.push({message: 'Supply a valid email address'});
-        }
-
         if (isPrivate && password === '') {
             validationErrors.push({message: 'Password must be supplied'});
         }