Merge branch 'closed-by-alignment' into 'master'

Related merge request text alignment Fixed the alignment of the text 'When this merge request is accepted...' on issues page ![Screen_Shot_2016-05-23_at_14.59.48](/uploads/5d2f4be94108364a9d004169a6825a9e/Screen_Shot_2016-05-23_at_14.59.48.png) See merge request !4251

Merge branch 'closed-by-alignment' into 'master'
49343f9a · Jacob Schatz · 7fa1ab46 · e76d11dc · 49343f9a · 49343f9a
Commit 49343f9a authored May 25, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

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

_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
@@ -91,8 +91,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
-    - if @closed_by_merge_requests.present?
+    %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}