Merge branch 'master' into glitch-soc/merge-upstream

2018-07-17 22:05:25 +02:00
parent 1fb78602c5 6277a6db2a
commit 7dbed4dab9
20 changed files with 360 additions and 36 deletions
@@ -2,7 +2,7 @@

 class Sanitize
  module Config
-    HTTP_PROTOCOLS ||= ['http', 'https', :relative].freeze
+    HTTP_PROTOCOLS ||= ['http', 'https', 'dat', 'dweb', 'ipfs', 'ipns', 'ssb', 'gopher', :relative].freeze

    CLASS_WHITELIST_TRANSFORMER = lambda do |env|
      node = env[:node]