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 /config | |
| 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 'config')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index bd4578848c5..fa399533e52 100644 --- a/config/application.rb +++ b/config/application.rb @@ -50,6 +50,8 @@ module Gitlab # 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. |