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 b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.		4 years ago
..
activitypub	Fix RSS feeds not being cachable (#14368)	4 years ago
admin	Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)	5 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
auth	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	5 years ago
concerns	Fix sr locale being selected over sr-Latn (#13693)	5 years ago
oauth	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)	5 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
well_known	Fix webfinger returning wrong status code on malformed or missing param (#13759)	5 years ago
about_controller_spec.rb	…
account_follow_controller_spec.rb	Add specific rate limits for posting and following (#13172)	5 years ago
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Fix RSS feeds not being cachable (#14368)	4 years ago
application_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
authorize_interactions_controller_spec.rb	…
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	5 years ago
following_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	5 years ago
health_check_controller_spec.rb	Add test for health_check endpoint	5 years ago
home_controller_spec.rb	Fix blurhash and autoplay not working on public pages (#11585)	5 years ago
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	Fix media attachments enumeration (#14254)	4 years ago
media_proxy_controller_spec.rb	Fix media attachments enumeration (#14254)	4 years ago
relationships_controller_spec.rb	…
remote_follow_controller_spec.rb	Refactor monkey-patching of Goldfinger (#12561)	5 years ago
remote_interaction_controller_spec.rb	…
shares_controller_spec.rb	Fix blurhash and autoplay not working on public pages (#11585)	5 years ago
statuses_controller_spec.rb	Fix RSS feeds not being cachable (#14368)	4 years ago
tags_controller_spec.rb	…