summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/groups
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-12-11 12:28:11 +0000
committerPhil Hughes <me@iamphill.com>2017-12-11 12:28:11 +0000
commit6bb4442054a3804224f84c63fa7c5657508c4ec6 (patch)
tree87e7806344b74e7954e7284c045a1789873f7280 /app/assets/javascripts/groups
parenta5d2732ce91e24fbb7ea8c9b087ba3c7476edc09 (diff)
downloadgitlab-ce-6bb4442054a3804224f84c63fa7c5657508c4ec6.tar.gz
updated importsurl-utility-es-module
Diffstat (limited to 'app/assets/javascripts/groups')
-rw-r--r--app/assets/javascripts/groups/components/app.vue4
-rw-r--r--app/assets/javascripts/groups/components/group_item.vue4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue
index 17bcced944d..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 * as utils from '../../lib/utils/url_utility';
+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 = utils.mergeUrlParams({ page }, window.location.href);
+ const currentPath = mergeUrlParams({ page }, window.location.href);
window.history.replaceState({
page: currentPath,
}, document.title, currentPath);
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue
index 7a8d5b2c483..6421547bbde 100644
--- a/app/assets/javascripts/groups/components/group_item.vue
+++ b/app/assets/javascripts/groups/components/group_item.vue
@@ -1,5 +1,5 @@
<script>
-import * as urlUtils from '../../lib/utils/url_utility';
+import { visitUrl } from '../../lib/utils/url_utility';
import tooltip from '../../vue_shared/directives/tooltip';
import identicon from '../../vue_shared/components/identicon.vue';
import eventHub from '../event_hub';
@@ -61,7 +61,7 @@ export default {
if (this.hasChildren) {
eventHub.$emit('toggleChildren', this.group);
} else {
- urlUtils.visitUrl(this.group.relativePath);
+ visitUrl(this.group.relativePath);
}
}
},