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.
Kay Faraday c29dfcdf53
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2 months ago
..
environments Merge branch 'main' of https://github.com/glitch-soc/mastodon 2 months ago
initializers Merge branch 'main' of https://github.com/glitch-soc/mastodon 2 months ago
locales New Crowdin updates (#20759) 3 months ago
locales-glitch Remove glitch-soc-specific translations of upstreamed feature (domain block import) 3 months ago
webpack Merge branch 'main' into glitch-soc/merge-upstream 5 months ago
application.rb Fix `mailers` queue not being used for mailers (#20274) 3 months ago
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 (#16677) 1 year ago
brakeman.ignore Fix IDN domains not being rendered correctly in a few left-over places (#17848) 11 months ago
database.yml Format JSON and YAML using Prettier (#17823) 11 months ago
deploy.rb Change `master` branch to `main` branch (#20290) 3 months ago
environment.rb
i18n-tasks.yml Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"" 3 months ago
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 3 months ago
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 3 years ago
puma.rb Add PERSISTENT_TIMEOUT option (#11756) 3 years ago
roles.yml Add customizable user roles (#18641) 7 months ago
routes.rb Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 3 months ago
secrets.yml
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 3 months ago
sidekiq.yml Change incoming activity processing to happen in `ingress` queue (#20264) 3 months ago
storage.yml Update Mastodon to Rails 6.1 (#15910) 2 years ago
webpacker.yml Do not try to parse gif files as CSS or JS 4 years ago