Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/environments/components')
-rw-r--r--app/assets/javascripts/environments/components/enable_review_app_button.vue8
-rw-r--r--app/assets/javascripts/environments/components/environment_monitoring.vue8
-rw-r--r--app/assets/javascripts/environments/components/environment_pin.vue13
-rw-r--r--app/assets/javascripts/environments/components/environment_rollback.vue13
-rw-r--r--app/assets/javascripts/environments/components/environments_app.vue8
5 files changed, 30 insertions, 20 deletions
diff --git a/app/assets/javascripts/environments/components/enable_review_app_button.vue b/app/assets/javascripts/environments/components/enable_review_app_button.vue
index 8fbbc5189bf..f86072696c2 100644
--- a/app/assets/javascripts/environments/components/enable_review_app_button.vue
+++ b/app/assets/javascripts/environments/components/enable_review_app_button.vue
@@ -1,11 +1,11 @@
<script>
-import { GlButton, GlModal, GlModalDirective, GlLink, GlSprintf } from '@gitlab/ui';
+import { GlDeprecatedButton, GlModal, GlModalDirective, GlLink, GlSprintf } from '@gitlab/ui';
import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue';
import { s__ } from '~/locale';
export default {
components: {
- GlButton,
+ GlDeprecatedButton,
GlLink,
GlModal,
GlSprintf,
@@ -44,7 +44,7 @@ export default {
</script>
<template>
<div>
- <gl-button
+ <gl-deprecated-button
v-gl-modal="$options.modalInfo.id"
variant="info"
category="secondary"
@@ -52,7 +52,7 @@ export default {
class="js-enable-review-app-button"
>
{{ s__('Environments|Enable review app') }}
- </gl-button>
+ </gl-deprecated-button>
<gl-modal
:modal-id="$options.modalInfo.id"
:title="$options.modalInfo.title"
diff --git a/app/assets/javascripts/environments/components/environment_monitoring.vue b/app/assets/javascripts/environments/components/environment_monitoring.vue
index 7b4b633dc7f..bd6feb14319 100644
--- a/app/assets/javascripts/environments/components/environment_monitoring.vue
+++ b/app/assets/javascripts/environments/components/environment_monitoring.vue
@@ -1,5 +1,5 @@
<script>
-import { GlButton, GlTooltipDirective } from '@gitlab/ui';
+import { GlDeprecatedButton, GlTooltipDirective } from '@gitlab/ui';
import { __ } from '~/locale';
/**
* Renders the Monitoring (Metrics) link in environments table.
@@ -9,7 +9,7 @@ import Icon from '~/vue_shared/components/icon.vue';
export default {
components: {
Icon,
- GlButton,
+ GlDeprecatedButton,
},
directives: {
GlTooltip: GlTooltipDirective,
@@ -28,7 +28,7 @@ export default {
};
</script>
<template>
- <gl-button
+ <gl-deprecated-button
v-gl-tooltip
:href="monitoringUrl"
:title="title"
@@ -38,5 +38,5 @@ export default {
variant="default"
>
<icon name="chart" />
- </gl-button>
+ </gl-deprecated-button>
</template>
diff --git a/app/assets/javascripts/environments/components/environment_pin.vue b/app/assets/javascripts/environments/components/environment_pin.vue
index 7908928a7ac..3a219e98b08 100644
--- a/app/assets/javascripts/environments/components/environment_pin.vue
+++ b/app/assets/javascripts/environments/components/environment_pin.vue
@@ -3,7 +3,7 @@
* Renders a prevent auto-stop button.
* Used in environments table.
*/
-import { GlButton, GlTooltipDirective } from '@gitlab/ui';
+import { GlDeprecatedButton, GlTooltipDirective } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
import { __ } from '~/locale';
import eventHub from '../event_hub';
@@ -11,7 +11,7 @@ import eventHub from '../event_hub';
export default {
components: {
Icon,
- GlButton,
+ GlDeprecatedButton,
},
directives: {
GlTooltip: GlTooltipDirective,
@@ -31,7 +31,12 @@ export default {
};
</script>
<template>
- <gl-button v-gl-tooltip :title="$options.title" :aria-label="$options.title" @click="onPinClick">
+ <gl-deprecated-button
+ v-gl-tooltip
+ :title="$options.title"
+ :aria-label="$options.title"
+ @click="onPinClick"
+ >
<icon name="thumbtack" />
- </gl-button>
+ </gl-deprecated-button>
</template>
diff --git a/app/assets/javascripts/environments/components/environment_rollback.vue b/app/assets/javascripts/environments/components/environment_rollback.vue
index 577e480d210..7a728961b37 100644
--- a/app/assets/javascripts/environments/components/environment_rollback.vue
+++ b/app/assets/javascripts/environments/components/environment_rollback.vue
@@ -5,7 +5,12 @@
*
* Makes a post request when the button is clicked.
*/
-import { GlTooltipDirective, GlLoadingIcon, GlModalDirective, GlButton } from '@gitlab/ui';
+import {
+ GlTooltipDirective,
+ GlLoadingIcon,
+ GlModalDirective,
+ GlDeprecatedButton,
+} from '@gitlab/ui';
import { s__ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue';
import eventHub from '../event_hub';
@@ -14,7 +19,7 @@ export default {
components: {
Icon,
GlLoadingIcon,
- GlButton,
+ GlDeprecatedButton,
},
directives: {
GlTooltip: GlTooltipDirective,
@@ -68,7 +73,7 @@ export default {
};
</script>
<template>
- <gl-button
+ <gl-deprecated-button
v-gl-tooltip
v-gl-modal.confirm-rollback-modal
:disabled="isLoading"
@@ -78,5 +83,5 @@ export default {
>
<icon v-if="isLastDeployment" name="repeat" /> <icon v-else name="redo" />
<gl-loading-icon v-if="isLoading" />
- </gl-button>
+ </gl-deprecated-button>
</template>
diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue
index cc1d86d06ed..0cc6f3df2d7 100644
--- a/app/assets/javascripts/environments/components/environments_app.vue
+++ b/app/assets/javascripts/environments/components/environments_app.vue
@@ -1,5 +1,5 @@
<script>
-import { GlButton } from '@gitlab/ui';
+import { GlDeprecatedButton } from '@gitlab/ui';
import envrionmentsAppMixin from 'ee_else_ce/environments/mixins/environments_app_mixin';
import Flash from '~/flash';
import { s__ } from '~/locale';
@@ -17,7 +17,7 @@ export default {
ConfirmRollbackModal,
emptyState,
EnableReviewAppButton,
- GlButton,
+ GlDeprecatedButton,
StopEnvironmentModal,
DeleteEnvironmentModal,
},
@@ -105,14 +105,14 @@ export default {
<div class="nav-controls">
<enable-review-app-button v-if="state.reviewAppDetails.can_setup_review_app" class="mr-2" />
- <gl-button
+ <gl-deprecated-button
v-if="canCreateEnvironment && !isLoading"
:href="newEnvironmentPath"
category="primary"
variant="success"
>
{{ s__('Environments|New environment') }}
- </gl-button>
+ </gl-deprecated-button>
</div>
</div>