This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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.		2020-07-22 13:38:17 +02:00
..
activitypub	Fix RSS feeds not being cachable (#14368)	2020-07-22 11:44:02 +02:00
admin	Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)	2020-03-21 03:08:09 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00
auth	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	2020-06-09 10:23:06 +02:00
concerns	Fix sr locale being selected over sr-Latn (#13693)	2020-05-11 01:09:21 +02:00
oauth	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)	2020-05-12 15:25:33 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
well_known	Fix webfinger returning wrong status code on malformed or missing param (#13759)	2020-05-14 23:28:06 +02:00
about_controller_spec.rb	…
account_follow_controller_spec.rb	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Fix RSS feeds not being cachable (#14368)	2020-07-22 11:44:02 +02:00
application_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-20 15:36:09 +01:00
authorize_interactions_controller_spec.rb	…
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	2019-12-31 00:55:32 +01:00
following_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	2019-12-31 00:55:32 +01:00
health_check_controller_spec.rb	Add test for health_check endpoint	2020-02-10 20:04:41 +01:00
home_controller_spec.rb	…
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	Fix media attachments enumeration (#14254)	2020-07-07 15:26:51 +02:00
media_proxy_controller_spec.rb	Fix media attachments enumeration (#14254)	2020-07-07 15:26:51 +02:00
relationships_controller_spec.rb	…
remote_follow_controller_spec.rb	Refactor monkey-patching of Goldfinger (#12561)	2020-05-10 11:41:43 +02:00
remote_interaction_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_controller_spec.rb	Fix RSS feeds not being cachable (#14368)	2020-07-22 11:44:02 +02:00
tags_controller_spec.rb	…