diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-01-21 19:58:41 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-01-21 19:58:41 +0000 |
| commit | 85a3c03c6889b7c9f4afd695a0e91b4c41759a69 (patch) | |
| tree | 612145cb77b6166d468ec9aff12b957b6bac6fd0 /app/views | |
| parent | 1fce08f9769df0644cf7c6049d631a01445bb029 (diff) | |
| download | gitlab-ce-85a3c03c6889b7c9f4afd695a0e91b4c41759a69.tar.gz | |
Revert "Merge branch '25709-diff-file-overflow' into 'master'"
This reverts merge request !8475
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/diffs/_file_header.html.haml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index 7ab2eb1bce9..c37a33bbcd5 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -1,5 +1,5 @@ .diff-file.file-holder{ id: file_hash, data: diff_file_html_data(project, diff_file.file_path, diff_commit.id) } - .file-title-flex-parent + .file-title = render "projects/diffs/file_header", diff_file: diff_file, blob: blob, diff_commit: diff_commit, project: project, url: "##{file_hash}" - unless diff_file.submodule? diff --git a/app/views/projects/diffs/_file_header.html.haml b/app/views/projects/diffs/_file_header.html.haml index 1e5ac4ed38c..90c9a0c6c2b 100644 --- a/app/views/projects/diffs/_file_header.html.haml +++ b/app/views/projects/diffs/_file_header.html.haml @@ -10,13 +10,13 @@ - if diff_file.renamed_file - old_path, new_path = mark_inline_diffs(diff_file.old_path, diff_file.new_path) - %strong.file-title-name.has-tooltip{ data: { title: old_path } } + %strong = old_path → - %strong.file-title-name.has-tooltip{ data: { title: new_path } } + %strong = new_path - else - %strong.file-title-name.has-tooltip{ data: { title: diff_file.new_path } } + %strong = diff_file.new_path - if diff_file.deleted_file deleted |