diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-11 16:20:20 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-11 16:20:20 -0500 |
| commit | 9740f6a77a1fb7b24f8a9f319fc5deeb7cfe5ca2 (patch) | |
| tree | c5a66a113722162904d2d8010a800368c978fced | |
| parent | be646ba0759b86686608faff6ff8b656922e7107 (diff) | |
| download | gitlab-ce-9740f6a77a1fb7b24f8a9f319fc5deeb7cfe5ca2.tar.gz | |
Add additional EE check
| -rw-r--r-- | app/assets/javascripts/users_select.js | 4 | ||||
| -rw-r--r-- | spec/features/issues/form_spec.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index 6b70615c2ef..99f4de1efb8 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -425,7 +425,9 @@ window.emitSidebarEvent = window.emitSidebarEvent || $.noop; // Automatically close dropdown after assignee is selected // since CE has no multiple assignees - if (getSelected().length === $dropdown.data('max-select')) { + // EE does not have a max-select + if ($dropdown.data('max-select') && + getSelected().length === $dropdown.data('max-select')) { // Close the dropdown this.el.click(); diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb index a12a946b1bb..12a89ad723f 100644 --- a/spec/features/issues/form_spec.rb +++ b/spec/features/issues/form_spec.rb @@ -32,10 +32,6 @@ describe 'New/edit issue', feature: true, js: true do click_link user.name end - # TODO: Figure out a better way to wait for dropdown CSS hide - # animation to complete - # sleep 0.3 - expect(page.find('.dropdown-menu-user', visible: false)).not_to be_visible end end |