Merge tag 'v2.9.3' into hometown-2.9.3

2019-08-19 14:28:19 -07:00
parent f66e192c2e 06f906acac
commit 6c2e2969ca
98 changed files with 852 additions and 270 deletions
--- 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? }