Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		2018-12-18 16:55:15 +01:00
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
webpack	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-07 19:47:56 +02:00
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-11 16:51:26 +02:00
boot.rb	Fix bootsnap cache directory being declared relatively (#9511)	2018-12-13 05:19:52 +01:00
brakeman.ignore	Allow joining several hashtags in a single column (#8904)	2018-11-05 18:53:25 +01:00
database.yml	Remove PostgreSQL statement timeout (#9537)	2018-12-16 21:17:15 +01:00
deploy.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Ignore tootsuite-specific theme-related translation strings	2018-05-10 00:03:34 +02:00
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
puma.rb	Improve ActiveRecord connection in on_worker_boot (#9238)	2018-11-09 09:08:01 +01:00
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
secrets.yml	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01:00
sidekiq.yml	Track historical space stats in PgHero to determine PostgreSQL growth (#8906)	2018-10-09 19:35:14 +02:00
webpacker.yml	Fix building assets in test environment	2018-09-13 15:32:02 +02:00