Merge branch...

Merge branch '31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabled-ee' into 'master'

Automatically close user dropdown for CE (EE Version)

See merge request !1921

app/assets/javascripts/test.js

+$.fx.off = true;

app/assets/javascripts/users_select.js

@@ -425,6 +425,15 @@ window.emitSidebarEvent = window.emitSidebarEvent || $.noop;
                 selected = $dropdown.closest('.selectbox').find("input[name='" + ($dropdown.data('field-name')) + "']").val();
                 return assignTo(selected);
               }
+
+              // Automatically close dropdown after assignee is selected
+              // since CE has no multiple assignees
+              // EE does not have a max-select
+              if ($dropdown.data('max-select') &&
+                  getSelected().length === $dropdown.data('max-select')) {
+                // Close the dropdown
+                $dropdown.dropdown('toggle');
+              }
             },
             id: function (user) {
               return user.id;

app/assets/stylesheets/test.scss

+* {
+  -o-transition: none !important;
+  -moz-transition: none !important;
+  -ms-transition: none !important;
+  -webkit-transition: none !important;
+  transition: none !important;
+  -o-transform: none !important;
+  -moz-transform: none !important;
+  -ms-transform: none !important;
+  -webkit-transform: none !important;
+  transform: none !important;
+  -webkit-animation: none !important;
+  -moz-animation: none !important;
+  -o-animation: none !important;
+  -ms-animation: none !important;
+  animation: none !important;
+}

app/views/layouts/_head.html.haml

@@ -27,6 +27,7 @@
 
   = stylesheet_link_tag "application", media: "all"
   = stylesheet_link_tag "print",       media: "print"
+  = stylesheet_link_tag "test",        media: "all" if Rails.env.test?
 
   = Gon::Base.render_data
 
@@ -34,6 +35,7 @@
   = webpack_bundle_tag "common"
   = webpack_bundle_tag "main"
   = webpack_bundle_tag "raven" if current_application_settings.clientside_sentry_enabled
+  = webpack_bundle_tag "test" if Rails.env.test?
 
   - if content_for?(:page_specific_javascripts)
     = yield :page_specific_javascripts

config/application.rb

@@ -111,6 +111,7 @@ module Gitlab
     config.assets.precompile << "xterm/xterm.css"
     config.assets.precompile << "lib/ace.js"
     config.assets.precompile << "vendor/assets/fonts/*"
+    config.assets.precompile << "test.css"
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'

config/webpack.config.js

@@ -65,6 +65,7 @@ var config = {
     users:                './users/users_bundle.js',
     raven:                './raven/index.js',
     vue_merge_request_widget: './vue_merge_request_widget/index.js',
+    test:                 './test.js',
   },
 
   output: {