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 5d5d0c06d8 Merge commit 'dec7a90989c823dba7f6322c3359c3cd861812e9' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README, we have a completely different one. Kept ours. - `config/initializers/content_security_policy.rb`: Upstream has updated their development CSPs, while we disable CSPs in the development environment. Kept our version.		1 year ago
..
environments	Merge commit 'dec7a90989c823dba7f6322c3359c3cd861812e9' into glitch-soc/merge-upstream	1 year ago
imagemagick	Fix AVIF attachments (#26264)	1 year ago
initializers	Support webpacker live-reloading on Docker (#26419)	1 year ago
locales	Improve error messages when DeepL quota is exceeded (#26704)	1 year ago
locales-glitch	New Crowdin translations (#2388)	1 year ago
routes	Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream	1 year ago
webpack	Merge commit 'b085dcc921497f08e72cb29cf0b5cb07699d9d74' into glitch-soc/merge-upstream	1 year ago
application.rb	Allow setting a custom HTTP method in CacheBuster (#26528)	1 year ago
boot.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
brakeman.ignore	Ignore the brakeman `PermitAttributes` check (#25915)	1 year ago
brakeman.yml	Ignore the brakeman `PermitAttributes` check (#25915)	1 year ago
database.yml	Change `DB_REPLICA_*` environment variables to `REPLICA_DB_*` (#26386)	1 year ago
deploy.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	2 years ago
environment.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
formatjs-formatter.js	Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream	1 year ago
i18n-tasks.yml	Merge commit '5a5d8a97579bf2da481871588425734678019f52' into glitch-soc/merge-upstream	1 year ago
navigation.rb	Merge commit 'bd7f631918b3acbecf0c385008389ba22c945dbe' into glitch-soc/merge-upstream	1 year ago
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	5 years ago
puma.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
roles.yml	Add customizable user roles (#18641)	2 years ago
routes.rb	Merge commit '6a19d5ce9942686e0cda1a9decec349d0a1f4e26' into glitch-soc/merge-upstream	1 year ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream	1 year ago
sidekiq.yml	Change indexing frequency from 5 minutes to 1 minute, add locks to schedulers (#26304)	1 year ago
storage.yml	Update Mastodon to Rails 6.1 (#15910)	4 years ago
webpacker.yml	Merge commit 'dec7a90989c823dba7f6322c3359c3cd861812e9' into glitch-soc/merge-upstream	1 year ago