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/environments | |
parent | fb10c412ec153dd64a9c5ce98e6c6091621e62c2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/environments')
-rw-r--r-- | app/assets/javascripts/environments/components/environments_app.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/environments/mixins/environments_mixin.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue index d26bd14a937..f0e74d96f09 100644 --- a/app/assets/javascripts/environments/components/environments_app.vue +++ b/app/assets/javascripts/environments/components/environments_app.vue @@ -1,6 +1,6 @@ <script> import { GlDeprecatedButton } from '@gitlab/ui'; -import Flash from '~/flash'; +import { deprecatedCreateFlash as Flash } from '~/flash'; import { s__ } from '~/locale'; import emptyState from './empty_state.vue'; import eventHub from '../event_hub'; diff --git a/app/assets/javascripts/environments/mixins/environments_mixin.js b/app/assets/javascripts/environments/mixins/environments_mixin.js index f2b464464e9..9b0301bba07 100644 --- a/app/assets/javascripts/environments/mixins/environments_mixin.js +++ b/app/assets/javascripts/environments/mixins/environments_mixin.js @@ -7,7 +7,7 @@ import EnvironmentsStore from 'ee_else_ce/environments/stores/environments_store import Poll from '../../lib/utils/poll'; import { getParameterByName } from '../../lib/utils/common_utils'; import { s__ } from '../../locale'; -import Flash from '../../flash'; +import { deprecatedCreateFlash as Flash } from '../../flash'; import eventHub from '../event_hub'; import EnvironmentsService from '../services/environments_service'; |