Add latest changes from gitlab-org/gitlab@master

3 files changed, 18 insertions, 18 deletions

diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue
index 2f182b86d2c..9b45880a42e 100644
--- a/app/assets/javascripts/groups/components/group_item.vue
+++ b/app/assets/javascripts/groups/components/group_item.vue
@@ -21,10 +21,10 @@ import { VISIBILITY_TYPE_ICON, GROUP_VISIBILITY_TYPE, ITEM_TYPE } from '../const
 
 import eventHub from '../event_hub';
 
-import itemActions from './item_actions.vue';
-import itemCaret from './item_caret.vue';
-import itemStats from './item_stats.vue';
-import itemTypeIcon from './item_type_icon.vue';
+import ItemActions from './item_actions.vue';
+import ItemCaret from './item_caret.vue';
+import ItemStats from './item_stats.vue';
+import ItemTypeIcon from './item_type_icon.vue';
 
 export default {
   directives: {
@@ -41,10 +41,10 @@ export default {
     GlPopover,
     GlLink,
     UserAccessRoleBadge,
-    itemCaret,
-    itemTypeIcon,
-    itemActions,
-    itemStats,
+    ItemCaret,
+    ItemTypeIcon,
+    ItemActions,
+    ItemStats,
   },
   inject: ['currentGroupVisibility'],
   props: {
diff --git a/app/assets/javascripts/groups/components/item_stats.vue b/app/assets/javascripts/groups/components/item_stats.vue
index 2aa812250a0..a4c163b0a81 100644
--- a/app/assets/javascripts/groups/components/item_stats.vue
+++ b/app/assets/javascripts/groups/components/item_stats.vue
@@ -1,19 +1,19 @@
 <script>
 import { GlBadge } from '@gitlab/ui';
 import isProjectPendingRemoval from 'ee_else_ce/groups/mixins/is_project_pending_removal';
-import timeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import {
   ITEM_TYPE,
   VISIBILITY_TYPE_ICON,
   GROUP_VISIBILITY_TYPE,
   PROJECT_VISIBILITY_TYPE,
 } from '../constants';
-import itemStatsValue from './item_stats_value.vue';
+import ItemStatsValue from './item_stats_value.vue';
 
 export default {
   components: {
-    timeAgoTooltip,
-    itemStatsValue,
+    TimeAgoTooltip,
+    ItemStatsValue,
     GlBadge,
   },
   mixins: [isProjectPendingRemoval],
diff --git a/app/assets/javascripts/groups/index.js b/app/assets/javascripts/groups/index.js
index a502fcd31ad..dc2909f2621 100644
--- a/app/assets/javascripts/groups/index.js
+++ b/app/assets/javascripts/groups/index.js
@@ -4,9 +4,9 @@ import { parseBoolean } from '~/lib/utils/common_utils';
 import UserCallout from '~/user_callout';
 import Translate from '../vue_shared/translate';
 
-import groupsApp from './components/app.vue';
-import groupFolderComponent from './components/group_folder.vue';
-import groupItemComponent from './components/group_item.vue';
+import GroupsApp from './components/app.vue';
+import GroupFolderComponent from './components/group_folder.vue';
+import GroupItemComponent from './components/group_item.vue';
 import { GROUPS_LIST_HOLDER_CLASS, CONTENT_LIST_CLASS } from './constants';
 import GroupFilterableList from './groups_filterable_list';
 import GroupsService from './service/groups_service';
@@ -33,8 +33,8 @@ export default (containerId = 'js-groups-tree', endpoint, action = '') => {
     dataEl = containerEl.querySelector(CONTENT_LIST_CLASS);
   }
 
-  Vue.component('GroupFolder', groupFolderComponent);
-  Vue.component('GroupItem', groupItemComponent);
+  Vue.component('GroupFolder', GroupFolderComponent);
+  Vue.component('GroupItem', GroupItemComponent);
 
   Vue.use(GlToast);
 
@@ -42,7 +42,7 @@ export default (containerId = 'js-groups-tree', endpoint, action = '') => {
   new Vue({
     el,
     components: {
-      groupsApp,
+      GroupsApp,
     },
     provide() {
       const {