diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 6b3455c594c8b89f0474e8a1c497daa2483c9fed..ddf74db554d38d14584b819511729e3ae1a13a3e 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -871,7 +871,7 @@ p.time { .event_feed { min-height:40px; - border-bottom:1px solid #eee; + border-bottom:1px solid #ddd; .avatar { width:32px; } @@ -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 } } diff --git a/app/views/events/_commit.html.haml b/app/views/events/_commit.html.haml new file mode 100644 index 0000000000000000000000000000000000000000..60112b508a8874e7944a0b505f5bdb99b73a4f9b --- /dev/null +++ b/app/views/events/_commit.html.haml @@ -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" + diff --git a/app/views/events/_event_changed_merge_request.html.haml b/app/views/events/_event_changed_merge_request.html.haml index ff91375e901a3bd60df8d3065b2e9d093ad51bf5..1a4da6cd251520b673151b94a9ffcf6e9a38eae9 100644 --- a/app/views/events/_event_changed_merge_request.html.haml +++ b/app/views/events/_event_changed_merge_request.html.haml @@ -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 diff --git a/app/views/events/_event_new_merge_request.html.haml b/app/views/events/_event_new_merge_request.html.haml index e3d8ab2a62dc9dd8c2fd19ae4b81045965bee658..ecb86710e82ee3904d4334fde6833a34e072e973 100644 --- a/app/views/events/_event_new_merge_request.html.haml +++ b/app/views/events/_event_new_merge_request.html.haml @@ -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 diff --git a/app/views/events/_event_push.html.haml b/app/views/events/_event_push.html.haml index f09aac29bfc80d5b5a993ca8f8a6d6f0f6a43bf4..b24d29705339db2d8b357c912148a25679b789c2 100644 --- a/app/views/events/_event_push.html.haml +++ b/app/views/events/_event_push.html.haml @@ -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