diff options
| author | Sam Rose <sam@gitlab.com> | 2017-02-20 08:22:44 -0500 |
|---|---|---|
| committer | Sam Rose <sam@gitlab.com> | 2017-02-20 08:22:44 -0500 |
| commit | 50cfaf0ef668a4cd70f7eebbb30db166a7b8e486 (patch) | |
| tree | 43bbbf7cfdc37c0860c494540c35894d04a2f9e9 | |
| parent | c89449e6110c2bdf6e1410bae3e7b7d807c5e305 (diff) | |
| download | gitlab-ce-28366-renamed-file-tooltip-contains-html.tar.gz | |
Remove markup showing in tooltip for renamed files in diff view28366-renamed-file-tooltip-contains-html
| -rw-r--r-- | app/views/projects/diffs/_file_header.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/28366-renamed-file-tooltip-contains-html.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/projects/diffs/_file_header.html.haml b/app/views/projects/diffs/_file_header.html.haml index 1dbfe830d52..f809c52c367 100644 --- a/app/views/projects/diffs/_file_header.html.haml +++ b/app/views/projects/diffs/_file_header.html.haml @@ -10,10 +10,10 @@ - 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, container: 'body' } } + %strong.file-title-name.has-tooltip{ data: { title: diff_file.old_path, container: 'body' } } = old_path → - %strong.file-title-name.has-tooltip{ data: { title: new_path, container: 'body' } } + %strong.file-title-name.has-tooltip{ data: { title: diff_file.new_path, container: 'body' } } = new_path - else %strong.file-title-name.has-tooltip{ data: { title: diff_file.new_path, container: 'body' } } diff --git a/changelogs/unreleased/28366-renamed-file-tooltip-contains-html.yml b/changelogs/unreleased/28366-renamed-file-tooltip-contains-html.yml new file mode 100644 index 00000000000..faf1e89ed94 --- /dev/null +++ b/changelogs/unreleased/28366-renamed-file-tooltip-contains-html.yml @@ -0,0 +1,4 @@ +--- +title: Remove markup that was showing in tooltip for renamed files +merge_request: 9374 +author: |