diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 09:09:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 09:09:31 +0000 |
commit | 04baa85554ff13bdd4d6f4e6bb24119d17608fee (patch) | |
tree | 7cb9c0977e09d97da340f48703d79b2dbd3579a0 /app/assets/javascripts/pipelines | |
parent | 42f41de46525ce0065f02ee07c1a79f5669526a0 (diff) | |
download | gitlab-ce-04baa85554ff13bdd4d6f4e6bb24119d17608fee.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipelines')
6 files changed, 30 insertions, 26 deletions
diff --git a/app/assets/javascripts/pipelines/components/empty_state.vue b/app/assets/javascripts/pipelines/components/empty_state.vue index d16f49f981c..74ada6a4d15 100644 --- a/app/assets/javascripts/pipelines/components/empty_state.vue +++ b/app/assets/javascripts/pipelines/components/empty_state.vue @@ -1,10 +1,10 @@ <script> -import { GlButton } from '@gitlab/ui'; +import { GlDeprecatedButton } from '@gitlab/ui'; export default { name: 'PipelinesEmptyState', components: { - GlButton, + GlDeprecatedButton, }, props: { helpPagePath: { @@ -43,9 +43,13 @@ export default { </p> <div class="text-center"> - <gl-button :href="helpPagePath" variant="primary" class="js-get-started-pipelines"> + <gl-deprecated-button + :href="helpPagePath" + variant="primary" + class="js-get-started-pipelines" + > {{ s__('Pipelines|Get started with Pipelines') }} - </gl-button> + </gl-deprecated-button> </div> </template> diff --git a/app/assets/javascripts/pipelines/components/graph/action_component.vue b/app/assets/javascripts/pipelines/components/graph/action_component.vue index fd59a580961..c5e95036f4f 100644 --- a/app/assets/javascripts/pipelines/components/graph/action_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue @@ -1,5 +1,5 @@ <script> -import { GlTooltipDirective, GlButton, GlLoadingIcon } from '@gitlab/ui'; +import { GlTooltipDirective, GlDeprecatedButton, GlLoadingIcon } from '@gitlab/ui'; import axios from '~/lib/utils/axios_utils'; import { dasherize } from '~/lib/utils/text_utility'; import { __ } from '~/locale'; @@ -19,7 +19,7 @@ import Icon from '~/vue_shared/components/icon.vue'; export default { components: { Icon, - GlButton, + GlDeprecatedButton, GlLoadingIcon, }, directives: { @@ -82,7 +82,7 @@ export default { }; </script> <template> - <gl-button + <gl-deprecated-button :id="`js-ci-action-${link}`" v-gl-tooltip="{ boundary: 'viewport' }" :title="tooltipText" @@ -93,5 +93,5 @@ export default { > <gl-loading-icon v-if="isLoading" class="js-action-icon-loading" /> <icon v-else :name="actionIcon" /> - </gl-button> + </gl-deprecated-button> </template> diff --git a/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue b/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue index d929398b6dc..550b9daa521 100644 --- a/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue +++ b/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue @@ -1,5 +1,5 @@ <script> -import { GlLoadingIcon, GlTooltipDirective, GlButton } from '@gitlab/ui'; +import { GlLoadingIcon, GlTooltipDirective, GlDeprecatedButton } from '@gitlab/ui'; import CiStatus from '~/vue_shared/components/ci_icon.vue'; import { __ } from '~/locale'; @@ -10,7 +10,7 @@ export default { components: { CiStatus, GlLoadingIcon, - GlButton, + GlDeprecatedButton, }, props: { pipeline: { @@ -78,7 +78,7 @@ export default { class="linked-pipeline build" :class="{ 'child-pipeline': childPipeline }" > - <gl-button + <gl-deprecated-button :id="buttonId" v-gl-tooltip :title="tooltipText" @@ -104,6 +104,6 @@ export default { >{{ label }}</span > </div> - </gl-button> + </gl-deprecated-button> </li> </template> diff --git a/app/assets/javascripts/pipelines/components/nav_controls.vue b/app/assets/javascripts/pipelines/components/nav_controls.vue index 5e4147f8805..4f6c9d2bd90 100644 --- a/app/assets/javascripts/pipelines/components/nav_controls.vue +++ b/app/assets/javascripts/pipelines/components/nav_controls.vue @@ -1,12 +1,12 @@ <script> -import { GlButton } from '@gitlab/ui'; +import { GlDeprecatedButton } from '@gitlab/ui'; import LoadingButton from '../../vue_shared/components/loading_button.vue'; export default { name: 'PipelineNavControls', components: { LoadingButton, - GlButton, + GlDeprecatedButton, }, props: { newPipelinePath: { @@ -42,14 +42,14 @@ export default { </script> <template> <div class="nav-controls"> - <gl-button + <gl-deprecated-button v-if="newPipelinePath" :href="newPipelinePath" variant="success" class="js-run-pipeline" > {{ s__('Pipelines|Run Pipeline') }} - </gl-button> + </gl-deprecated-button> <loading-button v-if="resetCachePath" @@ -59,8 +59,8 @@ export default { @click="onClickResetCache" /> - <gl-button v-if="ciLintPath" :href="ciLintPath" class="js-ci-lint"> + <gl-deprecated-button v-if="ciLintPath" :href="ciLintPath" class="js-ci-lint"> {{ s__('Pipelines|CI Lint') }} - </gl-button> + </gl-deprecated-button> </div> </template> diff --git a/app/assets/javascripts/pipelines/components/pipelines_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_actions.vue index 9764e32955c..7d4276e8d2e 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_actions.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_actions.vue @@ -1,5 +1,5 @@ <script> -import { GlButton, GlTooltipDirective, GlLoadingIcon } from '@gitlab/ui'; +import { GlDeprecatedButton, GlTooltipDirective, GlLoadingIcon } from '@gitlab/ui'; import axios from '~/lib/utils/axios_utils'; import flash from '~/flash'; import { s__, __, sprintf } from '~/locale'; @@ -14,7 +14,7 @@ export default { components: { Icon, GlCountdown, - GlButton, + GlDeprecatedButton, GlLoadingIcon, }, props: { @@ -94,7 +94,7 @@ export default { <ul class="dropdown-menu dropdown-menu-right"> <li v-for="action in actions" :key="action.path"> - <gl-button + <gl-deprecated-button :class="{ disabled: isActionDisabled(action) }" :disabled="isActionDisabled(action)" class="js-pipeline-action-link no-btn btn d-flex align-items-center justify-content-between flex-wrap" @@ -105,7 +105,7 @@ export default { <icon name="clock" /> <gl-countdown :end-date-string="action.scheduled_at" /> </span> - </gl-button> + </gl-deprecated-button> </li> </ul> </div> diff --git a/app/assets/javascripts/pipelines/components/test_reports/test_summary.vue b/app/assets/javascripts/pipelines/components/test_reports/test_summary.vue index 2fa3fa41eed..9739ef76867 100644 --- a/app/assets/javascripts/pipelines/components/test_reports/test_summary.vue +++ b/app/assets/javascripts/pipelines/components/test_reports/test_summary.vue @@ -1,5 +1,5 @@ <script> -import { GlButton, GlProgressBar } from '@gitlab/ui'; +import { GlDeprecatedButton, GlProgressBar } from '@gitlab/ui'; import { __ } from '~/locale'; import { formatTime, secondsToMilliseconds } from '~/lib/utils/datetime_utility'; import Icon from '~/vue_shared/components/icon.vue'; @@ -7,7 +7,7 @@ import Icon from '~/vue_shared/components/icon.vue'; export default { name: 'TestSummary', components: { - GlButton, + GlDeprecatedButton, GlProgressBar, Icon, }, @@ -62,14 +62,14 @@ export default { <div> <div class="row"> <div class="col-12 d-flex prepend-top-8 align-items-center"> - <gl-button + <gl-deprecated-button v-if="showBack" size="sm" class="append-right-default js-back-button" @click="onBackClick" > <icon name="angle-left" /> - </gl-button> + </gl-deprecated-button> <h4>{{ heading }}</h4> </div> |