mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-24 09:04:00 -05:00
aec61a703f
Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how docker images were built, including how they were cached. I don't know much about it, so applied upstream's changes. - `app/controllers/admin/domain_blocks_controller.rb`: The feature, that was in glitch-soc, got backported upstream. It also had a few fixes upstream, so those have been ported! - `app/javascript/packs/admin.js`: Glitch-soc changes have been backported upstream. As a result, some code from `app/javascript/core/admin.js` got added upstream. Kept our version since our shared Javascript already has that feature. - `app/models/user.rb`: Upstream added something to distinguish unusable and unusable-because-moved accounts, while glitch-soc considers moved accounts usable. Took upstream's code for `functional_or_moved?` and made `functional?` call it. - `app/views/statuses/_simple_status.html.haml`: Upstream cleaned up code style a bit, on a line that we had custom changes for. Applied upstream's change while keeping our change. - `config/initializers/content_security_policy.rb`: Upstream adopted one CSP directive we already had. The conflict is because of our files being structurally different, but the change itself was already part of glitch-soc. Kept our version. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| account_search_service_spec.rb | ||
| account_statuses_cleanup_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 | ||
| purge_domain_service_spec.rb | ||
| reblog_service_spec.rb | ||
| reject_follow_service_spec.rb | ||
| remove_from_follwers_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 | ||
| suspend_account_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 | ||
| unsuspend_account_service_spec.rb | ||
| update_account_service_spec.rb | ||
| update_status_service_spec.rb | ||
| verify_link_service_spec.rb | ||