Merge remote-tracking branch 'origin/stable' into pkgr

Author: crohr

lib/validators/email_validator.rb

@@ -22,7 +22,7 @@ def self.allowed?(email)
 
   def self.email_in_restriction_setting?(setting, value)
     domains = setting.gsub('.', '\.')
-    regexp = Regexp.new("@(.+\\.)?(#{domains})", true)
+    regexp = Regexp.new("@(.+\\.)?(#{domains})$", true)
     value =~ regexp
   end
 

lib/version.rb

@@ -4,7 +4,7 @@ module Discourse
     module VERSION #:nodoc:
       MAJOR = 1
       MINOR = 9
-      TINY  = 1
+      TINY  = 2
       PRE   = nil
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

spec/components/validators/email_validator_spec.rb

@@ -40,6 +40,7 @@ def blocks?(email)
       expect(blocks?('sam@bob.email.com')).to eq(false)
       expect(blocks?('sam@e-mail.com')).to eq(true)
       expect(blocks?('sam@googlemail.com')).to eq(false)
+      expect(blocks?('sam@email.computers.are.evil.com')).to eq(true)
     end
   end