about summary refs log tree commit diff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authoralpaca-tc <alpaca-tc@alpaca.tc>2017-04-17 22:54:33 +0900
committerEugen <eugen@zeonfederated.com>2017-04-17 15:54:33 +0200
commit630de52fdd93e7465d0fb9dac5f35db30a2545d2 (patch)
tree416935f23d0e73bd3f4fb032d7da88407bc3fa04 /app/models/user.rb
parentf8546ad5a21c840107d263acea0c051081af9c7b (diff)
Required foreign keys (#2003)
* Add `required: true` option to foreign column

* Fixes NoMethodError

```
> Favourite.new.valid?
NoMethodError: undefined method `reblog?' for nil:NilClass
```
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 27a38674e..a59d843d4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,10 +9,9 @@ class User < ApplicationRecord
          otp_secret_encryption_key: ENV['OTP_SECRET'],
          otp_number_of_backup_codes: 10
 
-  belongs_to :account, inverse_of: :user
+  belongs_to :account, inverse_of: :user, required: true
   accepts_nested_attributes_for :account
 
-  validates :account, presence: true
   validates :locale, inclusion: I18n.available_locales.map(&:to_s), unless: 'locale.nil?'
   validates :email, email: true