diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-18 16:10:11 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-23 21:29:44 +0300 |
| commit | d37fa9db9e67a8d95dc92cc92b8d1e3af74f670d (patch) | |
| tree | 035a4f3a92e7ad9104ada3e34e6774e285650c4b /lib | |
| parent | a767bb46901bb8fc0f312d45d3c6d6bc22163760 (diff) | |
Merge branch '18819-wiki-link-filter-exception' into 'master'
Fix bug in `WikiLinkFilter`.
Closes #18819
- [ ] #18819 Wiki link filter exception
- [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/6d169d36cabda783116bcb8e2e6f73254566a670/builds) passes
- [ ] Wait for merge
- [ ] Pick into 8.9
See merge request !4775
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/filter/wiki_link_filter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/banzai/filter/wiki_link_filter.rb b/lib/banzai/filter/wiki_link_filter.rb index 37a2779d453..1bb6d6bba87 100644 --- a/lib/banzai/filter/wiki_link_filter.rb +++ b/lib/banzai/filter/wiki_link_filter.rb @@ -29,7 +29,7 @@ module Banzai return if html_attr.blank? html_attr.value = apply_rewrite_rules(html_attr.value) - rescue URI::Error + rescue URI::Error, Addressable::URI::InvalidURIError # noop end |