mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-27 09:03:12 +00: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. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| account_search_service_spec.rb | ||
| after_block_domain_from_account_service_spec.rb | ||
| after_block_service_spec.rb | ||
| app_sign_up_service_spec.rb | ||
| authorize_follow_service_spec.rb | ||
| batched_remove_status_service_spec.rb | ||
| block_domain_service_spec.rb | ||
| block_service_spec.rb | ||
| bootstrap_timeline_service_spec.rb | ||
| clear_domain_media_service_spec.rb | ||
| delete_account_service_spec.rb | ||
| fan_out_on_write_service_spec.rb | ||
| favourite_service_spec.rb | ||
| fetch_link_card_service_spec.rb | ||
| fetch_oembed_service_spec.rb | ||
| fetch_remote_status_service_spec.rb | ||
| fetch_resource_service_spec.rb | ||
| follow_service_spec.rb | ||
| import_service_spec.rb | ||
| mute_service_spec.rb | ||
| notify_service_spec.rb | ||
| post_status_service_spec.rb | ||
| precompute_feed_service_spec.rb | ||
| process_mentions_service_spec.rb | ||
| reblog_service_spec.rb | ||
| reject_follow_service_spec.rb | ||
| remove_status_service_spec.rb | ||
| report_service_spec.rb | ||
| resolve_account_service_spec.rb | ||
| resolve_url_service_spec.rb | ||
| search_service_spec.rb | ||
| unallow_domain_service_spec.rb | ||
| unblock_domain_service_spec.rb | ||
| unblock_service_spec.rb | ||
| unfollow_service_spec.rb | ||
| unmute_service_spec.rb | ||
| update_account_service_spec.rb | ||
| verify_link_service_spec.rb | ||