diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-04-06 21:10:23 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-04-06 21:10:23 +0200 |
commit | b368c7502931aa06121ecad8a97193b1f17cf90a (patch) | |
tree | 2b598363926388d30a4c5c6197436b46f6d4610a /app/policies | |
parent | 00c9363f07081e0149533023992fba47dd905384 (diff) | |
parent | dd4c156f33a24b8bb89b45b2697aa4036c3ae5be (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.
Diffstat (limited to 'app/policies')
-rw-r--r-- | app/policies/user_policy.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb index 92e2c4f4b..140905e1f 100644 --- a/app/policies/user_policy.rb +++ b/app/policies/user_policy.rb @@ -13,14 +13,6 @@ class UserPolicy < ApplicationPolicy admin? && !record.staff? end - def disable_sign_in_token_auth? - staff? - end - - def enable_sign_in_token_auth? - staff? - end - def confirm? staff? && !record.confirmed? end |