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 37e746eab6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		4 years ago
..
assets	Add emoji autosuggest (#5053)	7 years ago
chewy/strategy	Fix records not being indexed sometimes (#12024)	5 years ago
devise	Fix authentication before 2FA challenge (#11943)	5 years ago
generators	Add post-deployment migration system (#8182)	6 years ago
json_ld	Fix preloaded JSON-LD context for identity not being used (#12138)	5 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
paperclip	Fix thumbnail color extraction (#14464)	4 years ago
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	4 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
templates	Add post-deployment migration system (#8182)	6 years ago
cli.rb	Fix help text around `tootctl email_domain_blocks` (#14147)	4 years ago