tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
This commit is contained in:
Thibaut Girka
2020-01-24 14:37:06 +01:00
parent a8c109baca 4bae4e972d
commit 9adeaf2bfc
251 changed files with 2910 additions and 770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/sanitize_config.rb
View File

@ -2,7 +2,7 @@
class Sanitize
module Config
HTTP_PROTOCOLS ||= ['http', 'https', 'dat', 'dweb', 'ipfs', 'ipns', 'ssb', 'gopher', 'xmpp', :relative].freeze
HTTP_PROTOCOLS ||= ['http', 'https', 'dat', 'dweb', 'ipfs', 'ipns', 'ssb', 'gopher', 'xmpp', 'magnet', :relative].freeze
CLASS_WHITELIST_TRANSFORMER = lambda do |env|
node = env[:node]