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
866b9f6d
Commit
866b9f6d
authored
Oct 16, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make history link for trees look like action links for blobs
parent
536eb8e8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
7 deletions
+11
-7
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+4
-0
app/views/tree/_submodule_item.html.haml
app/views/tree/_submodule_item.html.haml
+1
-1
app/views/tree/_tree.html.haml
app/views/tree/_tree.html.haml
+3
-3
app/views/tree/_tree_item.html.haml
app/views/tree/_tree_item.html.haml
+1
-1
features/steps/project/project_browse_files.rb
features/steps/project/project_browse_files.rb
+2
-2
No files found.
app/assets/stylesheets/sections/tree.scss
View file @
866b9f6d
...
@@ -43,6 +43,10 @@
...
@@ -43,6 +43,10 @@
}
}
.tree-table
{
.tree-table
{
th
.btn
{
margin
:
-2px
-1px
;
padding
:
2px
10px
;
}
td
{
td
{
background
:
#fafafa
;
background
:
#fafafa
;
}
}
...
...
app/views/tree/_submodule_item.html.haml
View file @
866b9f6d
...
@@ -7,5 +7,5 @@
...
@@ -7,5 +7,5 @@
%strong
=
truncate
(
name
,
length:
40
)
%strong
=
truncate
(
name
,
length:
40
)
%td
%td
%code
=
submodule_item
.
id
[
0
..
10
]
%code
=
submodule_item
.
id
[
0
..
10
]
%td
%td
{
colspan:
2
}
=
link_to
truncate
(
url
,
length:
40
),
url
=
link_to
truncate
(
url
,
length:
40
),
url
app/views/tree/_tree.html.haml
View file @
866b9f6d
...
@@ -18,9 +18,8 @@
...
@@ -18,9 +18,8 @@
%thead
%thead
%th
Name
%th
Name
%th
Last Update
%th
Last Update
%th
%th
Last Commit
Last commit
%th
=
link_to
"history"
,
project_commits_path
(
@project
,
@id
),
class:
"btn very_small right"
=
link_to
"History"
,
tree
.
history_path
,
class:
"right"
-
if
tree
.
up_dir?
-
if
tree
.
up_dir?
%tr
.tree-item
%tr
.tree-item
...
@@ -29,6 +28,7 @@
...
@@ -29,6 +28,7 @@
=
link_to
".."
,
tree
.
up_dir_path
=
link_to
".."
,
tree
.
up_dir_path
%td
%td
%td
%td
%td
=
render_tree
(
tree
.
contents
)
=
render_tree
(
tree
.
contents
)
...
...
app/views/tree/_tree_item.html.haml
View file @
866b9f6d
...
@@ -6,4 +6,4 @@
...
@@ -6,4 +6,4 @@
%span
.log_loading.hide
%span
.log_loading.hide
Loading commit data...
Loading commit data...
=
image_tag
"ajax_loader_tree.gif"
,
width:
14
=
image_tag
"ajax_loader_tree.gif"
,
width:
14
%td
.tree_commit
%td
.tree_commit
{
colspan:
2
}
features/steps/project/project_browse_files.rb
View file @
866b9f6d
...
@@ -5,14 +5,14 @@ class ProjectBrowseFiles < Spinach::FeatureSteps
...
@@ -5,14 +5,14 @@ class ProjectBrowseFiles < Spinach::FeatureSteps
Then
'I should see files from repository'
do
Then
'I should see files from repository'
do
page
.
should
have_content
"app"
page
.
should
have_content
"app"
page
.
should
have_content
"
H
istory"
page
.
should
have_content
"
h
istory"
page
.
should
have_content
"Gemfile"
page
.
should
have_content
"Gemfile"
end
end
Then
'I should see files from repository for "8470d70"'
do
Then
'I should see files from repository for "8470d70"'
do
current_path
.
should
==
project_tree_path
(
@project
,
"8470d70"
)
current_path
.
should
==
project_tree_path
(
@project
,
"8470d70"
)
page
.
should
have_content
"app"
page
.
should
have_content
"app"
page
.
should
have_content
"
H
istory"
page
.
should
have_content
"
h
istory"
page
.
should
have_content
"Gemfile"
page
.
should
have_content
"Gemfile"
end
end
...
...
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