diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-21 01:59:35 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-21 01:59:35 +0400 |
commit | b57faf9282d7df6cdd62953d474652a0ae2e6896 (patch) | |
tree | f0d5b826df373191b4681452fc2ae4c5970cef4a /app/views | |
parent | cadf12c60cc27c5b0b8273c1de4b190a0e88bd7d (diff) |
Push events polishedv2.3.0
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/events/_commit.html.haml | 9 | ||||
-rw-r--r-- | app/views/events/_event_changed_merge_request.html.haml | 1 | ||||
-rw-r--r-- | app/views/events/_event_new_merge_request.html.haml | 1 | ||||
-rw-r--r-- | app/views/events/_event_push.html.haml | 15 |
4 files changed, 20 insertions, 6 deletions
diff --git a/app/views/events/_commit.html.haml b/app/views/events/_commit.html.haml new file mode 100644 index 00000000000..60112b508a8 --- /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 ff91375e901..1a4da6cd251 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 e3d8ab2a62d..ecb86710e82 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 f09aac29bfc..b24d2970533 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 |