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 afc3b12217 Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' 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 '4ad1c5aa7174e5cef4ba9608a44429916a119bee' 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 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream	1 year ago
webpack	Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' 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 '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream	1 year ago
i18n-tasks.yml	Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream	1 year ago
navigation.rb	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' 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 '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream	1 year ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' 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 '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream	1 year ago