diff options
| author | 🙈 jacopo beschi 🙉 <intrip@gmail.com> | 2018-05-17 09:19:47 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-17 09:19:47 +0000 |
| commit | 01275667e323d4702cc396f6f756305b06cba726 (patch) | |
| tree | ae8b900f5b94994f3126b1aff5b672eb02109722 /app/models/user.rb | |
| parent | bbd8d5b270a92b2b3ff707279cdac6d83ba67edf (diff) | |
| download | gitlab-ce-01275667e323d4702cc396f6f756305b06cba726.tar.gz | |
Resolve "Opening Project with invite but without accepting leads to 404 error page"
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 474fde36c02..8ef3c3ceff0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -860,6 +860,16 @@ class User < ActiveRecord::Base confirmed? && !temp_oauth_email? end + def accept_pending_invitations! + pending_invitations.select do |member| + member.accept_invite!(self) + end + end + + def pending_invitations + Member.where(invite_email: verified_emails).invite + end + def all_emails all_emails = [] all_emails << email unless temp_oauth_email? |