Merge branch 'improve-diff-header' into 'master'

Fix file mode going to next line in diff header

See merge request !432

app/assets/stylesheets/pages/diff.scss

@@ -15,6 +15,11 @@
       word-break: break-all;
       margin-right: 200px;
       display: block;
+
+      .file-mode {
+        margin-left: 10px;
+        color: #777;
+      }
     }
 
     .diff-btn-group {
@@ -34,11 +39,6 @@
       font-family: $monospace_font;
       font-size: smaller;
     }
-
-    .file-mode {
-      font-family: $monospace_font;
-      margin-left: 10px;
-    }
   }
   .diff-content {
     overflow: auto;

app/views/projects/diffs/_file.html.haml

@@ -13,12 +13,13 @@
       - submodule_item = project.repository.blob_at(@commit.id, diff_file.file_path)
       = submodule_link(submodule_item, @commit.id)
     - else
-      - if diff_file.renamed_file
-        %span= "#{diff_file.old_path} renamed to #{diff_file.new_path}"
-      - else
-        %span= diff_file.new_path
-      - if diff_file.mode_changed?
-        %span.file-mode= "#{diff_file.diff.a_mode} → #{diff_file.diff.b_mode}"
+      %span
+        - if diff_file.renamed_file
+          = "#{diff_file.old_path} renamed to #{diff_file.new_path}"
+        - else
+          = diff_file.new_path
+        - if diff_file.mode_changed?
+          %span.file-mode= "#{diff_file.diff.a_mode} → #{diff_file.diff.b_mode}"
 
       .diff-btn-group
         - if blob.text?