diff options
author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-02-21 22:23:58 +0100 |
---|---|---|
committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-02-21 22:23:58 +0100 |
commit | 11c1fc1fae5810123f683630c92bf1e9e7eab3d0 (patch) | |
tree | f1d0a5a73539b8b7be172be6cb91ccaf6b3dd420 /app/assets/javascripts/behaviors/copy_to_clipboard.js | |
parent | 84016f8335f885538dd1ddc9b88cc716324b9613 (diff) | |
parent | 88870c871eeb55ff43cf638ba8d7307b263393c3 (diff) | |
download | gitlab-ce-11c1fc1fae5810123f683630c92bf1e9e7eab3d0.tar.gz |
Resolved conflicts with master
Diffstat (limited to 'app/assets/javascripts/behaviors/copy_to_clipboard.js')
-rw-r--r-- | app/assets/javascripts/behaviors/copy_to_clipboard.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/behaviors/copy_to_clipboard.js b/app/assets/javascripts/behaviors/copy_to_clipboard.js index cdea625fc8c..b669b63d23c 100644 --- a/app/assets/javascripts/behaviors/copy_to_clipboard.js +++ b/app/assets/javascripts/behaviors/copy_to_clipboard.js @@ -2,7 +2,7 @@ import Clipboard from 'clipboard'; function showTooltip(target, title) { const $target = $(target); - const originalTitle = $target.data('original-title'); + const originalTitle = $target.data('originalTitle'); if (!$target.data('hideTooltip')) { $target |