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 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		5 years ago
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	6 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 remote-tracking branch 'upstream/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	Make PreviewCard records reuseable between statuses (#4642)	7 years ago
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 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	5 years ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge remote-tracking branch 'upstream/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