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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b75f9721
Commit
b75f9721
authored
Apr 11, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] Fix display blocks when they should be table-cell
parent
e44ceb96
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/projects/tree/_blob_item.html.haml
app/views/projects/tree/_blob_item.html.haml
+1
-1
app/views/projects/tree/_submodule_item.html.haml
app/views/projects/tree/_submodule_item.html.haml
+1
-1
app/views/projects/tree/_tree_content.html.haml
app/views/projects/tree/_tree_content.html.haml
+2
-2
app/views/projects/tree/_tree_item.html.haml
app/views/projects/tree/_tree_item.html.haml
+1
-1
No files found.
app/views/projects/tree/_blob_item.html.haml
View file @
b75f9721
...
@@ -7,6 +7,6 @@
...
@@ -7,6 +7,6 @@
%span
=
file_name
%span
=
file_name
-
if
is_lfs_blob
-
if
is_lfs_blob
%span
.label.label-lfs.prepend-left-5
LFS
%span
.label.label-lfs.prepend-left-5
LFS
%td
.d-none.d-sm-
block
.tree-commit
%td
.d-none.d-sm-
table-cell
.tree-commit
%td
.tree-time-ago.cgray.text-right
%td
.tree-time-ago.cgray.text-right
=
render
'projects/tree/spinner'
=
render
'projects/tree/spinner'
app/views/projects/tree/_submodule_item.html.haml
View file @
b75f9721
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
%i
.fa.fa-archive.fa-fw
%i
.fa.fa-archive.fa-fw
=
submodule_link
(
submodule_item
,
@ref
)
=
submodule_link
(
submodule_item
,
@ref
)
%td
%td
%td
.d-none.d-sm-
block
%td
.d-none.d-sm-
table-cell
app/views/projects/tree/_tree_content.html.haml
View file @
b75f9721
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
%thead
%thead
%tr
%tr
%th
=
s_
(
'ProjectFileTree|Name'
)
%th
=
s_
(
'ProjectFileTree|Name'
)
%th
.d-none.d-sm-
block
%th
.d-none.d-sm-
table-cell
.float-left
=
_
(
'Last commit'
)
.float-left
=
_
(
'Last commit'
)
%th
.text-right
=
_
(
'Last update'
)
%th
.text-right
=
_
(
'Last update'
)
-
if
@path
.
present?
-
if
@path
.
present?
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
%td
.tree-item-file-name
%td
.tree-item-file-name
=
link_to
".."
,
project_tree_path
(
@project
,
up_dir_path
),
class:
'prepend-left-10'
=
link_to
".."
,
project_tree_path
(
@project
,
up_dir_path
),
class:
'prepend-left-10'
%td
%td
%td
.d-none.d-sm-
block
%td
.d-none.d-sm-
table-cell
=
render_tree
(
tree
)
=
render_tree
(
tree
)
...
...
app/views/projects/tree/_tree_item.html.haml
View file @
b75f9721
...
@@ -4,6 +4,6 @@
...
@@ -4,6 +4,6 @@
-
path
=
flatten_tree
(
@path
,
tree_item
)
-
path
=
flatten_tree
(
@path
,
tree_item
)
=
link_to
project_tree_path
(
@project
,
tree_join
(
@id
||
@commit
.
id
,
path
)),
class:
'str-truncated'
,
title:
path
do
=
link_to
project_tree_path
(
@project
,
tree_join
(
@id
||
@commit
.
id
,
path
)),
class:
'str-truncated'
,
title:
path
do
%span
=
path
%span
=
path
%td
.d-none.d-sm-
block
.tree-commit
%td
.d-none.d-sm-
table-cell
.tree-commit
%td
.tree-time-ago.text-right
%td
.tree-time-ago.text-right
=
render
'projects/tree/spinner'
=
render
'projects/tree/spinner'
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