diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-14 12:20:40 -0600 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-14 12:30:36 -0600 |
| commit | d7f357a386162f645ba5a8550dfa1d3b22d0ff2c (patch) | |
| tree | 2495d81e8002a3eff11e4f01dc55fb23886d7486 | |
| parent | 19e0dafbef47ca04f19d38b72b817beeb09e8510 (diff) | |
| download | gitlab-ce-d7f357a386162f645ba5a8550dfa1d3b22d0ff2c.tar.gz | |
Use pre-wrap for diff code in discussion view
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 5 |
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; |