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
ed5d59d4
Commit
ed5d59d4
authored
Apr 01, 2017
by
mhasbini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix symlink icon in project tree
parent
9fc17f6f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
2 deletions
+7
-2
changelogs/unreleased/22303-symbolic-in-tree.yml
changelogs/unreleased/22303-symbolic-in-tree.yml
+4
-0
lib/api/entities.rb
lib/api/entities.rb
+1
-1
lib/gitlab/git/tree.rb
lib/gitlab/git/tree.rb
+1
-1
spec/lib/gitlab/git/tree_spec.rb
spec/lib/gitlab/git/tree_spec.rb
+1
-0
No files found.
changelogs/unreleased/22303-symbolic-in-tree.yml
0 → 100644
View file @
ed5d59d4
---
title
:
Fix symlink icon in project tree
merge_request
:
9780
author
:
mhasbini
lib/api/entities.rb
View file @
ed5d59d4
...
@@ -204,7 +204,7 @@ module API
...
@@ -204,7 +204,7 @@ module API
expose
:id
,
:name
,
:type
,
:path
expose
:id
,
:name
,
:type
,
:path
expose
:mode
do
|
obj
,
options
|
expose
:mode
do
|
obj
,
options
|
filemode
=
obj
.
mode
.
to_s
(
8
)
filemode
=
obj
.
mode
filemode
=
"0"
+
filemode
if
filemode
.
length
<
6
filemode
=
"0"
+
filemode
if
filemode
.
length
<
6
filemode
filemode
end
end
...
...
lib/gitlab/git/tree.rb
View file @
ed5d59d4
...
@@ -33,7 +33,7 @@ module Gitlab
...
@@ -33,7 +33,7 @@ module Gitlab
root_id:
root_tree
.
oid
,
root_id:
root_tree
.
oid
,
name:
entry
[
:name
],
name:
entry
[
:name
],
type:
entry
[
:type
],
type:
entry
[
:type
],
mode:
entry
[
:filemode
],
mode:
entry
[
:filemode
]
.
to_s
(
8
)
,
path:
path
?
File
.
join
(
path
,
entry
[
:name
])
:
entry
[
:name
],
path:
path
?
File
.
join
(
path
,
entry
[
:name
])
:
entry
[
:name
],
commit_id:
sha
,
commit_id:
sha
,
)
)
...
...
spec/lib/gitlab/git/tree_spec.rb
View file @
ed5d59d4
...
@@ -19,6 +19,7 @@ describe Gitlab::Git::Tree, seed_helper: true do
...
@@ -19,6 +19,7 @@ describe Gitlab::Git::Tree, seed_helper: true do
it
{
expect
(
dir
.
commit_id
).
to
eq
(
SeedRepo
::
Commit
::
ID
)
}
it
{
expect
(
dir
.
commit_id
).
to
eq
(
SeedRepo
::
Commit
::
ID
)
}
it
{
expect
(
dir
.
name
).
to
eq
(
'encoding'
)
}
it
{
expect
(
dir
.
name
).
to
eq
(
'encoding'
)
}
it
{
expect
(
dir
.
path
).
to
eq
(
'encoding'
)
}
it
{
expect
(
dir
.
path
).
to
eq
(
'encoding'
)
}
it
{
expect
(
dir
.
mode
).
to
eq
(
'40000'
)
}
context
:subdir
do
context
:subdir
do
let
(
:subdir
)
{
Gitlab
::
Git
::
Tree
.
where
(
repository
,
SeedRepo
::
Commit
::
ID
,
'files'
).
first
}
let
(
:subdir
)
{
Gitlab
::
Git
::
Tree
.
where
(
repository
,
SeedRepo
::
Commit
::
ID
,
'files'
).
first
}
...
...
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