4 commits

Author	SHA1	Message	Date
Claire	6a5a699fbb	Merge branch 'main' into glitch-soc/main	2023-03-26 15:47:12 +02:00
Yamagishi Kazutoshi	e272fc91e4	Remove legacy decorators syntax (#18357)	2023-03-24 03:17:53 +01:00
Claire	f15ded319f	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.	2023-02-25 14:00:40 +01:00
Renaud Chaput	ae3812d182	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00

Renamed from app/javascript/mastodon/features/compose/components/compose_form.js (Browse further)