diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-01 15:08:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-01 15:08:56 +0000 |
| commit | e92c95bf459ea6237b1fe1cbd3e6fc7d0eca8f85 (patch) | |
| tree | 080fec6e5ea63a30f6d1f313d585266e88db2344 /app/assets/javascripts/code_navigation | |
| parent | 9ecdb93f4e7e85ffc1e7a768780bb1279827a6aa (diff) | |
| download | gitlab-ce-e92c95bf459ea6237b1fe1cbd3e6fc7d0eca8f85.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/code_navigation')
| -rw-r--r-- | app/assets/javascripts/code_navigation/components/app.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/code_navigation/store/actions.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/code_navigation/components/app.vue b/app/assets/javascripts/code_navigation/components/app.vue index 85ec0a60ec5..d38b38947b6 100644 --- a/app/assets/javascripts/code_navigation/components/app.vue +++ b/app/assets/javascripts/code_navigation/components/app.vue @@ -1,7 +1,7 @@ <script> import { mapActions, mapState } from 'vuex'; -import Popover from './popover.vue'; import eventHub from '../../notes/event_hub'; +import Popover from './popover.vue'; export default { components: { diff --git a/app/assets/javascripts/code_navigation/store/actions.js b/app/assets/javascripts/code_navigation/store/actions.js index fb77a70de0b..0b6b8437db5 100644 --- a/app/assets/javascripts/code_navigation/store/actions.js +++ b/app/assets/javascripts/code_navigation/store/actions.js @@ -1,6 +1,6 @@ import axios from '~/lib/utils/axios_utils'; -import * as types from './mutation_types'; import { getCurrentHoverElement, setCurrentHoverElement, addInteractionClass } from '../utils'; +import * as types from './mutation_types'; export default { setInitialData({ commit }, data) { |