Push events polished
This commit is contained in:
parent
cadf12c60c
commit
b57faf9282
5 changed files with 21 additions and 9 deletions
|
@ -871,7 +871,7 @@ p.time {
|
||||||
|
|
||||||
.event_feed {
|
.event_feed {
|
||||||
min-height:40px;
|
min-height:40px;
|
||||||
border-bottom:1px solid #eee;
|
border-bottom:1px solid #ddd;
|
||||||
.avatar {
|
.avatar {
|
||||||
width:32px;
|
width:32px;
|
||||||
}
|
}
|
||||||
|
@ -884,8 +884,6 @@ p.time {
|
||||||
}
|
}
|
||||||
|
|
||||||
padding: 15px 5px;
|
padding: 15px 5px;
|
||||||
border-bottom: 1px solid #eee;
|
|
||||||
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
|
|
||||||
&:last-child { border:none }
|
&:last-child { border:none }
|
||||||
.wll:hover { background:none }
|
.wll:hover { background:none }
|
||||||
}
|
}
|
||||||
|
|
9
app/views/events/_commit.html.haml
Normal file
9
app/views/events/_commit.html.haml
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
%li.wll.commit
|
||||||
|
= link_to project_commit_path(project, :id => commit.id) do
|
||||||
|
%p
|
||||||
|
%code.left= commit.id.to_s[0..10]
|
||||||
|
%strong.cgray= commit.author_name
|
||||||
|
–
|
||||||
|
= image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
|
||||||
|
%span.row_title= truncate(commit.safe_message, :length => 50) rescue "--broken encoding"
|
||||||
|
|
|
@ -13,6 +13,7 @@ at
|
||||||
%span.cgray
|
%span.cgray
|
||||||
= time_ago_in_words(event.created_at)
|
= time_ago_in_words(event.created_at)
|
||||||
ago.
|
ago.
|
||||||
|
%br
|
||||||
%span.label= event.merge_request.source_branch
|
%span.label= event.merge_request.source_branch
|
||||||
→
|
→
|
||||||
%span.label= event.merge_request.target_branch
|
%span.label= event.merge_request.target_branch
|
||||||
|
|
|
@ -9,6 +9,7 @@ at
|
||||||
%span.cgray
|
%span.cgray
|
||||||
= time_ago_in_words(event.created_at)
|
= time_ago_in_words(event.created_at)
|
||||||
ago.
|
ago.
|
||||||
|
%br
|
||||||
%span.label= event.merge_request.source_branch
|
%span.label= event.merge_request.source_branch
|
||||||
→
|
→
|
||||||
%span.label= event.merge_request.target_branch
|
%span.label= event.merge_request.target_branch
|
||||||
|
|
|
@ -30,13 +30,16 @@
|
||||||
ago.
|
ago.
|
||||||
- if event.commits.count > 1
|
- if event.commits.count > 1
|
||||||
= link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do
|
= link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do
|
||||||
Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]}
|
%strong #{event.commits.first.commit.id[0..7]}...#{event.commits.last.id[0..7]}
|
||||||
- @project = event.project
|
- project = event.project
|
||||||
%ul.unstyled.event_commits
|
%ul.unstyled.event_commits
|
||||||
- if event.commits.size > 3
|
- if event.commits.size > 3
|
||||||
= render event.commits[0...2]
|
- event.commits[0...2].each do |commit|
|
||||||
%li ... and #{event.commits.size - 2} more commits
|
= render "events/commit", :commit => commit, :project => project
|
||||||
|
%li
|
||||||
|
%br
|
||||||
|
\... and #{event.commits.size - 2} more commits
|
||||||
- else
|
- else
|
||||||
= render event.commits
|
- event.commits.each do |commit|
|
||||||
|
= render "events/commit", :commit => commit, :project => project
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue