mirror of
https://github.com/funamitech/mastodon
synced 2024-12-02 16:58:53 +09:00
a7aedebc31
Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. |
||
|---|---|---|
| .. | ||
| 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 | ||