diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-12 03:57:52 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-12 03:57:52 +0000 |
| commit | f29a7ce51f1f9d859258e190cf1d01c3d58806e1 (patch) | |
| tree | d9c9fc124f0428d766d009c615f0ee823df9c081 /app/helpers/gitlab_markdown_helper.rb | |
| parent | 85e3b25c04f33a73886d6294a54045b8e71c3545 (diff) | |
| parent | 11e966d7a93ec0a745cde65021fa79a6a6b24667 (diff) | |
| download | gitlab-ce-f29a7ce51f1f9d859258e190cf1d01c3d58806e1.tar.gz | |
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
Diffstat (limited to 'app/helpers/gitlab_markdown_helper.rb')
| -rw-r--r-- | app/helpers/gitlab_markdown_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb index daaefe90f18..f8e104b0827 100644 --- a/app/helpers/gitlab_markdown_helper.rb +++ b/app/helpers/gitlab_markdown_helper.rb @@ -121,7 +121,7 @@ module GitlabMarkdownHelper end def ignored_protocols - ["http://","https://", "ftp://", "mailto:"] + ["http://","https://", "ftp://", "mailto:", "smb://"] end def rebuild_path(file_path) |