mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-24 14:56:27 +00:00
de5cc20dd8
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it. |
||
|---|---|---|
| .. | ||
| account_controller_concern.rb | ||
| account_owned_concern.rb | ||
| accountable_concern.rb | ||
| authorization.rb | ||
| cache_concern.rb | ||
| challengable_concern.rb | ||
| export_controller_concern.rb | ||
| localized.rb | ||
| rate_limit_headers.rb | ||
| session_tracking_concern.rb | ||
| sign_in_token_authentication_concern.rb | ||
| signature_authentication.rb | ||
| signature_verification.rb | ||
| status_controller_concern.rb | ||
| two_factor_authentication_concern.rb | ||
| user_tracking_concern.rb | ||