Merge branch 'renovate/gitlab-uisvg' into 'master'

Update dependency @gitlab/ui to v21.29.0

See merge request gitlab-org/gitlab!45150

app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue

@@ -388,7 +388,7 @@ export default {
     <gl-form @submit.prevent="onSubmit" @reset.prevent="onReset">
       <h5 class="gl-font-lg">{{ $options.i18n.integrationsLabel }}</h5>
 
-      <gl-form-group label-for="integrations" label-class="gl-font-weight-bold">
+      <gl-form-group label-for="integrations">
         <div data-testid="alert-settings-description" class="gl-mt-5">
           <p v-for="section in sections" :key="section.text">
             <gl-sprintf :message="section.text">
@@ -417,11 +417,7 @@ export default {
           </gl-sprintf>
         </span>
       </gl-form-group>
-      <gl-form-group
-        :label="$options.i18n.activeLabel"
-        label-for="activated"
-        label-class="gl-font-weight-bold"
-      >
+      <gl-form-group :label="$options.i18n.activeLabel" label-for="activated">
         <toggle-button
           id="activated"
           :disabled-input="loading"
@@ -434,7 +430,6 @@ export default {
         v-if="isOpsgenie || isPrometheus"
         :label="$options.i18n.apiBaseUrlLabel"
         label-for="api-url"
-        label-class="gl-font-weight-bold"
       >
         <gl-form-input
           id="api-url"
@@ -448,11 +443,7 @@ export default {
         </span>
       </gl-form-group>
       <template v-if="!isOpsgenie">
-        <gl-form-group
-          :label="$options.i18n.urlLabel"
-          label-for="url"
-          label-class="gl-font-weight-bold"
-        >
+        <gl-form-group :label="$options.i18n.urlLabel" label-for="url">
           <gl-form-input-group id="url" readonly :value="selectedService.url">
             <template #append>
               <clipboard-button
@@ -466,11 +457,7 @@ export default {
             {{ prometheusInfo }}
           </span>
         </gl-form-group>
-        <gl-form-group
-          :label="$options.i18n.authKeyLabel"
-          label-for="authorization-key"
-          label-class="gl-font-weight-bold"
-        >
+        <gl-form-group :label="$options.i18n.authKeyLabel" label-for="authorization-key">
           <gl-form-input-group id="authorization-key" class="gl-mb-2" readonly :value="authKey">
             <template #append>
               <clipboard-button
@@ -496,7 +483,6 @@ export default {
         <gl-form-group
           :label="$options.i18n.alertJson"
           label-for="alert-json"
-          label-class="gl-font-weight-bold"
           :invalid-feedback="testAlert.error"
         >
           <gl-form-textarea

app/assets/javascripts/incidents_settings/components/pagerduty_form.vue

@@ -124,7 +124,6 @@ export default {
         class="col-8 col-md-9 gl-p-0"
         :label="$options.i18n.webhookUrl.label"
         label-for="url"
-        label-class="label-bold"
       >
         <gl-form-input-group id="url" data-testid="webhook-url" readonly :value="webhookUrl">
           <template #append>

package.json

@@ -43,7 +43,7 @@
     "@babel/preset-env": "^7.10.1",
     "@gitlab/at.js": "1.5.5",
     "@gitlab/svgs": "1.171.0",
-    "@gitlab/ui": "21.28.0",
+    "@gitlab/ui": "21.29.0",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "^6.0.3-3",
     "@rails/ujs": "^6.0.3-2",

spec/frontend/alert_settings/__snapshots__/alert_settings_form_spec.js.snap

@@ -6,7 +6,7 @@ exports[`AlertsSettingsForm with default values renders the initial template 1`]
   <integrations-list-stub integrations=\\"[object Object],[object Object]\\"></integrations-list-stub>
   <gl-form-stub>
     <h5 class=\\"gl-font-lg\\">Add new integrations</h5>
-    <gl-form-group-stub label-for=\\"integrations\\" label-class=\\"gl-font-weight-bold\\">
+    <gl-form-group-stub label-for=\\"integrations\\">
       <div data-testid=\\"alert-settings-description\\" class=\\"gl-mt-5\\">
         <p>
           <gl-sprintf-stub message=\\"You must provide this URL and authorization key to authorize an external service to send alerts to GitLab. You can provide this URL and key to multiple services. After configuring an external service, alerts from your service will display on the GitLab %{linkStart}Alerts%{linkEnd} page.\\"></gl-sprintf-stub>
@@ -17,23 +17,23 @@ exports[`AlertsSettingsForm with default values renders the initial template 1`]
       </div>
       <gl-form-select-stub options=\\"[object Object],[object Object],[object Object]\\" data-testid=\\"alert-settings-select\\" value=\\"generic\\"></gl-form-select-stub> <span class=\\"gl-text-gray-200\\"><gl-sprintf-stub message=\\"Learn more about our %{linkStart}upcoming integrations%{linkEnd}\\"></gl-sprintf-stub></span>
     </gl-form-group-stub>
-    <gl-form-group-stub label=\\"Active\\" label-for=\\"activated\\" label-class=\\"gl-font-weight-bold\\">
+    <gl-form-group-stub label=\\"Active\\" label-for=\\"activated\\">
       <toggle-button-stub id=\\"activated\\"></toggle-button-stub>
     </gl-form-group-stub>
     <!---->
-    <gl-form-group-stub label=\\"Webhook URL\\" label-for=\\"url\\" label-class=\\"gl-font-weight-bold\\">
+    <gl-form-group-stub label=\\"Webhook URL\\" label-for=\\"url\\">
       <gl-form-input-group-stub value=\\"/alerts/notify.json\\" predefinedoptions=\\"[object Object]\\" id=\\"url\\" readonly=\\"\\"></gl-form-input-group-stub> <span class=\\"gl-text-gray-200\\">
 
         </span>
     </gl-form-group-stub>
-    <gl-form-group-stub label=\\"Authorization key\\" label-for=\\"authorization-key\\" label-class=\\"gl-font-weight-bold\\">
+    <gl-form-group-stub label=\\"Authorization key\\" label-for=\\"authorization-key\\">
       <gl-form-input-group-stub value=\\"abcedfg123\\" predefinedoptions=\\"[object Object]\\" id=\\"authorization-key\\" readonly=\\"\\" class=\\"gl-mb-2\\"></gl-form-input-group-stub>
       <gl-button-stub category=\\"primary\\" variant=\\"default\\" size=\\"medium\\" icon=\\"\\" buttontextclasses=\\"\\" disabled=\\"true\\" class=\\"gl-mt-3\\" role=\\"button\\" tabindex=\\"0\\">Reset key</gl-button-stub>
       <gl-modal-stub modalid=\\"authKeyModal\\" titletag=\\"h4\\" modalclass=\\"\\" size=\\"md\\" title=\\"Reset key\\" ok-title=\\"Reset key\\" ok-variant=\\"danger\\">
         Resetting the authorization key for this project will require updating the authorization key in every alert source it is enabled in.
       </gl-modal-stub>
     </gl-form-group-stub>
-    <gl-form-group-stub label=\\"Alert test payload\\" label-for=\\"alert-json\\" label-class=\\"gl-font-weight-bold\\">
+    <gl-form-group-stub label=\\"Alert test payload\\" label-for=\\"alert-json\\">
       <gl-form-textarea-stub noresize=\\"true\\" id=\\"alert-json\\" disabled=\\"true\\" state=\\"true\\" placeholder=\\"Enter test alert JSON....\\" rows=\\"6\\" max-rows=\\"10\\"></gl-form-textarea-stub>
     </gl-form-group-stub>
     <gl-button-stub category=\\"primary\\" variant=\\"default\\" size=\\"medium\\" icon=\\"\\" buttontextclasses=\\"\\" disabled=\\"true\\">Test alert payload</gl-button-stub>

spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap

@@ -23,7 +23,6 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
     <gl-form-group-stub
       class="col-8 col-md-9 gl-p-0"
       label="Webhook URL"
-      label-class="label-bold"
       label-for="url"
     >
       <gl-form-input-group-stub

yarn.lock

@@ -866,10 +866,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.171.0.tgz#abc3092bf804f0898301626130e0f3231834924a"
   integrity sha512-TPfdqIxQDda+0CQHhb9XdF50lmqDmADu6yT8R4oZi6BoUtWLdiHbyFt+RnVU6t7EmjIKicNAii7Ga+f2ljCfUA==
 
-"@gitlab/ui@21.28.0":
-  version "21.28.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.28.0.tgz#28455d9f53ed34c0b17ea8e1073b670c59617032"
-  integrity sha512-skhWKaC3hzWpLA6GoDLG5qJqdgRhYNfAtE2W7pONyfi21eUgZuMbzCVSX3dYLm6v2LEBsJRZXbguWmCOT2ZilQ==
+"@gitlab/ui@21.29.0":
+  version "21.29.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.29.0.tgz#598ac5265aa39db4f63a1c7801df322c1234eaa2"
+  integrity sha512-sGsL1YmKUJAUEVAKwq+9Km2qOpiTf+We7o7az8fBcN+PKaGWfPhEXLskCwToky7mwuKBBTpwX2qdf+7lk/iu7A==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"