kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Jacob Schatz 2016-05-25 20:25:10 +00:00
parent 7fa1ab469f e76d11dce9
commit 49343f9a31
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/pages/issues.scss
View File

@ -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;
}

5
app/views/projects/issues/_merge_requests.html.haml
View File

@ -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}