mastodon/app
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.
2023-02-25 14:00:40 +01:00
..
chewy Change algorithm of `tootctl search deploy` to improve performance (#18463) 2022-05-22 22:16:43 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
mailers Autofix Rubocop Style/ExplicitBlockArgument (#23704) 2023-02-20 11:18:08 +09:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
presenters Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
views Fix incorrect translation string in glitch-soc captcha feature 2023-02-19 11:02:27 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00