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 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		6 years ago
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
initializers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
webpack	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
boot.rb	Fix bootsnap cache directory being declared relatively (#9511)	6 years ago
brakeman.ignore	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	6 years ago
database.yml	config: add DB_SSLMODE for managed/remote PG (#10210)	6 years ago
deploy.rb	Use the bundled Capistrano version (#9855)	6 years ago
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	6 years ago
puma.rb	Improve ActiveRecord connection in on_worker_boot (#9238)	6 years ago
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
sidekiq.yml	Add scheduled statuses (#9706)	6 years ago
webpacker.yml	Do not try to parse gif files as CSS or JS	6 years ago