Merge branch 'master' into glitch-soc/merge-upstream

2019-05-19 21:53:44 +02:00
parent 46811f92e4 ae18386558
commit 08a2af27c3
5 changed files with 12 additions and 8 deletions
--- a/app/validators/blacklisted_email_validator.rb
+++ b/app/validators/blacklisted_email_validator.rb
@@ -2,7 +2,7 @@

 class BlacklistedEmailValidator < ActiveModel::Validator
  def validate(user)
-    return if user.invited?
+    return if user.valid_invitation?

    @email = user.email