diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-01 14:12:42 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-01 14:12:42 +0000 |
| commit | f9ab215b217c5202644000fd29c4b90b3bbb14c4 (patch) | |
| tree | e1b5efad6d5509e4383621c141213648753cfcfd /app/models | |
| parent | e3f0bef5ee8ece2e949239c5c43a30477431681b (diff) | |
| parent | 2c6207135e917a0b8f25f657916060405f1f85b5 (diff) | |
| download | gitlab-ce-f9ab215b217c5202644000fd29c4b90b3bbb14c4.tar.gz | |
Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into 'master'
Allow temp-oauth-email as notification email
Closes #14559
/cc @dblessing @rymai
See merge request !3477
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 128ddc2a694..2b0bee2099f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -408,6 +408,8 @@ class User < ActiveRecord::Base end def owns_notification_email + return if self.temp_oauth_email? + self.errors.add(:notification_email, "is not an email you own") unless self.all_emails.include?(self.notification_email) end |