From a9e2337aebdcdef4af286f5277d0e9964a2ca885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 2 Feb 2010 13:28:47 +0100
Subject: [PATCH] Change EMAIL_REGEXP so it can be used in javascript.

---
 lib/devise.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/devise.rb b/lib/devise.rb
index b0fcea09..7501c2ab 100644
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -54,8 +54,8 @@ module Devise
     :bcrypt => 60
   }
 
-  # Email regex used to validate email formats. Retrieved from authlogic.
-  EMAIL_REGEX = /\A[\w\.%\+\-]+@(?:[A-Z0-9\-]+\.)+(?:[A-Z]{2,4}|museum|travel)\z/i
+  # Email regex used to validate email formats. Adapted from authlogic.
+  EMAIL_REGEX = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
 
   # Used to encrypt password. Please generate one with rake secret.
   mattr_accessor :pepper