Commit bbe89a50 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'gitlab-ui-integration-1061-add-label-description-form-group' into 'master'

Gitlab ui integration 1061 add label description form group

See merge request gitlab-org/gitlab!62650
parents c38a3cdc 1e4e7f53
...@@ -40,6 +40,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] = ...@@ -40,6 +40,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
invalid-feedback="" invalid-feedback=""
label="Time limit" label="Time limit"
label-for="sla-duration" label-for="sla-duration"
labeldescription=""
state="true" state="true"
> >
<div <div
......
...@@ -7,6 +7,7 @@ exports[`AddEditScheduleForm renders form layout 1`] = ` ...@@ -7,6 +7,7 @@ exports[`AddEditScheduleForm renders form layout 1`] = `
label="Name" label="Name"
label-for="schedule-name" label-for="schedule-name"
label-size="sm" label-size="sm"
labeldescription=""
required="" required=""
state="true" state="true"
> >
...@@ -20,6 +21,7 @@ exports[`AddEditScheduleForm renders form layout 1`] = ` ...@@ -20,6 +21,7 @@ exports[`AddEditScheduleForm renders form layout 1`] = `
label="Description (optional)" label="Description (optional)"
label-for="schedule-description" label-for="schedule-description"
label-size="sm" label-size="sm"
labeldescription=""
> >
<gl-form-input-stub <gl-form-input-stub
id="schedule-description" id="schedule-description"
...@@ -33,6 +35,7 @@ exports[`AddEditScheduleForm renders form layout 1`] = ` ...@@ -33,6 +35,7 @@ exports[`AddEditScheduleForm renders form layout 1`] = `
label="Timezone" label="Timezone"
label-for="schedule-timezone" label-for="schedule-timezone"
label-size="sm" label-size="sm"
labeldescription=""
required="" required=""
state="true" state="true"
> >
......
...@@ -46,6 +46,7 @@ exports[`Status Page settings form default state should match the default snapsh ...@@ -46,6 +46,7 @@ exports[`Status Page settings form default state should match the default snapsh
<form> <form>
<gl-form-group-stub <gl-form-group-stub
class="gl-pl-0 mb-3" class="gl-pl-0 mb-3"
labeldescription=""
> >
<gl-form-checkbox-stub> <gl-form-checkbox-stub>
<span <span
...@@ -61,6 +62,7 @@ exports[`Status Page settings form default state should match the default snapsh ...@@ -61,6 +62,7 @@ exports[`Status Page settings form default state should match the default snapsh
label="Status page URL" label="Status page URL"
label-for="status-page-url" label-for="status-page-url"
label-size="sm" label-size="sm"
labeldescription=""
> >
<gl-form-input-stub <gl-form-input-stub
id="status-page-url" id="status-page-url"
...@@ -86,6 +88,7 @@ exports[`Status Page settings form default state should match the default snapsh ...@@ -86,6 +88,7 @@ exports[`Status Page settings form default state should match the default snapsh
label="S3 Bucket name" label="S3 Bucket name"
label-for="status-page-s3-bucket-name" label-for="status-page-s3-bucket-name"
label-size="sm" label-size="sm"
labeldescription=""
> >
<gl-form-input-stub <gl-form-input-stub
id="status-page-s3-bucket-name" id="status-page-s3-bucket-name"
...@@ -106,6 +109,7 @@ exports[`Status Page settings form default state should match the default snapsh ...@@ -106,6 +109,7 @@ exports[`Status Page settings form default state should match the default snapsh
label="AWS region" label="AWS region"
label-for="status-page-aws-region" label-for="status-page-aws-region"
label-size="sm" label-size="sm"
labeldescription=""
> >
<gl-form-input-stub <gl-form-input-stub
id="status-page-aws-region" id="status-page-aws-region"
...@@ -127,6 +131,7 @@ exports[`Status Page settings form default state should match the default snapsh ...@@ -127,6 +131,7 @@ exports[`Status Page settings form default state should match the default snapsh
label="AWS access key ID" label="AWS access key ID"
label-for="status-page-aws-access-key" label-for="status-page-aws-access-key"
label-size="sm" label-size="sm"
labeldescription=""
> >
<gl-form-input-stub <gl-form-input-stub
id="status-page-aws-access-key " id="status-page-aws-access-key "
...@@ -139,6 +144,7 @@ exports[`Status Page settings form default state should match the default snapsh ...@@ -139,6 +144,7 @@ exports[`Status Page settings form default state should match the default snapsh
label="AWS Secret access key" label="AWS Secret access key"
label-for="status-page-aws-secret-access-key" label-for="status-page-aws-secret-access-key"
label-size="sm" label-size="sm"
labeldescription=""
> >
<gl-form-input-stub <gl-form-input-stub
id="status-page-aws-secret-access-key " id="status-page-aws-secret-access-key "
......
...@@ -46,6 +46,7 @@ exports[`grafana integration component default state to match the default snapsh ...@@ -46,6 +46,7 @@ exports[`grafana integration component default state to match the default snapsh
<gl-form-group-stub <gl-form-group-stub
label="Enable authentication" label="Enable authentication"
label-for="grafana-integration-enabled" label-for="grafana-integration-enabled"
labeldescription=""
> >
<gl-form-checkbox-stub <gl-form-checkbox-stub
id="grafana-integration-enabled" id="grafana-integration-enabled"
...@@ -60,6 +61,7 @@ exports[`grafana integration component default state to match the default snapsh ...@@ -60,6 +61,7 @@ exports[`grafana integration component default state to match the default snapsh
description="Enter the base URL of the Grafana instance." description="Enter the base URL of the Grafana instance."
label="Grafana URL" label="Grafana URL"
label-for="grafana-url" label-for="grafana-url"
labeldescription=""
> >
<gl-form-input-stub <gl-form-input-stub
id="grafana-url" id="grafana-url"
...@@ -71,6 +73,7 @@ exports[`grafana integration component default state to match the default snapsh ...@@ -71,6 +73,7 @@ exports[`grafana integration component default state to match the default snapsh
<gl-form-group-stub <gl-form-group-stub
label="API token" label="API token"
label-for="grafana-token" label-for="grafana-token"
labeldescription=""
> >
<gl-form-input-stub <gl-form-input-stub
id="grafana-token" id="grafana-token"
......
...@@ -11,6 +11,7 @@ exports[`Alert integration settings form default state should match the default ...@@ -11,6 +11,7 @@ exports[`Alert integration settings form default state should match the default
<form> <form>
<gl-form-group-stub <gl-form-group-stub
class="gl-pl-0" class="gl-pl-0"
labeldescription=""
> >
<gl-form-checkbox-stub <gl-form-checkbox-stub
checked="true" checked="true"
...@@ -26,6 +27,7 @@ exports[`Alert integration settings form default state should match the default ...@@ -26,6 +27,7 @@ exports[`Alert integration settings form default state should match the default
class="col-8 col-md-9 gl-px-6" class="col-8 col-md-9 gl-px-6"
label-for="alert-integration-settings-issue-template" label-for="alert-integration-settings-issue-template"
label-size="sm" label-size="sm"
labeldescription=""
> >
<label <label
class="gl-display-inline-flex" class="gl-display-inline-flex"
...@@ -75,6 +77,7 @@ exports[`Alert integration settings form default state should match the default ...@@ -75,6 +77,7 @@ exports[`Alert integration settings form default state should match the default
<gl-form-group-stub <gl-form-group-stub
class="gl-pl-0 gl-mb-5" class="gl-pl-0 gl-mb-5"
labeldescription=""
> >
<gl-form-checkbox-stub> <gl-form-checkbox-stub>
<span> <span>
...@@ -85,6 +88,7 @@ exports[`Alert integration settings form default state should match the default ...@@ -85,6 +88,7 @@ exports[`Alert integration settings form default state should match the default
<gl-form-group-stub <gl-form-group-stub
class="gl-pl-0 gl-mb-5" class="gl-pl-0 gl-mb-5"
labeldescription=""
> >
<gl-form-checkbox-stub <gl-form-checkbox-stub
checked="true" checked="true"
......
...@@ -13,6 +13,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] = ...@@ -13,6 +13,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
<form> <form>
<gl-form-group-stub <gl-form-group-stub
class="col-8 col-md-9 gl-p-0" class="col-8 col-md-9 gl-p-0"
labeldescription=""
> >
<gl-toggle-stub <gl-toggle-stub
id="active" id="active"
...@@ -26,6 +27,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] = ...@@ -26,6 +27,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
class="col-8 col-md-9 gl-p-0" class="col-8 col-md-9 gl-p-0"
label="Webhook URL" label="Webhook URL"
label-for="url" label-for="url"
labeldescription=""
> >
<gl-form-input-group-stub <gl-form-input-group-stub
data-testid="webhook-url" data-testid="webhook-url"
......
...@@ -45,7 +45,9 @@ exports[`self monitor component When the self monitor project has not been creat ...@@ -45,7 +45,9 @@ exports[`self monitor component When the self monitor project has not been creat
Enabling this feature creates a project that can be used to monitor the health of your instance. Enabling this feature creates a project that can be used to monitor the health of your instance.
</p> </p>
<gl-form-group-stub> <gl-form-group-stub
labeldescription=""
>
<gl-toggle-stub <gl-toggle-stub
label="Create Project" label="Create Project"
labelposition="top" labelposition="top"
......
...@@ -22,6 +22,7 @@ exports[`Snippet Visibility Edit component rendering matches the snapshot 1`] = ...@@ -22,6 +22,7 @@ exports[`Snippet Visibility Edit component rendering matches the snapshot 1`] =
<gl-form-group-stub <gl-form-group-stub
class="gl-mb-0" class="gl-mb-0"
id="visibility-level-setting" id="visibility-level-setting"
labeldescription=""
> >
<gl-form-radio-group-stub <gl-form-radio-group-stub
checked="private" checked="private"
......
...@@ -4,6 +4,7 @@ exports[`Title edit field matches the snapshot 1`] = ` ...@@ -4,6 +4,7 @@ exports[`Title edit field matches the snapshot 1`] = `
<gl-form-group-stub <gl-form-group-stub
label="Title" label="Title"
label-for="title-field-edit" label-for="title-field-edit"
labeldescription=""
> >
<gl-form-input-stub /> <gl-form-input-stub />
</gl-form-group-stub> </gl-form-group-stub>
......
...@@ -908,10 +908,10 @@ ...@@ -908,10 +908,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8" resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw== integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
"@gitlab/ui@29.31.0": "@gitlab/ui@29.32.0":
version "29.31.0" version "29.32.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.31.0.tgz#4c07a20ef4de0585b241e19995e50e05b3ba3557" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.32.0.tgz#efcb078f68c65991ab33f43cdf21984467c012d6"
integrity sha512-pZEWKxH5yrAogfutST/hJoTqLtBkubQHVAgADlcyysl2Yc9trgd+OQBv3tBUn8FLItcGpgJsanAq8VOwGYkFaw== integrity sha512-epWZSbopeDjrkbF+obWk7nUx7HMfK8VKBk36xMV46fWmJVJSwhvg3kX9MzPlburaEURMNS1ucxCvH5bnGef6og==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.3.0" "@gitlab/vue-toasted" "^1.3.0"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment