Merge remote-tracking branch 'origin/main' into feat/add-option-to-mask-and-protect-gitlab-secrets

frontend/src/hooks/api/integrations/queries.tsx

@@ -75,6 +75,7 @@ export const useCreateIntegration = () => {
         shouldDisableDelete?: boolean;
         shouldMaskSecrets?: boolean;
         shouldProtectSecrets?: boolean;
+        shouldEnableDelete?: boolean;
       };
     }) => {
       const {

frontend/src/hooks/api/serverDetails/types.ts

@@ -4,4 +4,5 @@ export type ServerStatus = {
   emailConfigured: boolean;
   secretScanningConfigured: boolean;
   redisConfigured: boolean;
+  samlDefaultOrgSlug: boolean
 };