Merge branch 'referenced-merge-requests' into 'master'

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

Fixes #4161 

![Screen_Shot_2016-01-12_at_8.38.57_AM](/uploads/9390ce0ebd1d14bfc83130ff4913a823/Screen_Shot_2016-01-12_at_8.38.57_AM.png)

See merge request !2387

app/assets/stylesheets/framework/lists.scss

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

app/assets/stylesheets/framework/variables.scss

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

app/assets/stylesheets/pages/issues.scss

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

app/views/projects/issues/_closed_by_box.html.haml

@@ -1,2 +1,4 @@
-.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
+  - 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.

app/views/projects/issues/_merge_requests.html.haml

@@ -1,7 +1,7 @@
 -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
@@ -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 partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}

app/views/projects/issues/show.html.haml

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