Skip to content
Snippets Groups Projects
Commit b57faf92 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Push events polished

parent cadf12c6
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -871,7 +871,7 @@ p.time {
 
.event_feed {
min-height:40px;
border-bottom:1px solid #eee;
border-bottom:1px solid #ddd;
.avatar {
width:32px;
}
Loading
Loading
@@ -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 }
}
Loading
Loading
%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"
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment