You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
catstodon/config
Claire 5ac380c122 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/status.rb`:
  Upstream added lines close to a glitch-soc only line, not a real conflict.
  Applied upstream's changes (added hooks) while keeping glitch-soc's changes
  (`local_only` scope).
- `config/environments/production.rb`:
  Upstream removed a header, while we have glitch-soc specific ones.
  Removed the header removed upstream.
1 year ago
..
environments Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
initializers Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
locales Update profile link verification instructions (#19723) 1 year ago
locales-glitch Normalize translations 1 year ago
webpack Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
application.rb Add cache headers to static files served through Rails (#24120) 1 year ago
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 (#16677) 3 years ago
brakeman.ignore Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2 years ago
database.yml Fix pgBouncer resetting application name on every transaction (#23958) 1 year ago
deploy.rb Change `master` branch to `main` branch (#20290) 2 years ago
environment.rb
i18n-tasks.yml Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
pghero.yml
puma.rb Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064) 1 year ago
roles.yml Add customizable user roles (#18641) 2 years ago
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
secrets.yml
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
sidekiq.yml Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212) 1 year ago
storage.yml Update Mastodon to Rails 6.1 (#15910) 3 years ago
webpacker.yml Merge branch 'main' into glitch-soc/merge-upstream 1 year ago