You cannot 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	Fix incoming federation in whitelist mode (#12185)	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
auth	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
concerns	Add specific rate limits for posting and following (#13172)	5 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
well_known	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_follow_controller.rb	Add specific rate limits for posting and following (#13172)	5 years ago
account_unfollow_controller.rb	Restful refactor of accounts/ routes (#2133)	8 years ago
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
authorize_interactions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
custom_css_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	6 years ago
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
emojis_controller.rb	Add (back) rails-level JSON caching (#11333)	6 years ago
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
instance_actors_controller.rb	Fix reverse-proxy caching of instance actor object (#11561)	6 years ago
intents_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	6 years ago
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
manifests_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	6 years ago
media_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	6 years ago
media_proxy_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	6 years ago
public_timelines_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago