You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Claire 367db8222f
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
initializers Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
locales New Crowdin updates (#20759) 2 years ago
locales-glitch Remove glitch-soc-specific translations of upstreamed feature (domain block import) 2 years ago
webpack Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
application.rb Fix `mailers` queue not being used for mailers (#20274) 2 years 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) 3 years ago
database.yml Format JSON and YAML using Prettier (#17823) 3 years ago
deploy.rb Change `master` branch to `main` branch (#20290) 2 years ago
environment.rb Make PreviewCard records reuseable between statuses (#4642) 7 years ago
i18n-tasks.yml Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"" 2 years ago
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 5 years ago
puma.rb Add PERSISTENT_TIMEOUT option (#11756) 5 years ago
roles.yml Add customizable user roles (#18641) 2 years ago
routes.rb Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 2 years ago
secrets.yml Upgrade to Rails 5.0.0.1 8 years ago
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
sidekiq.yml Change incoming activity processing to happen in `ingress` queue (#20264) 2 years ago
storage.yml Update Mastodon to Rails 6.1 (#15910) 4 years ago
webpacker.yml Do not try to parse gif files as CSS or JS 6 years ago