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 4c68189d2b
Merge pull request #2112 from ClearlyClaire/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 (#23413) 2 years ago
locales-glitch New Crowdin updates (#2111) 2 years ago
webpack Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
application.rb Address check-i18n warnings (#23313) 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 Change postgres connection timeout (#21790) 2 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 Merge branch 'main' into glitch-soc/merge-upstream 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 feat(puma): enable setting min puma threads in addition to max (#21048) 2 years ago
roles.yml Add customizable user roles (#18641) 2 years ago
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 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 Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212) 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