mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-30 05:09:04 +01:00
75580360cd
Conflicts: - `.rubocop_todo.yml`: Upstream fixed a bunch lint issues, and changed the `Max` parameter of the `Metrics/AbcSize` cop. Glitch-soc has different code and slightly higher `AbcSize` complexity, modified the `.rubocop_todo.yml` file accordingly. - `app/policies/status_policy.rb`: Upstream changed `account.suspended?` to `account.unavailable?` to prepare for delete flags. Glitch-soc has additional local-only conditions. Ported upstream's refactor while keeping glitch-soc's additional condition. - `app/serializers/initial_state_serializer.rb`: Upstream refactored a bunch of stuff while glitch-soc has more settings. Refactored as upstream did while keeping glitch-soc's settings. |
||
|---|---|---|
| .. | ||
| admin | ||
| api | ||
| auth | ||
| settings | ||
| account_controller_concern.rb | ||
| account_owned_concern.rb | ||
| accountable_concern.rb | ||
| authorization.rb | ||
| cache_concern.rb | ||
| challengable_concern.rb | ||
| localized.rb | ||
| session_tracking_concern.rb | ||
| signature_authentication.rb | ||
| signature_verification.rb | ||
| theming_concern.rb | ||
| user_tracking_concern.rb | ||
| web_app_controller_concern.rb | ||