Add latest changes from gitlab-org/gitlab@master

2 files changed, 45 insertions, 33 deletions

diff --git a/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
index dd3589e2951..ef61a835918 100644
--- a/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
@@ -81,19 +81,23 @@ exports[`Alert integration settings form default state should match the default
       </gl-form-checkbox-stub>
     </gl-form-group-stub>
      
-    <gl-button-stub
-      category="tertiary"
-      class="js-no-auto-disable"
-      data-qa-selector="save_changes_button"
-      icon=""
-      size="medium"
-      type="submit"
-      variant="success"
+    <div
+      class="gl-display-flex gl-justify-content-end"
     >
+      <gl-button-stub
+        category="tertiary"
+        class="js-no-auto-disable"
+        data-qa-selector="save_changes_button"
+        icon=""
+        size="medium"
+        type="submit"
+        variant="success"
+      >
+        
+        Save changes
       
-      Save changes
-    
-    </gl-button-stub>
+      </gl-button-stub>
+    </div>
   </form>
 </div>
 `;
diff --git a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
index 4ac20275319..c0fee56c9d8 100644
--- a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
@@ -42,20 +42,24 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
         />
       </div>
        
-      <gl-button-stub
-        category="tertiary"
-        class="gl-mt-3"
-        data-testid="webhook-reset-btn"
-        icon=""
-        role="button"
-        size="medium"
-        tabindex="0"
-        variant="default"
+      <div
+        class="gl-display-flex gl-justify-content-end"
       >
+        <gl-button-stub
+          category="tertiary"
+          class="gl-mt-3"
+          data-testid="webhook-reset-btn"
+          icon=""
+          role="button"
+          size="medium"
+          tabindex="0"
+          variant="default"
+        >
+          
+          Reset webhook URL
         
-        Reset webhook URL
-      
-      </gl-button-stub>
+        </gl-button-stub>
+      </div>
        
       <gl-modal-stub
         modalclass=""
@@ -72,18 +76,22 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
       </gl-modal-stub>
     </gl-form-group-stub>
      
-    <gl-button-stub
-      category="tertiary"
-      class="js-no-auto-disable"
-      icon=""
-      size="medium"
-      type="submit"
-      variant="success"
+    <div
+      class="gl-display-flex gl-justify-content-end"
     >
+      <gl-button-stub
+        category="tertiary"
+        class="js-no-auto-disable"
+        icon=""
+        size="medium"
+        type="submit"
+        variant="success"
+      >
+        
+        Save changes
       
-      Save changes
-    
-    </gl-button-stub>
+      </gl-button-stub>
+    </div>
   </form>
 </div>
 `;