summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2018-03-08 20:46:06 +0000
committerFatih Acet <acetfatih@gmail.com>2018-03-08 20:46:06 +0000
commit0cee325f917b35d3f4f34496c481b73dadce9ff5 (patch)
tree69e59e6d619d6215b1ca514867a3d55f73b57492
parent08c407cc0f9e52b6ac2aa2884bb055ccd15d70d7 (diff)
parent50432548af062757d16dd6288759435f2f4c1834 (diff)
downloadgitlab-ce-0cee325f917b35d3f4f34496c481b73dadce9ff5.tar.gz
Merge branch '37211-diff-comments-fix-ctrl-enter-tooltip' into 'master'
Resolve ""You can also press Ctrl-Enter" tooltip lingers after Tab+Enter" Closes #37211 See merge request gitlab-org/gitlab-ce!17560
-rw-r--r--app/assets/javascripts/behaviors/quick_submit.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/behaviors/quick_submit.js b/app/assets/javascripts/behaviors/quick_submit.js
index 312edc0cd69..51bd5b8ebe5 100644
--- a/app/assets/javascripts/behaviors/quick_submit.js
+++ b/app/assets/javascripts/behaviors/quick_submit.js
@@ -72,5 +72,5 @@ $(document).on('keyup.quick_submit', '.js-quick-submit input[type=submit], .js-q
title,
trigger: 'manual',
});
- $this.tooltip('show').one('blur', () => $this.tooltip('hide'));
+ $this.tooltip('show').one('blur click', () => $this.tooltip('hide'));
});