Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
49039103
Commit
49039103
authored
Sep 11, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1438 from SaitoWu/bugfix/1434
tree view need use ascii-8bit, file name need be utf8.
parents
9fb595eb
96d4f22e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
app/helpers/tree_helper.rb
app/helpers/tree_helper.rb
+2
-1
app/models/tree.rb
app/models/tree.rb
+1
-1
app/views/refs/_tree_file.html.haml
app/views/refs/_tree_file.html.haml
+1
-1
No files found.
app/helpers/tree_helper.rb
View file @
49039103
...
@@ -18,7 +18,8 @@ module TreeHelper
...
@@ -18,7 +18,8 @@ module TreeHelper
end
end
def
tree_full_path
(
content
)
def
tree_full_path
(
content
)
if
params
[
:path
]
content
.
name
.
force_encoding
(
'utf-8'
)
if
params
[
:path
]
File
.
join
(
params
[
:path
],
content
.
name
)
File
.
join
(
params
[
:path
],
content
.
name
)
else
else
content
.
name
content
.
name
...
...
app/models/tree.rb
View file @
49039103
...
@@ -16,7 +16,7 @@ class Tree
...
@@ -16,7 +16,7 @@ class Tree
def
initialize
(
raw_tree
,
project
,
ref
=
nil
,
path
=
nil
)
def
initialize
(
raw_tree
,
project
,
ref
=
nil
,
path
=
nil
)
@project
,
@ref
,
@path
=
project
,
ref
,
path
,
@project
,
@ref
,
@path
=
project
,
ref
,
path
,
@tree
=
if
path
@tree
=
if
path
raw_tree
/
path
raw_tree
/
path
.
dup
.
force_encoding
(
'ascii-8bit'
)
else
else
raw_tree
raw_tree
end
end
...
...
app/views/refs/_tree_file.html.haml
View file @
49039103
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.file_title
.file_title
%i
.icon-file
%i
.icon-file
%span
.file_name
%span
.file_name
=
name
=
name
.
force_encoding
(
'utf-8'
)
%small
#{
file
.
mode
}
%small
#{
file
.
mode
}
%span
.options
%span
.options
=
link_to
"raw"
,
blob_project_ref_path
(
@project
,
@ref
,
path:
params
[
:path
]),
class:
"btn very_small"
,
target:
"_blank"
=
link_to
"raw"
,
blob_project_ref_path
(
@project
,
@ref
,
path:
params
[
:path
]),
class:
"btn very_small"
,
target:
"_blank"
...
...
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