mastodon/config
Thibaut Girka 5e0cf92fd1 Merge branch 'master' into glitch-soc/merge-upstream
No conflicts.
2019-01-19 18:28:37 +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 2019-01-19 18:28:37 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-01-19 18:28:37 +01:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01: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 Use the bundled Capistrano version (#9855) 2019-01-18 21:31:11 +01:00
environment.rb
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 2019-01-10 21:00:30 +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 2019-01-10 21:00:30 +01:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
sidekiq.yml Add scheduled statuses (#9706) 2019-01-05 12:43:28 +01:00
webpacker.yml Fix building assets in test environment 2018-09-13 15:32:02 +02:00