diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-09 12:09:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-09 12:09:53 +0300 |
| commit | 1613500bf7400f5692a55fd65235a4a10fc40a7d (patch) | |
| tree | 967ae692bf524c89abdde048d8f74361642293c7 /app/assets/javascripts/members | |
| parent | 97576e3dfdc15b26c0a7832608397edd69167351 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/members')
| -rw-r--r-- | app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/members/utils.js | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue b/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue index 4af41dadc0d..63e3f62c0c6 100644 --- a/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue +++ b/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue @@ -1,9 +1,8 @@ <script> import { GlFilteredSearchToken } from '@gitlab/ui'; import { mapState } from 'vuex'; -import { getParameterByName } from '~/lib/utils/common_utils'; // eslint-disable-next-line import/no-deprecated -import { setUrlParams, urlParamsToObject } from '~/lib/utils/url_utility'; +import { getParameterByName, setUrlParams, urlParamsToObject } from '~/lib/utils/url_utility'; import { s__ } from '~/locale'; import { SEARCH_TOKEN_TYPE, diff --git a/app/assets/javascripts/members/utils.js b/app/assets/javascripts/members/utils.js index be549b40885..05f086c8f4f 100644 --- a/app/assets/javascripts/members/utils.js +++ b/app/assets/javascripts/members/utils.js @@ -1,6 +1,6 @@ import { isUndefined } from 'lodash'; -import { getParameterByName, convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import { setUrlParams } from '~/lib/utils/url_utility'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import { getParameterByName, setUrlParams } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; import { FIELDS, |