diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 15:10:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 15:10:53 +0300 |
| commit | ff579119e2ecf2608370a1f24c4d791d28f269d9 (patch) | |
| tree | 6f510ae943600102faf9dbc54df0f3e7f96c3417 /app/assets/javascripts/vue_shared/components/url_sync.vue | |
| parent | 2c49951e8c1f4fb95d15cac3dd0677d6882d2add (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/url_sync.vue')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/url_sync.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/url_sync.vue b/app/assets/javascripts/vue_shared/components/url_sync.vue index 389d42f0829..2844d9e9e94 100644 --- a/app/assets/javascripts/vue_shared/components/url_sync.vue +++ b/app/assets/javascripts/vue_shared/components/url_sync.vue @@ -1,6 +1,6 @@ <script> import { historyPushState } from '~/lib/utils/common_utils'; -import { setUrlParams } from '~/lib/utils/url_utility'; +import { mergeUrlParams } from '~/lib/utils/url_utility'; export default { props: { @@ -14,7 +14,7 @@ export default { immediate: true, deep: true, handler(newQuery) { - historyPushState(setUrlParams(newQuery, window.location.href, true)); + historyPushState(mergeUrlParams(newQuery, window.location.href, { spreadArrays: true })); }, }, }, |