diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-20 16:37:35 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-20 16:37:35 -0600 |
commit | 24b6e4121f656d24adc5676e8a207ded610a7ea7 (patch) | |
tree | 1c7b908468e12a40a6433f02f86f2cf47fa53cf9 /app/models/user.rb | |
parent | b8c6656ce9e498f2e99d6301212bcd12e7f839df (diff) | |
parent | 3cae3622146d80aef8e43e5790d25f5e2fc9931e (diff) |
Merge pull request #342 from glitch-soc/merge-upstream
Merge upstream
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 65ecb33cd..3cf9900bd 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -50,8 +50,8 @@ class User < ApplicationRecord devise :registerable, :recoverable, :rememberable, :trackable, :validatable, :confirmable - belongs_to :account, inverse_of: :user, required: true - belongs_to :invite, counter_cache: :uses + belongs_to :account, inverse_of: :user + belongs_to :invite, counter_cache: :uses, optional: true accepts_nested_attributes_for :account has_many :applications, class_name: 'Doorkeeper::Application', as: :owner @@ -223,5 +223,6 @@ class User < ApplicationRecord def update_statistics! BootstrapTimelineWorker.perform_async(account_id) ActivityTracker.increment('activity:accounts:local') + UserMailer.welcome(self).deliver_later end end |