diff options
author | Phil Hughes <me@iamphill.com> | 2017-06-19 07:39:12 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-06-19 07:39:12 +0000 |
commit | 041ffac47e6ece4dd94bdf06b29d5cfe37ac0d5c (patch) | |
tree | 06438ebe42fa80f8a1992a3b1136f47f8ce53210 | |
parent | f01c5d8627ce069e84f04e587ab59ebbf7e8ac88 (diff) | |
parent | 8adbd2bcabe3bea6b70bc50c7332517a6db1798e (diff) | |
download | gitlab-ce-041ffac47e6ece4dd94bdf06b29d5cfe37ac0d5c.tar.gz |
Merge branch 'consistent-dropdown-hint' into 'master'
Make dropdown hint consistent with EE version
Closes #33721
See merge request !12234
-rw-r--r-- | app/assets/javascripts/filtered_search/dropdown_hint.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/filtered_search/dropdown_hint.js b/app/assets/javascripts/filtered_search/dropdown_hint.js index 2af242a69df..5838b1bdbb7 100644 --- a/app/assets/javascripts/filtered_search/dropdown_hint.js +++ b/app/assets/javascripts/filtered_search/dropdown_hint.js @@ -56,7 +56,7 @@ class DropdownHint extends gl.FilteredSearchDropdown { } renderContent() { - const dropdownData = gl.FilteredSearchTokenKeys.get() + const dropdownData = this.tokenKeys.get() .map(tokenKey => ({ icon: `fa-${tokenKey.icon}`, hint: tokenKey.key, |