Merge tag 'v2.9.3' into instance_only_statuses

This commit is contained in:
Renato "Lond" Cerqueira
2019-08-10 09:20:44 +02:00
98 changed files with 852 additions and 270 deletions

View File

@ -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? }