diff options
author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-02 14:04:34 +0200 |
---|---|---|
committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-02 14:04:34 +0200 |
commit | 93bc1ff10866956f3d6edf60a1b2db280544be04 (patch) | |
tree | f2aa50df86fd7b9e3f971ae703420199e05a662e /app/views/events/event/_push.html.haml | |
parent | 2022ae69df130542fe2a6ffe51c106e2942c884d (diff) | |
parent | 0187ae4e8689f0fc2fd399b65973792395534853 (diff) | |
download | gitlab-ce-93bc1ff10866956f3d6edf60a1b2db280544be04.tar.gz |
Merge branch 'master' into fix-messages-for-deleted-things
Diffstat (limited to 'app/views/events/event/_push.html.haml')
-rw-r--r-- | app/views/events/event/_push.html.haml | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml new file mode 100644 index 00000000000..869321ed699 --- /dev/null +++ b/app/views/events/event/_push.html.haml @@ -0,0 +1,25 @@ +.event-title + %span.author_name= link_to_author event + %span.event_label.pushed #{event.push_action_name} #{event.ref_type} + - if event.rm_ref? + %strong= event.ref_name + - else + = link_to project_commits_path(event.project, event.ref_name) do + %strong= event.ref_name + at + %strong= link_to event.project.name, event.project + +- if event.push_with_commits? + - project = event.project + .event-body + %ul.unstyled.event_commits + - few_commits = event.commits[0...2] + - few_commits.each do |commit| + = render "events/commit", commit: commit, project: project + + - if event.commits_count > 1 + %li.commits-stat + - if event.commits_count > 2 + %span ... and #{event.commits_count - 2} more commits. + = link_to project_compare_path(event.project, from: event.parent_commit.id, to: event.last_commit.id) do + %strong Compare → #{event.parent_commit.id[0..7]}...#{event.last_commit.id[0..7]} |