diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-03-02 12:45:17 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-03-02 12:45:17 +0000 |
| commit | be49b15a732684d0a95cf4e69baf677ab3bab3ab (patch) | |
| tree | 6080cc1de48a55044b04f147267466cd9f7a1f4b | |
| parent | 1818813653723fca0125217118efecec64950b3e (diff) | |
| parent | b31c64e755485e135ecf8999491b9d9a1b68f065 (diff) | |
| download | gitlab-ce-be49b15a732684d0a95cf4e69baf677ab3bab3ab.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: |