summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-03-03 21:31:33 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-03-03 21:31:33 +0000
commit312137c6a5456e0dfdaaaa0f12ecdc1597286c17 (patch)
treeeffaf0bd8b2a48886d0a36d39d35e791e641ae98
parentca63a05873b6e6f7b1d5f48824676a9cb6588af2 (diff)
parentf13fbf62bc54301e969951920833cbdb67df3ca5 (diff)
downloadgitlab-ce-312137c6a5456e0dfdaaaa0f12ecdc1597286c17.tar.gz
Merge branch 'revert-320ef318' into 'master'
Revert "Merge branch 'tooltip-hide-on-scroll' into 'master'" See merge request !9693
-rw-r--r--app/assets/javascripts/application.js4
-rw-r--r--changelogs/unreleased/tooltip-hide-on-scroll.yml4
2 files changed, 0 insertions, 8 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e0ee698a8ff..4c24d35b5bb 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -231,10 +231,6 @@ require('es6-promise').polyfill();
var bootstrapBreakpoint = bp.getBreakpointSize();
var fitSidebarForSize;
- $(document).on('scroll', function() {
- $('.has-tooltip').tooltip('hide');
- });
-
// Set the default path for all cookies to GitLab's root directory
Cookies.defaults.path = gon.relative_url_root || '/';
diff --git a/changelogs/unreleased/tooltip-hide-on-scroll.yml b/changelogs/unreleased/tooltip-hide-on-scroll.yml
deleted file mode 100644
index cd81d303330..00000000000
--- a/changelogs/unreleased/tooltip-hide-on-scroll.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fixed tooltip remaining after scrolling the page
-merge_request:
-author: