diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-29 19:09:33 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-29 19:09:33 +0200 |
| commit | 905004fdc37abd39645e29174927f56f3337e270 (patch) | |
| tree | 446918a3b2bb6de17511b10d079054a8e6f0319e | |
| parent | a565c51b86d0e92fd5ab9a295ace8f18cd0b5ec9 (diff) | |
| parent | 0084b8a7763b04f432579e5a19ce0c6a06136b03 (diff) | |
| download | gitlab-ce-905004fdc37abd39645e29174927f56f3337e270.tar.gz | |
Merge pull request #7980 from mr-vinn/diff-renames
Display renamed files in diff views
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index c415ae2ddc8..bf7770ceedf 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -10,7 +10,10 @@ - if @commit.parent_ids.present? = view_file_btn(@commit.parent_id, diff_file, project) - else - %span= diff_file.new_path + - 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}" |