Add latest changes from gitlab-org/gitlab@master

2 files changed, 23 insertions, 23 deletions

diff --git a/spec/frontend/registry/settings/components/__snapshots__/registry_settings_app_spec.js.snap b/spec/frontend/registry/settings/components/__snapshots__/registry_settings_app_spec.js.snap
index 77f031db120..966acdf52be 100644
--- a/spec/frontend/registry/settings/components/__snapshots__/registry_settings_app_spec.js.snap
+++ b/spec/frontend/registry/settings/components/__snapshots__/registry_settings_app_spec.js.snap
@@ -20,6 +20,6 @@ exports[`Registry Settings App renders 1`] = `
     </li>
   </ul>
    
-  <settingsform-stub />
+  <settings-form-stub />
 </div>
 `;
diff --git a/spec/frontend/registry/settings/components/__snapshots__/settings_form_spec.js.snap b/spec/frontend/registry/settings/components/__snapshots__/settings_form_spec.js.snap
index 0ae37f70273..9724033f3c9 100644
--- a/spec/frontend/registry/settings/components/__snapshots__/settings_form_spec.js.snap
+++ b/spec/frontend/registry/settings/components/__snapshots__/settings_form_spec.js.snap
@@ -16,7 +16,7 @@ exports[`Settings Form renders 1`] = `
     <div
       class="card-body"
     >
-      <glformgroup-stub
+      <gl-form-group-stub
         id="expiration-policy-toggle-group"
         label="Expiration policy:"
         label-align="right"
@@ -26,7 +26,7 @@ exports[`Settings Form renders 1`] = `
         <div
           class="d-flex align-items-start"
         >
-          <gltoggle-stub
+          <gl-toggle-stub
             id="expiration-policy-toggle"
             labeloff="Toggle Status: OFF"
             labelon="Toggle Status: ON"
@@ -41,16 +41,16 @@ exports[`Settings Form renders 1`] = `
             </strong>
           </span>
         </div>
-      </glformgroup-stub>
+      </gl-form-group-stub>
        
-      <glformgroup-stub
+      <gl-form-group-stub
         id="expiration-policy-interval-group"
         label="Expiration interval:"
         label-align="right"
         label-cols="3"
         label-for="expiration-policy-interval"
       >
-        <glformselect-stub
+        <gl-form-select-stub
           id="expiration-policy-interval"
         >
           <option
@@ -64,17 +64,17 @@ exports[`Settings Form renders 1`] = `
           >
             Option 2
           </option>
-        </glformselect-stub>
-      </glformgroup-stub>
+        </gl-form-select-stub>
+      </gl-form-group-stub>
        
-      <glformgroup-stub
+      <gl-form-group-stub
         id="expiration-policy-schedule-group"
         label="Expiration schedule:"
         label-align="right"
         label-cols="3"
         label-for="expiration-policy-schedule"
       >
-        <glformselect-stub
+        <gl-form-select-stub
           id="expiration-policy-schedule"
         >
           <option
@@ -88,17 +88,17 @@ exports[`Settings Form renders 1`] = `
           >
             Option 2
           </option>
-        </glformselect-stub>
-      </glformgroup-stub>
+        </gl-form-select-stub>
+      </gl-form-group-stub>
        
-      <glformgroup-stub
+      <gl-form-group-stub
         id="expiration-policy-latest-group"
         label="Expiration latest:"
         label-align="right"
         label-cols="3"
         label-for="expiration-policy-latest"
       >
-        <glformselect-stub
+        <gl-form-select-stub
           id="expiration-policy-latest"
         >
           <option
@@ -112,10 +112,10 @@ exports[`Settings Form renders 1`] = `
           >
             Option 2
           </option>
-        </glformselect-stub>
-      </glformgroup-stub>
+        </gl-form-select-stub>
+      </gl-form-group-stub>
        
-      <glformgroup-stub
+      <gl-form-group-stub
         id="expiration-policy-name-matching-group"
         invalid-feedback="The value of this input should be less than 255 characters"
         label="Expire Docker tags with name matching:"
@@ -123,32 +123,32 @@ exports[`Settings Form renders 1`] = `
         label-cols="3"
         label-for="expiration-policy-name-matching"
       >
-        <glformtextarea-stub
+        <gl-form-textarea-stub
           id="expiration-policy-name-matching"
           placeholder=".*"
           trim=""
           value=""
         />
-      </glformgroup-stub>
+      </gl-form-group-stub>
     </div>
      
     <div
       class="card-footer text-right"
     >
-      <glbutton-stub
+      <gl-button-stub
         type="reset"
       >
         Cancel
-      </glbutton-stub>
+      </gl-button-stub>
        
-      <glbutton-stub
+      <gl-button-stub
         type="submit"
         variant="success"
       >
         
         Save Expiration Policy
       
-      </glbutton-stub>
+      </gl-button-stub>
     </div>
   </form>
 </div>