mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-11 16:05:04 +00:00
4a70792b4a
Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well. |
||
---|---|---|
.. | ||
activitypub | ||
concerns | ||
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_link_card_service.rb | ||
fetch_oembed_service.rb | ||
fetch_remote_status_service.rb | ||
fetch_resource_service.rb | ||
follow_service.rb | ||
hashtag_query_service.rb | ||
import_service.rb | ||
move_service.rb | ||
mute_service.rb | ||
notify_service.rb | ||
post_status_service.rb | ||
precompute_feed_service.rb | ||
process_hashtags_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 | ||
suspend_account_service.rb | ||
tag_search_service.rb | ||
unallow_domain_service.rb | ||
unblock_domain_service.rb | ||
unblock_service.rb | ||
unfavourite_service.rb | ||
unfollow_service.rb | ||
unmute_service.rb | ||
update_account_service.rb | ||
verify_link_service.rb | ||
vote_service.rb |