diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-18 17:19:34 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-19 16:56:51 +0300 |
| commit | e4130eeae8515bc7e8044d993c42896aab06b976 (patch) | |
| tree | be9824dbb33feaf65d9215e821ee213280dfa797 /app | |
| parent | 5e60147683569090fd90302e5c1aabf93234df22 (diff) | |
Merge branch 'id-skip-prepopulating-for-any-none' into 'master'
Fix skipping of user rendering for none and any
See merge request gitlab-org/gitlab-ce!26268
(cherry picked from commit 142c39aee6e0e3fb8e73d6eb818e49ef7795cfc4)
4eb70b90 Fix skipping of user rendering for none and any
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/filtered_search/visual_token_value.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/filtered_search/visual_token_value.js b/app/assets/javascripts/filtered_search/visual_token_value.js index 99008a4c989..a9d5ba8faa8 100644 --- a/app/assets/javascripts/filtered_search/visual_token_value.js +++ b/app/assets/javascripts/filtered_search/visual_token_value.js @@ -13,9 +13,9 @@ export default class VisualTokenValue { } render(tokenValueContainer, tokenValueElement) { - const { tokenType } = this; + const { tokenType, tokenValue } = this; - if (['none', 'any'].includes(tokenType)) { + if (['none', 'any'].includes(tokenValue.toLowerCase())) { return; } |