Merge branch 'parallel-diff' into 'master'

Wrap code in parallel view

Code scrolling was breaking the parallel layout. It should wrap on 'Side-by-side' mode

<img src="/uploads/db657e6c7f08ce57f1be615d7193136a/Screen_Shot_2016-04-14_at_4.28.31_PM.png" width="700px">

See merge request !3731

app/assets/stylesheets/pages/notes.scss

@@ -171,6 +171,11 @@ ul.notes {
 
       &.parallel {
         border-width: 1px;
+
+        .code,
+        code {
+          white-space: pre-wrap;
+        }
       }
 
       .notes {