merge request close message moved and merge request now refered by !.

This commit is contained in:
Jacob Schatz 2016-01-12 08:40:02 -05:00
parent e85faec90e
commit eb3e7bdfd8
5 changed files with 11 additions and 6 deletions

View file

@ -24,6 +24,7 @@ $gl-gray: #5a5a5a;
$gl-padding: 16px; $gl-padding: 16px;
$gl-padding-top:10px; $gl-padding-top:10px;
$gl-avatar-size: 46px; $gl-avatar-size: 46px;
$quote-gray: #7f8fa4;
/* /*
* Color schema * Color schema

View file

@ -144,3 +144,8 @@ form.edit-issue {
.issue-form .select2-container { .issue-form .select2-container {
width: 250px !important; width: 250px !important;
} }
.issue-closed-by-widget {
color: $quote-gray;
margin-left: 52px;
}

View file

@ -1,2 +1,2 @@
.issue-closed-by-widget.gray-content-block.second-block.white .issue-closed-by-widget.second-block
This issue will be closed automatically when merge request #{markdown(merge_requests_sentence(@closed_by_merge_requests), pipeline: :gfm)} is accepted. When this merge request is accepted, this issue will be closed automatically.

View file

@ -11,7 +11,7 @@
- elsif has_any_ci - elsif has_any_ci
= icon('blank fw') = icon('blank fw')
%span.merge-request-id %span.merge-request-id
\##{merge_request.iid} \!#{merge_request.iid}
%span.merge-request-info %span.merge-request-info
%strong %strong
= link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title" = link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title"
@ -24,3 +24,5 @@
MERGED MERGED
- elsif merge_request.closed? - elsif merge_request.closed?
CLOSED CLOSED
- if @closed_by_merge_requests.present?
= render 'projects/issues/closed_by_box'

View file

@ -53,9 +53,6 @@
.gray-content-block.second-block.oneline-block .gray-content-block.second-block.oneline-block
= render 'votes/votes_block', votable: @issue = render 'votes/votes_block', votable: @issue
- if @closed_by_merge_requests.present?
= render 'projects/issues/closed_by_box'
.row .row
%section.col-md-9 %section.col-md-9
.issuable-discussion .issuable-discussion