about summary refs log tree commit diff
path: root/config/initializers/1_hosts.rb
AgeCommit message (Collapse)Author
2018-10-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.
2018-08-23Tighten CSP while allowing CDN hostsThibaut Girka