Commit Graph

4 Commits (14b0311029b645450c99845fce2f52e46d7be251)

Author SHA1 Message Date
Claire 14b0311029 Merge branch 'main' into glitch-soc/main 1 year ago
Yamagishi Kazutoshi d1b057a0ac
Remove legacy decorators syntax (#18357) 1 year ago
Claire 4ed09276d5 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.
1 year ago
Renaud Chaput 44a7d87cb1
Rename JSX files with proper `.jsx` extension (#23733) 1 year ago