Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.		2019-10-03 11:10:12 +02:00
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
webpack	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
application.rb	Add br, es-AR, et, mk, nn to available locales (#12062)	2019-10-03 03:59:43 +02:00
boot.rb	Fix bootsnap cache directory being declared relatively (#9511)	2018-12-13 05:19:52 +01:00
brakeman.ignore	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	2019-02-26 15:21:36 +01:00
database.yml	config: add DB_SSLMODE for managed/remote PG (#10210)	2019-03-08 14:36:28 +01:00
deploy.rb	Bump capistrano from 3.11.0 to 3.11.1 (#11731)	2019-09-05 12:04:45 +09:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	2019-09-04 20:44:08 +02:00
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
sidekiq.yml	Change trending hashtags to not disappear instantly after midnight (#11712)	2019-09-02 18:11:13 +02:00
webpacker.yml	Do not try to parse gif files as CSS or JS	2019-03-16 14:23:50 +01:00