Commit 2cd6cc7f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

Fix file mode going to next line in diff header

See merge request !432
parents 17192d1b 61700f61
......@@ -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;
......
......@@ -13,10 +13,11 @@
- submodule_item = project.repository.blob_at(@commit.id, diff_file.file_path)
= submodule_link(submodule_item, @commit.id)
- else
%span
- if diff_file.renamed_file
%span= "#{diff_file.old_path} renamed to #{diff_file.new_path}"
= "#{diff_file.old_path} renamed to #{diff_file.new_path}"
- else
%span= diff_file.new_path
= diff_file.new_path
- if diff_file.mode_changed?
%span.file-mode= "#{diff_file.diff.a_mode}#{diff_file.diff.b_mode}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment