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/groups | |
parent | 97576e3dfdc15b26c0a7832608397edd69167351 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/groups')
-rw-r--r-- | app/assets/javascripts/groups/components/app.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/groups/components/groups.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/groups/groups_filterable_list.js | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue index e159fac728c..2a95b242510 100644 --- a/app/assets/javascripts/groups/components/app.vue +++ b/app/assets/javascripts/groups/components/app.vue @@ -1,9 +1,8 @@ <script> import { GlLoadingIcon, GlModal } from '@gitlab/ui'; import createFlash from '~/flash'; -import { getParameterByName } from '~/lib/utils/common_utils'; import { HIDDEN_CLASS } from '~/lib/utils/constants'; -import { mergeUrlParams } from '~/lib/utils/url_utility'; +import { mergeUrlParams, getParameterByName } from '~/lib/utils/url_utility'; import { __, s__, sprintf } from '~/locale'; import { COMMON_STR, CONTENT_LIST_CLASS } from '../constants'; diff --git a/app/assets/javascripts/groups/components/groups.vue b/app/assets/javascripts/groups/components/groups.vue index d407fdd2b90..59a37b2a1d5 100644 --- a/app/assets/javascripts/groups/components/groups.vue +++ b/app/assets/javascripts/groups/components/groups.vue @@ -1,6 +1,6 @@ <script> import PaginationLinks from '~/vue_shared/components/pagination_links.vue'; -import { getParameterByName } from '../../lib/utils/common_utils'; +import { getParameterByName } from '../../lib/utils/url_utility'; import eventHub from '../event_hub'; export default { diff --git a/app/assets/javascripts/groups/groups_filterable_list.js b/app/assets/javascripts/groups/groups_filterable_list.js index cedf16cd7f1..8a66d4d11b7 100644 --- a/app/assets/javascripts/groups/groups_filterable_list.js +++ b/app/assets/javascripts/groups/groups_filterable_list.js @@ -1,6 +1,7 @@ import $ from 'jquery'; import FilterableList from '~/filterable_list'; -import { normalizeHeaders, getParameterByName } from '../lib/utils/common_utils'; +import { normalizeHeaders } from '../lib/utils/common_utils'; +import { getParameterByName } from '../lib/utils/url_utility'; import eventHub from './event_hub'; export default class GroupFilterableList extends FilterableList { @@ -45,7 +46,7 @@ export default class GroupFilterableList extends FilterableList { onFilterInput() { const queryData = {}; const $form = $(this.form); - const archivedParam = getParameterByName('archived', window.location.href); + const archivedParam = getParameterByName('archived'); const filterGroupsParam = $form.find(`[name="${this.filterInputField}"]`).val(); if (filterGroupsParam) { |