diff options
| author | Michel Engelen <michel@nomorejs.net> | 2019-05-28 11:15:23 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-28 11:15:23 +0300 |
| commit | 9e275b1423cc06033fff0f7dff5aa00d742f0cbf (patch) | |
| tree | 3960e59c47d94c7fb7510bf83248e491f7eec0d5 | |
| parent | 2cc6e6ff2628bd71faa71f083646a981ab2bcc11 (diff) | |
added a new conditional to add `display: none;` dynamically if the row should be hidden, indicated by the variable `rowHidden`
this solves issue #9978
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/9978-moved-code-differences-from-EE-to-CE.yml | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index 1c6b18c0e03..6a4c1aab308 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -702,6 +702,10 @@ GitLabDropdown = (function() { } html = document.createElement('li'); + if (rowHidden) { + html.style.display = 'none'; + } + if (data === 'divider' || data === 'separator') { html.className = data; return html; diff --git a/changelogs/unreleased/9978-moved-code-differences-from-EE-to-CE.yml b/changelogs/unreleased/9978-moved-code-differences-from-EE-to-CE.yml new file mode 100644 index 00000000000..821e5d70dca --- /dev/null +++ b/changelogs/unreleased/9978-moved-code-differences-from-EE-to-CE.yml @@ -0,0 +1,5 @@ +--- +title: "Moved EE/CE code differences for `app/assets/javascripts/gl_dropdown.js` into CE" +merge_request: 28711 +author: Michel Engelen +type: other |