diff options
| -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; |