You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.		5 years ago
..
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	…
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	…
hashtag_query_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	…
suspend_account_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	…