Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-14 21:09:20 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-14 21:09:20 +0300
commit835f1214dcc4e08e3076f269b7b2aa854ea4257a (patch)
tree07366d250301a8b2a8d7f24d220f4db21b5f6f59 /app/assets/javascripts/related_merge_requests/store
parent8309ef26ed9ae22e3115a0203dfff302812c154a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/related_merge_requests/store')
-rw-r--r--app/assets/javascripts/related_merge_requests/store/actions.js4
-rw-r--r--app/assets/javascripts/related_merge_requests/store/index.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/related_merge_requests/store/actions.js b/app/assets/javascripts/related_merge_requests/store/actions.js
index 7baab165820..e9f0793a350 100644
--- a/app/assets/javascripts/related_merge_requests/store/actions.js
+++ b/app/assets/javascripts/related_merge_requests/store/actions.js
@@ -1,7 +1,7 @@
-import axios from '~/lib/utils/axios_utils';
import { deprecatedCreateFlash as createFlash } from '~/flash';
-import { s__ } from '~/locale';
+import axios from '~/lib/utils/axios_utils';
import { normalizeHeaders } from '~/lib/utils/common_utils';
+import { s__ } from '~/locale';
import * as types from './mutation_types';
const REQUEST_PAGE_COUNT = 100;
diff --git a/app/assets/javascripts/related_merge_requests/store/index.js b/app/assets/javascripts/related_merge_requests/store/index.js
index dcb70c22bcb..925cc36cd76 100644
--- a/app/assets/javascripts/related_merge_requests/store/index.js
+++ b/app/assets/javascripts/related_merge_requests/store/index.js
@@ -1,8 +1,8 @@
import Vue from 'vue';
import Vuex from 'vuex';
-import createState from './state';
import * as actions from './actions';
import mutations from './mutations';
+import createState from './state';
Vue.use(Vuex);