Eugen Rochko 41c697fd81 Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master		2017-04-13 22:25:07 +02:00
..
environments	smtp delivery type fix (#1556)	2017-04-13 19:51:49 +02:00
initializers	Add filename extension to paperclip (#1718)	2017-04-13 21:52:56 +02:00
locales	Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master	2017-04-13 22:25:07 +02:00
application.rb	Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master	2017-04-13 22:25:07 +02:00
boot.rb	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
cable.yml	Add Heroku deployment support	2017-01-17 22:00:03 +11:00
database.yml	Add env variable to disable prepared statements (#1293)	2017-04-09 05:46:32 +02:00
deploy.rb	Add capistrano to development environment	2017-01-30 20:03:17 +01:00
environment.rb	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
i18n-tasks.yml	Pagination improvements (#1445)	2017-04-11 01:11:41 +02:00
navigation.rb	Translate admin (#1702)	2017-04-13 21:49:07 +02:00
puma.rb	Force UTF8 encoding on generated XML (#1140)	2017-04-07 11:09:14 +02:00
routes.rb	Clean up well-known routes/controllers (#1649)	2017-04-13 13:09:07 +02:00
secrets.yml	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
settings.yml	Make boost modal off by default (#1719)	2017-04-13 21:53:59 +02:00
sidekiq.yml	Adjust down the number of Sidekiq threads to 5 (default of 25 is way too high)	2016-03-25 14:20:31 +01:00