Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 12 deletions

diff --git a/app/assets/javascripts/users_select/constants.js b/app/assets/javascripts/users_select/constants.js
index 6b91d7e7c10..c100c1f4ca5 100644
--- a/app/assets/javascripts/users_select/constants.js
+++ b/app/assets/javascripts/users_select/constants.js
@@ -7,4 +7,7 @@ export const AJAX_USERS_SELECT_PARAMS_MAP = {
   current_user: 'showCurrentUser',
   author_id: 'authorId',
   skip_users: 'skipUsers',
+  states: 'states',
 };
+
+export const ACTIVE_AND_BLOCKED_USER_STATES = ['active', 'blocked'];
diff --git a/app/assets/javascripts/users_select/index.js b/app/assets/javascripts/users_select/index.js
index a0550737e24..fbf7e0b3a86 100644
--- a/app/assets/javascripts/users_select/index.js
+++ b/app/assets/javascripts/users_select/index.js
@@ -29,27 +29,29 @@ function UsersSelect(currentUser, els, options = {}) {
     }
   }
 
-  const { handleClick } = options;
+  const { handleClick, states } = options;
 
   $els.each((i, dropdown) => {
     const userSelect = this;
-    const options = {};
     const $dropdown = $(dropdown);
-    options.projectId = $dropdown.data('projectId');
-    options.groupId = $dropdown.data('groupId');
-    options.showCurrentUser = $dropdown.data('currentUser');
-    options.todoFilter = $dropdown.data('todoFilter');
-    options.todoStateFilter = $dropdown.data('todoStateFilter');
-    options.iid = $dropdown.data('iid');
-    options.issuableType = $dropdown.data('issuableType');
-    options.targetBranch = $dropdown.data('targetBranch');
-    options.showSuggested = $dropdown.data('showSuggested');
+    const options = {
+      states,
+      projectId: $dropdown.data('projectId'),
+      groupId: $dropdown.data('groupId'),
+      showCurrentUser: $dropdown.data('currentUser'),
+      todoFilter: $dropdown.data('todoFilter'),
+      todoStateFilter: $dropdown.data('todoStateFilter'),
+      iid: $dropdown.data('iid'),
+      issuableType: $dropdown.data('issuableType'),
+      targetBranch: $dropdown.data('targetBranch'),
+      authorId: $dropdown.data('authorId'),
+      showSuggested: $dropdown.data('showSuggested'),
+    };
     const showNullUser = $dropdown.data('nullUser');
     const defaultNullUser = $dropdown.data('nullUserDefault');
     const showMenuAbove = $dropdown.data('showMenuAbove');
     const showAnyUser = $dropdown.data('anyUser');
     const firstUser = $dropdown.data('firstUser');
-    options.authorId = $dropdown.data('authorId');
     const defaultLabel = $dropdown.data('defaultLabel');
     const issueURL = $dropdown.data('issueUpdate');
     const $selectbox = $dropdown.closest('.selectbox');