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 2a7538aeed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		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	Add admin API for managing canonical e-mail blocks (#19067)	2 years ago
locales-glitch	Make “Flavour and skin” admin setting label translatable (#1791)	2 years ago
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
application.rb	Remove Rack::Deflater (#17937)	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	Bump capistrano from 3.17.0 to 3.17.1 (#18949)	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	3 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	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	3 years ago
sidekiq.yml	Remove digest e-mails (#17985)	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