summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/email_address.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/email_address.rb b/app/models/email_address.rb
index 4cd9c5dfd..b27cf6e58 100644
--- a/app/models/email_address.rb
+++ b/app/models/email_address.rb
@@ -20,7 +20,7 @@
class EmailAddress < ActiveRecord::Base
include Redmine::SafeAttributes
- EMAIL_REGEXP = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+ EMAIL_REGEXP = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+(?:(?:xn--[-a-z0-9]+)|(?:[a-z]{2,})))\z/i
belongs_to :user