diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-05-20 16:23:04 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-05-20 16:23:04 -0500 |
| commit | fc1910ddc5db25e608921f69c3dc28d830e6ea03 (patch) | |
| tree | 1f82bd43de18fdb6ec1d01801d7d75c08bdf7928 /app/views/projects | |
| parent | 63f53730c0483b4c9e6fa9d90413d40a8c74a243 (diff) | |
| parent | 5341b16fc92425d557a1c62d0329b276170eba73 (diff) | |
| download | gitlab-ce-fc1910ddc5db25e608921f69c3dc28d830e6ea03.tar.gz | |
Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'
# Conflicts:
# app/services/system_note_service.rb
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index f10b5094eaf..e5983c58039 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -11,11 +11,9 @@ = link_to "#diff-#{i}" do - if diff_file.renamed_file - old_path, new_path = mark_inline_diffs(diff_file.old_path, diff_file.new_path) - .filename.old - = old_path + = old_path → - .filename.new - = new_path + = new_path - else %span = diff_file.new_path |