diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-19 23:00:44 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-19 23:00:44 +0400 |
| commit | d1aff25ca4d20c39340936b2fa2976349f028e43 (patch) | |
| tree | 446e78db5c883967c647522e0e4732dd8d273e95 /app/views/projects/merge_requests/show/_mr_box.html.haml | |
| parent | 3cdb8f26c9c1580d33557a0f619a90989df23245 (diff) | |
Consistent place for state-label across issues, mr, milestones
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/merge_requests/show/_mr_box.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_box.html.haml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml index 02d5d2915c0..2d80a766523 100644 --- a/app/views/projects/merge_requests/show/_mr_box.html.haml +++ b/app/views/projects/merge_requests/show/_mr_box.html.haml @@ -2,18 +2,11 @@ .ui-box-head %h4.box-title = gfm escape_once(@merge_request.title) - - if @merge_request.merged? - .state-label.state-label-green - %i.icon-ok - Merged - - elsif @merge_request.closed? - .state-label.state-label-red - Closed .ui-box-body %div %cite.cgray - Created on #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}. + Created by #{link_to_member(@project, @merge_request.author)}. - if @merge_request.assignee Currently assigned to #{link_to_member(@project, @merge_request.assignee)}. - if @merge_request.milestone |