mirror of
https://github.com/funamitech/mastodon
synced 2024-12-15 15:18:30 +09:00
ce84d163cc
Conflicts: - `.prettierignore`: Upstream added a line at the end, glitch-soc had extra entries at the end. Added upstream's new line before glitch-soc's. - `Gemfile.lock`: Upstream updated dependencies while glitch-soc has an extra one (hcaptcha). Updated dependencies like upstream did. - `app/controllers/api/v1/statuses_controller.rb`: Not a real conflict, upstream added a parameter (`allowed_mentions`) where glitch-soc already had an extra one (`content_type`). Added upstream's new parameter. - `app/javascript/styles/fonts/roboto-mono.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes. - `app/javascript/styles/fonts/roboto.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes. |
||
---|---|---|
.. | ||
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 |