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 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb		5 years ago
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
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 branch 'master' into glitch-soc/merge-upstream	5 years ago
application.rb	Add br, es-AR, et, mk, nn to available locales (#12062)	5 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	Bump capistrano from 3.11.1 to 3.11.2 (#12012)	5 years ago
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	7 years ago
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	Add PERSISTENT_TIMEOUT option (#11756)	5 years ago
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
sidekiq.yml	Change trending hashtags to not disappear instantly after midnight (#11712)	5 years ago
webpacker.yml	Do not try to parse gif files as CSS or JS	6 years ago