diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/javascripts/add_context_commits_modal | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) | |
download | gitlab-ce-859a6fb938bb9ee2a317c46dfa4fcc1af49608f0.tar.gz |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/add_context_commits_modal')
3 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue index c58ded3f1f5..5d074698ea4 100644 --- a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue +++ b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue @@ -1,10 +1,11 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlModal, GlTabs, GlTab, GlSearchBoxByType, GlSprintf } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import ReviewTabContainer from '~/add_context_commits_modal/components/review_tab_container.vue'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { BV_SHOW_MODAL } from '~/lib/utils/constants'; import { s__ } from '~/locale'; import eventHub from '../event_hub'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import { findCommitIndex, setCommitStatus, @@ -119,7 +120,7 @@ export default { openModal() { this.searchCommits(); this.fetchContextCommits(); - this.$root.$emit('bv::show::modal', 'add-review-item'); + this.$root.$emit(BV_SHOW_MODAL, 'add-review-item'); }, handleTabChange(tabIndex) { if (tabIndex === 0) { diff --git a/app/assets/javascripts/add_context_commits_modal/index.js b/app/assets/javascripts/add_context_commits_modal/index.js index b5cd111fabc..697d32664e8 100644 --- a/app/assets/javascripts/add_context_commits_modal/index.js +++ b/app/assets/javascripts/add_context_commits_modal/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; -import createStore from './store'; import AddContextCommitsModalTrigger from './components/add_context_commits_modal_trigger.vue'; import AddContextCommitsModalWrapper from './components/add_context_commits_modal_wrapper.vue'; +import createStore from './store'; export default function initAddContextCommitsTriggers() { const addContextCommitsModalTriggerEl = document.querySelector('.add-review-item-modal-trigger'); diff --git a/app/assets/javascripts/add_context_commits_modal/store/actions.js b/app/assets/javascripts/add_context_commits_modal/store/actions.js index 1bf54b159ee..7b6f4c81bd2 100644 --- a/app/assets/javascripts/add_context_commits_modal/store/actions.js +++ b/app/assets/javascripts/add_context_commits_modal/store/actions.js @@ -1,8 +1,8 @@ import _ from 'lodash'; -import axios from '~/lib/utils/axios_utils'; +import Api from '~/api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; -import Api from '~/api'; import * as types from './mutation_types'; export const setBaseConfig = ({ commit }, options) => { |