diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-26 13:23:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 13:23:52 +0200 |
| commit | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (patch) | |
| tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/models/user.rb | |
| parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
| parent | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (diff) | |
Merge pull request #671 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 8b65a900c..28c34d7a4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -216,10 +216,6 @@ class User < ApplicationRecord save! end - def active_for_authentication? - super && !disabled? - end - def setting_default_privacy settings.default_privacy || (account.locked? ? 'private' : 'public') end |