Related merge request text alignment

e76d11dc · Phil Hughes · 53ad33e4 · e76d11dc · e76d11dc
Commit e76d11dc authored May 23, 2016 by Phil Hughes
Showing with 4 additions and 6 deletions

app/assets/stylesheets/pages/issues.scss app/assets/stylesheets/pages/issues.scss +0 -5

app/views/projects/issues/_merge_requests.html.haml app/views/projects/issues/_merge_requests.html.haml +4 -1

No files found.
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -96,8 +96,3 @@ form.edit-issue {
 .issue-form .select2-container {
  width: 250px !important;
 }
-.issue-closed-by-widget {
-  color: $gl-text-color;
-  margin-left: 52px;
-}
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@@ -24,5 +24,8 @@
            MERGED
          - elsif merge_request.closed?
            CLOSED
+    %li
+      = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}
    - if @closed_by_merge_requests.present?
+      %li
        = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}