diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-07 15:08:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-07 15:08:52 +0300 |
commit | 28f0cd8e0725320c294f9dbf74c698ee727de594 (patch) | |
tree | 5e2ba5fc09fbddc0ac88d8b726795f8c62922a3b /app/assets/javascripts/users_select | |
parent | 929712792964c31c895cb83ebf0862da038c57a0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/users_select')
-rw-r--r-- | app/assets/javascripts/users_select/constants.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/users_select/index.js | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/users_select/constants.js b/app/assets/javascripts/users_select/constants.js index c100c1f4ca5..c2ca2ca3782 100644 --- a/app/assets/javascripts/users_select/constants.js +++ b/app/assets/javascripts/users_select/constants.js @@ -1,12 +1,10 @@ export const AJAX_USERS_SELECT_PARAMS_MAP = { project_id: 'projectId', group_id: 'groupId', - skip_ldap: 'skipLdap', todo_filter: 'todoFilter', todo_state_filter: 'todoStateFilter', current_user: 'showCurrentUser', author_id: 'authorId', - skip_users: 'skipUsers', states: 'states', }; diff --git a/app/assets/javascripts/users_select/index.js b/app/assets/javascripts/users_select/index.js index 66e54b59187..ab707e7e69c 100644 --- a/app/assets/javascripts/users_select/index.js +++ b/app/assets/javascripts/users_select/index.js @@ -4,7 +4,7 @@ import $ from 'jquery'; import { escape, template, uniqBy } from 'lodash'; -import { AJAX_USERS_SELECT_PARAMS_MAP } from 'ee_else_ce/users_select/constants'; +import { AJAX_USERS_SELECT_PARAMS_MAP } from '~/users_select/constants'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import { TYPE_MERGE_REQUEST } from '~/issues/constants'; import { isUserBusy } from '~/set_status_modal/utils'; |