diff options
| author | Sullivan SENECHAL <soullivaneuh@gmail.com> | 2014-10-02 00:21:29 +0200 |
|---|---|---|
| committer | Sullivan SENECHAL <soullivaneuh@gmail.com> | 2014-10-03 12:19:24 +0200 |
| commit | 5d8be4438add1183d91e030b852c628cf09f4916 (patch) | |
| tree | fc06a25a526de719d3bc9c7ba5d4ebb4fe69a828 /app/views/projects/merge_requests/_merge_request.html.haml | |
| parent | 0cc30145f441a16ce513bba942ea67ede4086a7f (diff) | |
| download | gitlab-ce-5d8be4438add1183d91e030b852c628cf09f4916.tar.gz | |
Upgrade to Font Awesome v4.2
Diffstat (limited to 'app/views/projects/merge_requests/_merge_request.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 2649fb55c30..647e8873e9e 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -4,7 +4,7 @@ = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title" - if merge_request.merged? %small.pull-right - %i.icon-ok + %i.fa.fa-check MERGED - else %span.pull-right @@ -12,7 +12,7 @@ %span.light #{merge_request.source_project_namespace}: = truncate merge_request.source_branch, length: 25 - %i.icon-angle-right.light + %i.fa.fa-angle-right.light = merge_request.target_branch .merge-request-info - if merge_request.author @@ -21,11 +21,11 @@ = render 'votes/votes_inline', votable: merge_request - if merge_request.notes.any? %span - %i.icon-comments + %i.fa.fa-comments = merge_request.mr_and_commit_notes.count - if merge_request.milestone_id? %span - %i.icon-time + %i.fa.fa-clock-o = merge_request.milestone.title |