From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 25 Aug 2013 18:23:27 +0000 (-0500)
Subject: Merge remote-tracking branch 'refs/remotes/rodney757/email'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6c3d383bbb0af1ca7ac2ec2b229d148e947608dd;p=mediagoblin.git

Merge remote-tracking branch 'refs/remotes/rodney757/email'
---

6c3d383bbb0af1ca7ac2ec2b229d148e947608dd
diff --cc mediagoblin/edit/forms.py
index 5de1bf96,71f30520..3f1e2386
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@@ -61,14 -61,8 +61,10 @@@ class EditProfileForm(wtforms.Form)
  
  
  class EditAccountForm(wtforms.Form):
-     new_email = wtforms.TextField(
-         _('New email address'),
-         [wtforms.validators.Optional(),
-          normalize_user_or_email_field(allow_user=False)])
      wants_comment_notification = wtforms.BooleanField(
          description=_("Email me when others comment on my media"))
 +    wants_notifications = wtforms.BooleanField(
 +        description=_("Enable/Disable insite notifications"))
      license_preference = wtforms.SelectField(
          _('License preference'),
          [