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 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		4 years ago
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
initializers	Drop dependency on secure_headers, fix response headers (#15712)	4 years ago
locales	Update Doorkeeper strings for `doorkeeper.errors.messages.invalid_request` (#15659)	4 years ago
locales-glitch	Glitchsoc translation to 'es' language (#1439)	4 years ago
webpack	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
application.rb	Drop dependency on secure_headers, fix response headers (#15712)	4 years ago
boot.rb	Add clean error message when RAILS_ENV is unset (#15381)	4 years ago
brakeman.ignore	Fix performance on instances list in admin UI (#15282)	4 years ago
database.yml	config: add DB_SSLMODE for managed/remote PG (#10210)	6 years ago
deploy.rb	Bump capistrano from 3.14.1 to 3.15.0 (#15537)	4 years ago
environment.rb	…
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 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
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
secrets.yml	…
settings.yml	Change default site title to not point to dev.glitch.social	4 years ago
sidekiq.yml	Fix to isolate the sidekiq process that runs the scheduler job (#15314)	4 years ago
webpacker.yml	Do not try to parse gif files as CSS or JS	6 years ago