diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-24 17:02:17 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-24 17:02:17 +0000 |
| commit | 00cb8237f24be736816f9a60192c7a6cb1b54ed9 (patch) | |
| tree | e520eb8ab5ae0001a708ab7b77ad2e711e550b3c | |
| parent | 9f6660b1a930023007b8a3c0bf3850160575d058 (diff) | |
| parent | 50cfaf0ef668a4cd70f7eebbb30db166a7b8e486 (diff) | |
| download | gitlab-ce-00cb8237f24be736816f9a60192c7a6cb1b54ed9.tar.gz | |
Merge branch '28366-renamed-file-tooltip-contains-html' into 'master'
Resolve "Renamed file tooltip contains html"
Closes #28366
See merge request !9374
| -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: |