mastodon/config
Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
2019-03-28 13:01:33 +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-03-28 13:01:33 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
webpack Revert "fix: update to emoji-mart 2.10.0 (#10281)" 2019-03-27 14:04:58 +01:00
application.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01: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 Use the bundled Capistrano version (#9855) 2019-01-18 21:31:11 +01: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-02-10 21:10:09 +01:00
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 16:01:59 +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-03-20 13:54:00 +01:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
sidekiq.yml Add scheduled statuses (#9706) 2019-01-05 12:43:28 +01:00
webpacker.yml Do not try to parse gif files as CSS or JS 2019-03-16 14:23:50 +01:00