Merged r19660 and r19661 to 4.1-stable (#32793).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19667 e93f8b46-1217-0410-a6f0-8f06a7374b81

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
 

test/unit/email_address_test.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# Redmine - project management software
+# Copyright (C) 2006-2020  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../test_helper', __FILE__)
+
+class EmailAddressTest < ActiveSupport::TestCase
+  fixtures :users
+
+  def setup
+    User.current = nil
+  end
+
+  def test_address_with_punycode_tld_should_be_valid
+    email = EmailAddress.new(address: 'jsmith@example.xn--80akhbyknj4f')
+    assert email.valid?
+  end
+end