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.

Claire 759226e116 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.		3 years ago
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
v2	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
web	Add `policy` param to `POST /api/v1/push/subscriptions` (#16040)	4 years ago
base_controller.rb	Add logging of S3-related errors (#16381)	3 years ago
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	5 years ago