diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-19 15:06:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-19 15:06:08 +0000 |
| commit | d948f526eaf995c32699fe9e02c2a7c47b78b635 (patch) | |
| tree | f10023b5826989a5bdc756ec692b943796db48f8 /app/assets/javascripts/pipelines | |
| parent | 26804e91d92ce76b741103de6fd0012f9e26d18c (diff) | |
| download | gitlab-ce-d948f526eaf995c32699fe9e02c2a7c47b78b635.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipelines')
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipeline_stop_modal.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipeline_stop_modal.vue b/app/assets/javascripts/pipelines/components/pipeline_stop_modal.vue index 4cafd147511..2e71b3c637b 100644 --- a/app/assets/javascripts/pipelines/components/pipeline_stop_modal.vue +++ b/app/assets/javascripts/pipelines/components/pipeline_stop_modal.vue @@ -1,6 +1,6 @@ <script> import _ from 'underscore'; -import GlModal from '~/vue_shared/components/gl_modal.vue'; +import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue'; import { GlLink } from '@gitlab/ui'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; @@ -13,7 +13,7 @@ import { s__, sprintf } from '~/locale'; */ export default { components: { - GlModal, + GlModal: DeprecatedModal2, GlLink, ClipboardButton, CiIcon, |