merging upstream changes

This commit is contained in:
Steven Verbeek 2012-03-21 00:21:34 -03:00
commit fafc34b0db
5 changed files with 22 additions and 10 deletions

View file

@ -875,7 +875,7 @@ p.time {
.event_feed {
min-height:40px;
border-bottom:1px solid #eee;
border-bottom:1px solid #ddd;
.avatar {
width:32px;
}
@ -887,9 +887,7 @@ p.time {
}
}
padding: 10px 5px;
border-bottom: 1px solid #eee;
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
padding: 15px 5px;
&:last-child { border:none }
.wll:hover { background:none }
}

View 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"

View file

@ -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

View file

@ -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

View file

@ -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