use green bg for merged MR badge

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c3cc601..ccc6f7a 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -195,6 +195,11 @@ p.time {
   top: -5px;
   @include border-radius(4px);
 
+  &.success {
+    background: #4A4;
+    color: #FFF;
+  }
+
   &.error {
     background: #DA4E49;
     color: #FFF;

diff --git a/app/views/merge_requests/show/_mr_box.html.haml b/app/views/merge_requests/show/_mr_box.html.haml
index a9c7e99..594f406 100644 (file)
--- a/app/views/merge_requests/show/_mr_box.html.haml
+++ b/app/views/merge_requests/show/_mr_box.html.haml
@@ -3,7 +3,7 @@
     %h4.box-title
       = gfm escape_once(@merge_request.title)
       - if @merge_request.merged?
-        .error.status_info
+        .success.status_info
           %i.icon-ok
           Merged
       - elsif @merge_request.closed?