mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-28 00:11:37 +01:00
4df3b7cb06
Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. |
||
---|---|---|
.. | ||
activitypub | ||
concerns | ||
pubsubhubbub | ||
account_search_service.rb | ||
after_block_domain_from_account_service.rb | ||
after_block_service.rb | ||
app_sign_up_service.rb | ||
authorize_follow_service.rb | ||
backup_service.rb | ||
base_service.rb | ||
batched_remove_status_service.rb | ||
block_domain_service.rb | ||
block_service.rb | ||
bootstrap_timeline_service.rb | ||
fan_out_on_write_service.rb | ||
favourite_service.rb | ||
fetch_atom_service.rb | ||
fetch_link_card_service.rb | ||
fetch_oembed_service.rb | ||
fetch_remote_account_service.rb | ||
fetch_remote_status_service.rb | ||
follow_service.rb | ||
hashtag_query_service.rb | ||
import_service.rb | ||
mute_service.rb | ||
notify_service.rb | ||
post_status_service.rb | ||
precompute_feed_service.rb | ||
process_feed_service.rb | ||
process_hashtags_service.rb | ||
process_interaction_service.rb | ||
process_mentions_service.rb | ||
reblog_service.rb | ||
reject_follow_service.rb | ||
remove_status_service.rb | ||
report_service.rb | ||
resolve_account_service.rb | ||
resolve_url_service.rb | ||
search_service.rb | ||
send_interaction_service.rb | ||
subscribe_service.rb | ||
suspend_account_service.rb | ||
unblock_domain_service.rb | ||
unblock_service.rb | ||
unfavourite_service.rb | ||
unfollow_service.rb | ||
unmute_service.rb | ||
unsubscribe_service.rb | ||
update_account_service.rb | ||
update_remote_profile_service.rb | ||
verify_link_service.rb | ||
verify_salmon_service.rb | ||
vote_service.rb |