Commit f29a7ce5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'markdown-smb-link' into 'master'

Allow smb:// links in Markdown text.

As requested by Sam McLeod at https://gitlab.com/gitlab-org/gitlab-ce/issues/1184

See merge request !1669
......@@ -60,6 +60,7 @@ v 7.8.4
v 7.8.3
- Bump version of gitlab_git fixing annotated tags without message
- Allow smb:// links in Markdown text.
v 7.8.2
- Fix service migration issue when upgrading from versions prior to 7.3
......
......@@ -121,7 +121,7 @@ def link_to_ignore?(link)
end
def ignored_protocols
["http://","https://", "ftp://", "mailto:"]
["http://","https://", "ftp://", "mailto:", "smb://"]
end
def rebuild_path(file_path)
......
......@@ -50,6 +50,8 @@ class Application < Rails::Application
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
config.action_view.sanitized_allowed_protocols = %w(smb)
# Relative url support
# Uncomment and customize the last line to run in a non-root path
# WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
......
......@@ -11,6 +11,12 @@ def initialize(template, color_scheme, options = {})
super options
end
def preprocess(full_document)
# Redcarpet doesn't allow SMB links when `safe_links_only` is enabled.
# FTP links are allowed, so we trick Redcarpet.
full_document.gsub("smb://", "ftp://smb:")
end
# If project has issue number 39, apostrophe will be linked in
# regular text to the issue as Redcarpet will convert apostrophe to
# #39;
......@@ -55,6 +61,8 @@ def header(text, level)
end
def postprocess(full_document)
full_document.gsub!("ftp://smb:", "smb://")
full_document.gsub!("&rsquo;", "'")
unless @template.instance_variable_get("@project_wiki") || @project.nil?
full_document = h.create_relative_links(full_document)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment