diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 15:09:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 15:09:31 +0300 |
commit | 64f7eb2b37aebbb713463b2f6971b13191c1b0db (patch) | |
tree | 186ce376859dc04055a20d87945556eec63acd68 /app/assets/javascripts/pipeline_new | |
parent | 315243f87739dd1edda2b75361f826abc91d4069 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipeline_new')
-rw-r--r-- | app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue index 69b02463235..97cd671e035 100644 --- a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue +++ b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue @@ -9,6 +9,7 @@ import { GlFormGroup, GlFormInput, GlFormSelect, + GlFormTextarea, GlLink, GlDropdown, GlDropdownItem, @@ -38,6 +39,9 @@ export default { errorTitle: __('Pipeline cannot be run.'), warningTitle: __('The form contains the following warning:'), maxWarningsSummary: __('%{total} warnings found: showing first %{warningsDisplayed}'), + // this height value is used inline on the textarea to match the input field height + // it's used to prevent the overwrite if 'gl-h-7' or 'gl-h-7!' were used + textAreaStyle: { height: '32px' }, components: { GlAlert, GlIcon, @@ -46,6 +50,7 @@ export default { GlFormGroup, GlFormInput, GlFormSelect, + GlFormTextarea, GlLink, GlDropdown, GlDropdownItem, @@ -426,10 +431,12 @@ export default { data-testid="pipeline-form-ci-variable-key" @change="addEmptyVariable(refFullName)" /> - <gl-form-input + <gl-form-textarea v-model="variable.value" :placeholder="s__('CiVariables|Input variable value')" class="gl-mb-3" + :style="$options.textAreaStyle" + :no-resize="false" data-testid="pipeline-form-ci-variable-value" /> |