diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-06-01 14:53:37 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-06-01 20:53:37 +0200 |
| commit | 2212dc4aaa6de729d2fe3e39b134b566935b11b7 (patch) | |
| tree | ec204dc8ee97926545f36cfd5cd58115d1b5198a /app/models/user.rb | |
| parent | e1fdac3e9a173c05c7fd9f5e8bcc255ef4a1e804 (diff) | |
Update Rails to version 5.1.1 (#3121)
* Update rails to version 5.1.1 * Run `rails app:update` * Remove the override of polymorphic activity relationship * Silence warning about otp_secret attribute being unknown to rails * We will only introduce form_with where we want to use remote data
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 8840de82d..c0600fe75 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -58,6 +58,11 @@ class User < ApplicationRecord before_validation :sanitize_languages + # This avoids a deprecation warning from Rails 5.1 + # It seems possible that a future release of devise-two-factor will + # handle this itself, and this can be removed from our User class. + attribute :otp_secret + def confirmed? confirmed_at.present? end |