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
4fd73683
Commit
4fd73683
authored
Oct 18, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update author info in tree view
parent
aef2031a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
13 deletions
+23
-13
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+18
-6
app/views/refs/logs_tree.js.haml
app/views/refs/logs_tree.js.haml
+3
-4
app/views/tree/_tree_commit.html.haml
app/views/tree/_tree_commit.html.haml
+0
-3
app/views/tree/_tree_commit_column.html.haml
app/views/tree/_tree_commit_column.html.haml
+2
-0
No files found.
app/assets/stylesheets/sections/tree.scss
View file @
4fd73683
...
...
@@ -52,14 +52,26 @@
}
}
.tree-commit-link
{
color
:
#333
;
.tree_author
{
padding-right
:
8px
;
img
.avatar
{
border
:
0
none
;
float
:
none
;
margin-right
:
0
;
padding
:
0
;
width
:
16px
;
}
}
a
.tree-commit-link
{
color
:
#666
;
&
:hover
{
text-decoration
:
underline
;
.tree_commit
{
color
:
gray
;
.tree-commit-link
{
color
:
#444
;
&
:hover
{
text-decoration
:
underline
;
}
}
}
}
...
...
app/views/refs/logs_tree.js.haml
View file @
4fd73683
-
@logs
.
each
do
|
content_data
|
-
file_name
=
content_data
[
:file_name
]
-
content_commit
=
content_data
[
:commit
]
-
tm
=
@project
.
team_member_by_name_or_email
(
content_commit
.
author_email
,
content_commit
.
author_name
)
-
commit
=
content_data
[
:commit
]
:plain
var row = $("table.table_
#{
@hex_path
}
tr.file_
#{
hexdigest
(
file_name
)
}
");
row.find("td.tree_time_ago").html('
#{
escape_javascript
(
time_ago_in_words
(
content_commit
.
committed_date
)
)
}
ago');
row.find("td.tree_commit").html('
#{
escape_javascript
(
render
(
"tree/tree_commit"
,
tm:
tm
,
content_commit:
content_commit
)
)
}
');
row.find("td.tree_time_ago").html('
#{
escape_javascript
time_ago_in_words
(
commit
.
committed_date
)
}
ago');
row.find("td.tree_commit").html('
#{
escape_javascript
render
(
"tree/tree_commit_column"
,
commit:
commit
)
}
');
app/views/tree/_tree_commit.html.haml
deleted
100644 → 0
View file @
aef2031a
-
if
tm
=
link_to
"[
#{
tm
.
user_name
}
]"
,
project_team_member_path
(
@project
,
tm
)
=
link_to_gfm
truncate
(
content_commit
.
title
,
length:
tm
?
30
:
50
),
project_commit_path
(
@project
,
content_commit
.
id
),
class:
"tree-commit-link"
app/views/tree/_tree_commit_column.html.haml
0 → 100644
View file @
4fd73683
%span
.tree_author
=
commit
.
author_link
avatar:
true
=
link_to_gfm
truncate
(
commit
.
title
,
length:
80
),
project_commit_path
(
@project
,
commit
.
id
),
class:
"tree-commit-link"
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