mastodon/config
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
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2023-01-10 14:43:38 +01:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-03 19:23:27 +01:00
locales Remove unused HTML Validator (#23866) 2023-02-24 20:06:32 +01:00
locales-glitch New Crowdin updates (#2111) 2023-02-18 11:16:30 +01:00
webpack Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
application.rb Address check-i18n warnings (#23313) 2023-02-02 10:14:19 +09:00
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 (#16677) 2021-09-19 14:42:32 +09:00
brakeman.ignore Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
database.yml Change postgres connection timeout (#21790) 2022-12-07 00:39:36 +01:00
deploy.rb Change `master` branch to `main` branch (#20290) 2022-11-10 04:02:05 +01:00
environment.rb
i18n-tasks.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
pghero.yml
puma.rb feat(puma): enable setting min puma threads in addition to max (#21048) 2023-01-06 07:55:58 +01:00
roles.yml Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
secrets.yml
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
sidekiq.yml Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212) 2023-02-13 13:31:42 +01:00
storage.yml
webpacker.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00