diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-04-09 16:06:30 +0200 |
|---|---|---|
| committer | Yamagishi Kazutoshi <ykzts@desire.sh> | 2019-04-09 23:06:30 +0900 |
| commit | 8b69a66380bbe32127e717ca2d79244392b7d2b6 (patch) | |
| tree | 3362aba467a4f40e108f38aa7bf4e76ba48df942 /app/models/user.rb | |
| parent | 0f3719f16fb5a2704416fa3afae00ba767ad2b2c (diff) | |
Add "why do you want to join" field to invite requests (#10524)
* Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index d703f9588..c9309bc21 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -74,6 +74,9 @@ class User < ApplicationRecord has_many :applications, class_name: 'Doorkeeper::Application', as: :owner has_many :backups, 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? } + validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale? validates_with BlacklistedEmailValidator, if: :email_changed? validates_with EmailMxValidator, if: :validate_email_dns? |