diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-29 23:37:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 23:37:14 +0200 |
| commit | f48c7689d230b915ed740a4774736bd5998cbc66 (patch) | |
| tree | 3d883f06fe8e3abbc5653e029ac8612ae114f135 /app/models/user.rb | |
| parent | a4a81c5434c73139f7c1d66f2687039237c5208a (diff) | |
| parent | 51411267fda00db576230a270a10e31992378c18 (diff) | |
Merge pull request #1179 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 1548e1ea0..2a7fffca5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -73,6 +73,7 @@ class User < ApplicationRecord has_many :applications, class_name: 'Doorkeeper::Application', as: :owner has_many :backups, inverse_of: :user + has_many :invites, inverse_of: :user has_one :invite_request, class_name: 'UserInviteRequest', inverse_of: :user, dependent: :destroy accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? } |