Skip to content
Snippets Groups Projects
Commit 0bb37c1f authored by Jacob Schatz's avatar Jacob Schatz
Browse files

makes message plural for multiple MRs and removes from loop. Duh.

parent eb3e7bdf
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -74,7 +74,7 @@
 
 
/** light list with border-bottom between li **/
ul.bordered-list {
ul.bordered-list, ul.unstyled-list {
@include basic-list;
 
&.top-list {
Loading
Loading
@@ -88,6 +88,10 @@ ul.bordered-list {
}
}
 
ul.unstyled-list > li {
border-bottom: none;
}
ul.task-list {
li.task-list-item {
list-style-type: none;
Loading
Loading
.issue-closed-by-widget.second-block
When this merge request is accepted, this issue will be closed automatically.
- pluralized_mr_this = merge_request_count > 1 ? "these" : "this"
- pluralized_mr_is = merge_request_count > 1 ? "are" : "is"
When #{pluralized_mr_this} merge #{"request".pluralize(merge_request_count)} #{pluralized_mr_is} accepted, this issue will be closed automatically.
-if @merge_requests.any?
%h2.merge-requests-title
= pluralize(@merge_requests.count, 'Related Merge Request')
%ul.bordered-list
%ul.unstyled-list
- has_any_ci = @merge_requests.any?(&:ci_commit)
- @merge_requests.each do |merge_request|
%li
Loading
Loading
@@ -24,5 +24,5 @@
MERGED
- elsif merge_request.closed?
CLOSED
- if @closed_by_merge_requests.present?
= render 'projects/issues/closed_by_box'
- if @closed_by_merge_requests.present?
= render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment