Download as
Browse Code »

Commit fafc34b0db23844577e0a99273877c956d087d96

Authored by Steven Verbeek
2 parents 35d0de8f b57faf92
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

merging upstream changes

Showing 5 changed files with 22 additions and 10 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @fafc34b
... ... @@ -875,7 +875,7 @@ p.time {
875 875  
876 876 .event_feed {
877 877 min-height:40px;
878   - border-bottom:1px solid #eee;
  878 + border-bottom:1px solid #ddd;
879 879 .avatar {
880 880 width:32px;
881 881 }
... ... @@ -887,9 +887,7 @@ p.time {
887 887 }
888 888 }
889 889  
890   - padding: 10px 5px;
891   - border-bottom: 1px solid #eee;
892   - border-bottom: 1px solid rgba(0, 0, 0, 0.05);
  890 + padding: 15px 5px;
893 891 &:last-child { border:none }
894 892 .wll:hover { background:none }
895 893 }
... ...
app/views/events/_commit.html.haml 0 → 100644
  Diff comments   View file @fafc34b
... ... @@ -0,0 +1,9 @@
  1 +%li.wll.commit
  2 + = link_to project_commit_path(project, :id => commit.id) do
  3 + %p
  4 + %code.left= commit.id.to_s[0..10]
  5 + %strong.cgray= commit.author_name
  6 + –
  7 + = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
  8 + %span.row_title= truncate(commit.safe_message, :length => 50) rescue "--broken encoding"
  9 +
... ...
app/views/events/_event_changed_merge_request.html.haml
  Diff comments   View file @fafc34b
... ... @@ -13,6 +13,7 @@ at
13 13 %span.cgray
14 14 = time_ago_in_words(event.created_at)
15 15 ago.
  16 +%br
16 17 %span.label= event.merge_request.source_branch
17 18 →
18 19 %span.label= event.merge_request.target_branch
... ...
app/views/events/_event_new_merge_request.html.haml
  Diff comments   View file @fafc34b
... ... @@ -9,6 +9,7 @@ at
9 9 %span.cgray
10 10 = time_ago_in_words(event.created_at)
11 11 ago.
  12 +%br
12 13 %span.label= event.merge_request.source_branch
13 14 →
14 15 %span.label= event.merge_request.target_branch
... ...
app/views/events/_event_push.html.haml
  Diff comments   View file @fafc34b
... ... @@ -30,13 +30,16 @@
30 30 ago.
31 31 - if event.commits.count > 1
32 32 = link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do
33   - Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]}
34   - - @project = event.project
  33 + %strong #{event.commits.first.commit.id[0..7]}...#{event.commits.last.id[0..7]}
  34 + - project = event.project
35 35 %ul.unstyled.event_commits
36 36 - if event.commits.size > 3
37   - = render event.commits[0...2]
38   - %li ... and #{event.commits.size - 2} more commits
  37 + - event.commits[0...2].each do |commit|
  38 + = render "events/commit", :commit => commit, :project => project
  39 + %li
  40 + %br
  41 + \... and #{event.commits.size - 2} more commits
39 42 - else
40   - = render event.commits
41   -
  43 + - event.commits.each do |commit|
  44 + = render "events/commit", :commit => commit, :project => project
42 45  
... ...