Merge branch 'fix-mr-notes' into 'master'

Use pre-wrap for diff code in discussion view

This prevents merge request comments from being hidden in discussion view.  See #2017.

### Before

![diff_comment_before](https://dev.gitlab.org/Okada/gitlabhq/uploads/e6d24987b8d88f4e8a5883645d569b56/diff_comment_before.png)

### After

![diff_comment_after](https://dev.gitlab.org/Okada/gitlabhq/uploads/fc035f9fc44718dc8424d3f8b54f0953/diff_comment_after.png)

This change doesn't affect the "Changes" tab:

![diff_view_comment](https://dev.gitlab.org/Okada/gitlabhq/uploads/9975d4c3feac629d6a0d76b5a0ef43d8/diff_view_comment.png)

cc @sytse

See merge request !1700

2 files changed, 6 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index ba4f6e6de97..7bc561b6e06 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@ v 7.9.0 (unreleased)
   - Fix checkbox alignment on the application settings page.
   - Generalize image upload in drag and drop in markdown to all files (Hannes Rosenögger)
   - Fix mass-unassignment of issues (Robert Speicher)
+  - Fix hidden diff comments in merge request discussion view
   - Allow user confirmation to be skipped for new users via API
   - Add a service to send updates to an Irker gateway (Romain Coltel)
   - Add brakeman (security scanner for Ruby on Rails)
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 384ff6d740c..70505dc4300 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -89,6 +89,11 @@ ul.notes {
   }
 }
 
+// Diff code in discussion view
+.discussion-body .diff-file .line_content {
+  white-space: pre-wrap;
+}
+
 .diff-file .notes_holder {
   font-size: 13px;
   line-height: 18px;