6 Commits (43b9c4c0a7c8d199acbdd58b0bb6e9afedc2d0cf)

Author	SHA1	Message	Date
Claire	43b9c4c0a7	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Minor upstream refactor moved hook definitions around, and glitch-soc has an extra `before_create`. Moved the `before_create` accordingly. - `app/services/batched_remove_status_service.rb`: Minor upstream refactor changed a block in which glitch-soc had one extra call to handle direct timelines. Adapted changes to keep glitch-soc's extra call.	2 years ago
Claire	614dd22095	Fix sanitizer parsing link text as HTML when stripping unsupported links (#22558)	2 years ago
Claire	654be99637	Fix link sanitization for outgoing text/html and text/markdown toots ... Fixes #1739	3 years ago
Claire	eb7844c2c5	Add advanced text formatting back into glitch-soc	3 years ago
Claire	e19ca0e913	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	3feb291d90	Prepare Mastodon for zeitwerk autoloader (#15917) ... * Prepare Mastodon for zeitwerk autoloader (Rails 6) Add inflections and rename/move a few classes. In particular, app/lib/exceptions.rb and app/lib/sanitize_config.rb were manually loaded while still in autoload paths. * Add inflection for Url → URL	4 years ago