diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 20:25:10 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 20:25:10 +0000 |
| commit | 49343f9a31ffdcf4ff238189bbf58e581e41d102 (patch) | |
| tree | e32b5d6b7a9ff477e6105193f20fc298290e2313 | |
| parent | 7fa1ab469f40dfced988a75b95e484e40615e32d (diff) | |
| parent | e76d11dce96672a6f791fb4f249a3c1384f0a7f0 (diff) | |
| download | gitlab-ce-49343f9a31ffdcf4ff238189bbf58e581e41d102.tar.gz | |
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
See merge request !4251
| -rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/issues/_merge_requests.html.haml | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 59f72cd8b69..4e35ca329e4 100644 --- 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; -} diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml index e953353567e..2f9dc867d0d 100644 --- 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} |