merge request close message moved and merge request now refered by !
.
This commit is contained in:
parent
e85faec90e
commit
eb3e7bdfd8
5 changed files with 11 additions and 6 deletions
|
@ -24,6 +24,7 @@ $gl-gray: #5a5a5a;
|
|||
$gl-padding: 16px;
|
||||
$gl-padding-top:10px;
|
||||
$gl-avatar-size: 46px;
|
||||
$quote-gray: #7f8fa4;
|
||||
|
||||
/*
|
||||
* Color schema
|
||||
|
|
|
@ -144,3 +144,8 @@ form.edit-issue {
|
|||
.issue-form .select2-container {
|
||||
width: 250px !important;
|
||||
}
|
||||
|
||||
.issue-closed-by-widget {
|
||||
color: $quote-gray;
|
||||
margin-left: 52px;
|
||||
}
|
|
@ -1,2 +1,2 @@
|
|||
.issue-closed-by-widget.gray-content-block.second-block.white
|
||||
This issue will be closed automatically when merge request #{markdown(merge_requests_sentence(@closed_by_merge_requests), pipeline: :gfm)} is accepted.
|
||||
.issue-closed-by-widget.second-block
|
||||
When this merge request is accepted, this issue will be closed automatically.
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
- elsif has_any_ci
|
||||
= icon('blank fw')
|
||||
%span.merge-request-id
|
||||
\##{merge_request.iid}
|
||||
\!#{merge_request.iid}
|
||||
%span.merge-request-info
|
||||
%strong
|
||||
= link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title"
|
||||
|
@ -24,3 +24,5 @@
|
|||
MERGED
|
||||
- elsif merge_request.closed?
|
||||
CLOSED
|
||||
- if @closed_by_merge_requests.present?
|
||||
= render 'projects/issues/closed_by_box'
|
||||
|
|
|
@ -53,9 +53,6 @@
|
|||
.gray-content-block.second-block.oneline-block
|
||||
= render 'votes/votes_block', votable: @issue
|
||||
|
||||
- if @closed_by_merge_requests.present?
|
||||
= render 'projects/issues/closed_by_box'
|
||||
|
||||
.row
|
||||
%section.col-md-9
|
||||
.issuable-discussion
|
||||
|
|
Loading…
Reference in a new issue