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 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.		4 years ago
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
initializers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
locales	Normalize locale files (#15434)	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	Fix streaming API allowing connections to persist after access token invalidation (#15111)	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	…
deploy.rb	Bump capistrano from 3.14.0 to 3.14.1 (#14037)	5 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	…
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
sidekiq.yml	Fix to isolate the sidekiq process that runs the scheduler job (#15314)	4 years ago
webpacker.yml	…