1
0
puyopuyotetr.is/config
Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
2018-09-03 14:33:06 +02:00
..
environments Move CSP headers to the appropriate Rails configuration 2018-08-22 20:39:33 +02:00
initializers Fix CSP with S3/SWIFT hosts 2018-08-28 22:10:40 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-09-03 14:33:06 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
application.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-09-03 14:33:06 +02:00
boot.rb Upgrade Rails to version 5.2.0 (#5898) 2018-04-12 14:45:17 +02:00
brakeman.ignore Add animate custom emoji param to embed pages (#8507) 2018-08-30 23:14:01 +02:00
database.yml use-DB_NAME-in-development (#5430) 2017-10-17 11:45:37 +02: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-07-17 22:05:25 +02:00
puma.rb Revert "Default puma to running on localhost only." (#8444) 2018-08-26 00:13:22 +02:00
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-09-03 14:33:06 +02: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-09-03 14:33:06 +02:00
sidekiq.yml Update docker config and move some workers to different queues (#8345) 2018-09-02 16:13:06 +02:00
webpacker.yml Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00