diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 12:09:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 12:09:55 +0300 |
commit | d06c308380072db8cfac10f27fc114f6093ce8b6 (patch) | |
tree | 5d54d354c496afb31d28cc93c728a95e6d014fe3 /app/assets/javascripts/add_context_commits_modal | |
parent | fb10c412ec153dd64a9c5ce98e6c6091621e62c2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/add_context_commits_modal')
-rw-r--r-- | app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/add_context_commits_modal/store/actions.js | 2 |
2 files changed, 2 insertions, 2 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 6862ed211a9..cb9aa50fa68 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 @@ -4,7 +4,7 @@ import { GlModal, GlTabs, GlTab, GlSearchBoxByType, GlSprintf } from '@gitlab/ui import ReviewTabContainer from '~/add_context_commits_modal/components/review_tab_container.vue'; import { s__ } from '~/locale'; import eventHub from '../event_hub'; -import createFlash from '~/flash'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import { findCommitIndex, setCommitStatus, 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 77f60490bc6..d23955182b2 100644 --- a/app/assets/javascripts/add_context_commits_modal/store/actions.js +++ b/app/assets/javascripts/add_context_commits_modal/store/actions.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import axios from '~/lib/utils/axios_utils'; -import createFlash from '~/flash'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import { s__ } from '~/locale'; import Api from '~/api'; import * as types from './mutation_types'; |