summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-11 01:43:18 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-11 01:43:18 +0000
commit0d5d1f0e6fcd80fcf42dc9ab84ef3d146e47dc91 (patch)
tree3f0c82da17594a945792eaedd961ef226747ebaf
parent3a82302fcbe938f5ee20f88272a8d8fefa879c7e (diff)
parentcdda82757781bbae12bb06c92ad58cd9532f1b27 (diff)
downloadgitlab-ce-0d5d1f0e6fcd80fcf42dc9ab84ef3d146e47dc91.tar.gz
Merge branch 'remove_check_icon_from_mr_page' into 'master'
Remove check icon from merged MRs Now that GitLab CI exposes the status of each MR in the MR page it seems "redundant" to have an extra icon next to the CI statuses. The "downside" is with people that don't use CI and don't see the statuses, but I don't think that this is that big a change that would miss to anyone. \cc @dzaporozhets @creamzy How it looks now: ![screenshot-gitlab_com_2015-12-10_20-49-53](/uploads/414dcb5131eab2d9518dc77019116c96/screenshot-gitlab_com_2015-12-10_20-49-53.png) See merge request !2059
-rw-r--r--app/views/projects/merge_requests/_merge_request.html.haml1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index cf9570f7c7e..105c731c7e1 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -5,7 +5,6 @@
%ul.controls.light
- if merge_request.merged?
%li
- = icon('check')
MERGED
- elsif merge_request.closed?
%li