diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-03-02 12:45:17 +0000 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-03-03 19:03:18 -0300 |
| commit | af064cde913e4c7052998e01fb3e9c1b9b725b71 (patch) | |
| tree | 47046ae6f5d3a4d462661c74aeeea40500ca4fcd | |
| parent | 3412fa8a543b0dd876a54d29762b8cab814e6652 (diff) | |
| download | gitlab-ce-af064cde913e4c7052998e01fb3e9c1b9b725b71.tar.gz | |
Merge branch 'dm-dont-copy-toolip' into 'master'
Don't copy tooltip when copying GFM
Closes #28802
See merge request !9563
| -rw-r--r-- | app/assets/javascripts/copy_as_gfm.js.es6 | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/dm-dont-copy-toolip.yml | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/copy_as_gfm.js.es6 b/app/assets/javascripts/copy_as_gfm.js.es6 index 4bd537a6f28..2bc3d85fba4 100644 --- a/app/assets/javascripts/copy_as_gfm.js.es6 +++ b/app/assets/javascripts/copy_as_gfm.js.es6 @@ -25,6 +25,9 @@ require('./lib/utils/common_utils'); }, }, ReferenceFilter: { + '.tooltip'(el, text) { + return ''; + }, 'a.gfm:not([data-link=true])'(el, text) { return el.dataset.original || text; }, diff --git a/changelogs/unreleased/dm-dont-copy-toolip.yml b/changelogs/unreleased/dm-dont-copy-toolip.yml new file mode 100644 index 00000000000..2b134da66ab --- /dev/null +++ b/changelogs/unreleased/dm-dont-copy-toolip.yml @@ -0,0 +1,4 @@ +--- +title: Don't copy tooltip when copying GFM +merge_request: +author: |