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:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-07 21:08:34 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-07 21:08:34 +0300
commit1850d48925997ccc467fe0cbe6144d1d67fbdb55 (patch)
tree1c2081b4f9b986e9017761db5b6915ff3db8de79 /app/assets/javascripts/jobs
parent1d3a583ac1d4affb8871a76121815b1c104ef93a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
-rw-r--r--app/assets/javascripts/jobs/components/trigger_block.vue11
1 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/jobs/components/trigger_block.vue b/app/assets/javascripts/jobs/components/trigger_block.vue
index f55429ecdae..3cb5e63fd36 100644
--- a/app/assets/javascripts/jobs/components/trigger_block.vue
+++ b/app/assets/javascripts/jobs/components/trigger_block.vue
@@ -1,12 +1,12 @@
<script>
-import { GlDeprecatedButton } from '@gitlab/ui';
+import { GlButton } from '@gitlab/ui';
import { __ } from '~/locale';
const HIDDEN_VALUE = '••••••';
export default {
components: {
- GlDeprecatedButton,
+ GlButton,
},
props: {
trigger: {
@@ -55,11 +55,12 @@ export default {
<p class="trigger-variables-btn-container d-flex">
<span class="font-weight-bold">{{ __('Trigger variables:') }}</span>
- <gl-deprecated-button
+ <gl-button
v-if="hasValues"
- class="btn-sm group js-reveal-variables trigger-variables-btn"
+ class="group js-reveal-variables trigger-variables-btn"
+ size="small"
@click="toggleValues"
- >{{ getToggleButtonText }}</gl-deprecated-button
+ >{{ getToggleButtonText }}</gl-button
>
</p>