diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-07-31 00:24:13 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-07-31 00:24:13 +0300 |
| commit | 6d6f807b759d13d111202129d8be2c88d7be819f (patch) | |
| tree | 9acf6adf834a1d47bedaf887de11bf4648e1e2f8 /lib | |
| parent | bd72b5bd32c64606a498066cadf9f765be059b9d (diff) | |
| parent | 1cd28600652e23c8605b9344e269c34e83edccd1 (diff) | |
Merge branch 'fix-image-file-is-not-displayed' into 'master'
Update RelativeLinkFilter to support non-ASCII filenames
See merge request !1050
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/markdown/relative_link_filter.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/markdown/relative_link_filter.rb b/lib/gitlab/markdown/relative_link_filter.rb index 9de2b24a9da..3eaceba5323 100644 --- a/lib/gitlab/markdown/relative_link_filter.rb +++ b/lib/gitlab/markdown/relative_link_filter.rb @@ -98,9 +98,10 @@ module Gitlab # # Returns a String def path_type(path) - if repository.tree(current_sha, path).entries.any? + unescaped_path = Addressable::URI.unescape(path) + if repository.tree(current_sha, unescaped_path).entries.any? 'tree' - elsif repository.blob_at(current_sha, path).try(:image?) + elsif repository.blob_at(current_sha, unescaped_path).try(:image?) 'raw' else 'blob' |