BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
6d6f807b
Commit
6d6f807b
authored
Jul 30, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-image-file-is-not-displayed' into 'master'
Update RelativeLinkFilter to support non-ASCII filenames See merge request !1050
parents
bd72b5bd
1cd28600
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
CHANGELOG
CHANGELOG
+1
-0
relative_link_filter.rb
lib/gitlab/markdown/relative_link_filter.rb
+3
-2
No files found.
CHANGELOG
View file @
6d6f807b
...
...
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 7.14.0 (unreleased)
- Fix network graph when branch name has single quotes (Stan Hu)
- Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network graphs (Stan Hu)
- Fix the image file that contains non-ascii character is not displayed(Hiroyuki Sato)
- Fix URL used for refreshing notes if relative_url is present (Bartłomiej Święcki)
- Fix commit data retrieval when branch name has single quotes (Stan Hu)
- Check that project was actually created rather than just validated in import:repos task (Stan Hu)
...
...
lib/gitlab/markdown/relative_link_filter.rb
View file @
6d6f807b
...
...
@@ -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'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment