Skip to content
This repository has been archived by the owner on Jul 26, 2018. It is now read-only.

Commit

Permalink
Push events polished
Browse files Browse the repository at this point in the history
  • Loading branch information
dzaporozhets committed Mar 20, 2012
1 parent cadf12c commit b57faf9
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 9 deletions.
4 changes: 1 addition & 3 deletions app/assets/stylesheets/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ p.time {

.event_feed {
min-height:40px;
border-bottom:1px solid #eee;
border-bottom:1px solid #ddd;
.avatar {
width:32px;
}
Expand All @@ -884,8 +884,6 @@ p.time {
}

padding: 15px 5px;
border-bottom: 1px solid #eee;
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
&:last-child { border:none }
.wll:hover { background:none }
}
Expand Down
9 changes: 9 additions & 0 deletions app/views/events/_commit.html.haml
Original file line number Diff line number Diff line change
@@ -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"

1 change: 1 addition & 0 deletions app/views/events/_event_changed_merge_request.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ at
%span.cgray
= time_ago_in_words(event.created_at)
ago.
%br
%span.label= event.merge_request.source_branch
→
%span.label= event.merge_request.target_branch
Expand Down
1 change: 1 addition & 0 deletions app/views/events/_event_new_merge_request.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ at
%span.cgray
= time_ago_in_words(event.created_at)
ago.
%br
%span.label= event.merge_request.source_branch
→
%span.label= event.merge_request.target_branch
Expand Down
15 changes: 9 additions & 6 deletions app/views/events/_event_push.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,16 @@
ago.
- 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
Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]}
- @project = event.project
%strong #{event.commits.first.commit.id[0..7]}...#{event.commits.last.id[0..7]}
- project = event.project
%ul.unstyled.event_commits
- if event.commits.size > 3
= render event.commits[0...2]
%li ... and #{event.commits.size - 2} more commits
- event.commits[0...2].each do |commit|
= render "events/commit", :commit => commit, :project => project
%li
%br
\... and #{event.commits.size - 2} more commits
- else
= render event.commits

- event.commits.each do |commit|
= render "events/commit", :commit => commit, :project => project

0 comments on commit b57faf9

Please sign in to comment.