Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 7 deletions

diff --git a/app/assets/javascripts/contributors/components/contributors.vue b/app/assets/javascripts/contributors/components/contributors.vue
index 977c2ba907e..7426e570864 100644
--- a/app/assets/javascripts/contributors/components/contributors.vue
+++ b/app/assets/javascripts/contributors/components/contributors.vue
@@ -1,11 +1,11 @@
 <script>
-import { debounce, uniq } from 'lodash';
-import { mapActions, mapState, mapGetters } from 'vuex';
 import { GlLoadingIcon } from '@gitlab/ui';
 import { GlAreaChart } from '@gitlab/ui/dist/charts';
-import { __ } from '~/locale';
-import { getSvgIconPathContent } from '~/lib/utils/icon_utils';
+import { debounce, uniq } from 'lodash';
+import { mapActions, mapState, mapGetters } from 'vuex';
 import { getDatesInRange } from '~/lib/utils/datetime_utility';
+import { getSvgIconPathContent } from '~/lib/utils/icon_utils';
+import { __ } from '~/locale';
 import ResizableChartContainer from '~/vue_shared/components/resizable_chart/resizable_chart_container.vue';
 import { xAxisLabelFormatter, dateFormatter } from '../utils';
 
diff --git a/app/assets/javascripts/contributors/stores/index.js b/app/assets/javascripts/contributors/stores/index.js
index bc739851aa7..38259f46d4c 100644
--- a/app/assets/javascripts/contributors/stores/index.js
+++ b/app/assets/javascripts/contributors/stores/index.js
@@ -1,9 +1,9 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
-import state from './state';
-import mutations from './mutations';
-import * as getters from './getters';
 import * as actions from './actions';
+import * as getters from './getters';
+import mutations from './mutations';
+import state from './state';
 
 Vue.use(Vuex);