diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-11 18:44:17 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-11 18:44:17 +0000 |
commit | 4ccbd556d98e002b1c521fd3dd7748fe1d9c4044 (patch) | |
tree | d77f102217164c31175e548baaf3888d0434fa21 /app/assets/javascripts/groups/components/app.vue | |
parent | 2d00ad4868c21aef068232a79495f85e8f50d59b (diff) | |
parent | 6bb4442054a3804224f84c63fa7c5657508c4ec6 (diff) | |
download | gitlab-ce-4ccbd556d98e002b1c521fd3dd7748fe1d9c4044.tar.gz |
Merge branch 'url-utility-es-module' into 'master'
Moved URL utility methods into exported es modules
See merge request gitlab-org/gitlab-ce!15783
Diffstat (limited to 'app/assets/javascripts/groups/components/app.vue')
-rw-r--r-- | app/assets/javascripts/groups/components/app.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue index 2c0b6ab4ea8..241e026b84c 100644 --- a/app/assets/javascripts/groups/components/app.vue +++ b/app/assets/javascripts/groups/components/app.vue @@ -5,7 +5,7 @@ import eventHub from '../event_hub'; import { getParameterByName } from '../../lib/utils/common_utils'; import loadingIcon from '../../vue_shared/components/loading_icon.vue'; import { COMMON_STR } from '../constants'; - +import { mergeUrlParams } from '../../lib/utils/url_utility'; import groupsComponent from './groups.vue'; export default { @@ -93,7 +93,7 @@ export default { this.isLoading = false; $.scrollTo(0); - const currentPath = gl.utils.mergeUrlParams({ page }, window.location.href); + const currentPath = mergeUrlParams({ page }, window.location.href); window.history.replaceState({ page: currentPath, }, document.title, currentPath); |