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.

Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		5 years ago
..
environments	…
initializers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
webpack	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	6 years ago
application.rb	Change locale detection to run once per session (#8657)	5 years ago
boot.rb	…
brakeman.ignore	…
database.yml	config: add DB_SSLMODE for managed/remote PG (#10210)	6 years ago
deploy.rb	…
environment.rb	…
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
puma.rb	Make puma bind address configurable with BIND env var (#11326)	5 years ago
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
sidekiq.yml	Remove WebSub subscriptions (#11303)	5 years ago
webpacker.yml	Do not try to parse gif files as CSS or JS	6 years ago