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 fe89554a54 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/activitypub/activity/create.rb`: Upstream refactored how `Create` activities are handled and how values are extracted from `Create`d objects. This conflicted with how glitch-soc supported the `directMessage` flag to explicitly distinguish between limited and direct messages. Ported glitch-soc's changes to latest upstream changes. - `app/services/fan_out_on_write_service.rb`: Upstream largely refactored that file and changed some of the logic. This conflicted with glitch-soc's handling of the direct timeline and the options to allow replies and boosts in public feeds. Ported those glitch-soc changes on top of latest upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored to move mention-related ActivityPub deliveries to `ActivityPub::DeliveryWorker`, while glitch-soc contained an extra check to not send local-only toots to remote mentioned users. Took upstream's version, as the check is not needed anymore, since it is performed at the `ActivityPub::DeliveryWorker` call site already. - `app/workers/feed_insert_worker.rb`: Upstream added support for `update` toot events, while glitch-soc had support for an extra timeline support, `direct`. Ported upstream changes and extended them to the `direct` timeline. Additional changes: - `app/lib/activitypub/parser/status_parser.rb`: Added code to handle the `directMessage` flag and take it into account to compute visibility. - `app/lib/feed_manager.rb`: Extended upstream's support of `update` toot events to glitch-soc's `direct` timeline.		3 years ago
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
initializers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
locales	Add notifications for statuses deleted by moderators (#17204)	3 years ago
locales-glitch	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
webpack	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
application.rb	Add S3_FORCE_SINGLE_REQUEST env var to work around S3 compatibility issues (#16866)	3 years ago
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	3 years ago
brakeman.ignore	Add trending links (#16917)	3 years ago
database.yml	config: add DB_SSLMODE for managed/remote PG (#10210)	6 years ago
deploy.rb	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	3 years ago
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	7 years ago
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	5 years ago
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	5 years ago
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
sidekiq.yml	Add trending links (#16917)	3 years ago
storage.yml	Update Mastodon to Rails 6.1 (#15910)	4 years ago
webpacker.yml	Do not try to parse gif files as CSS or JS	6 years ago