diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts index fd4953708c..cdadb595e0 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts @@ -26,7 +26,7 @@ describe( ], }, function () { - it("Check if autocommit progress bar is visible and network requests are properly called", function () { + it.skip("Check if autocommit progress bar is visible and network requests are properly called", function () { agHelper.GenerateUUID(); cy.get("@guid").then((uid) => { wsName = "GitAC-" + uid; diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java index 91b611d8b9..f26eeae706 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java @@ -15,6 +15,7 @@ import com.appsmith.server.domains.Artifact; import com.appsmith.server.domains.GitArtifactMetadata; import com.appsmith.server.domains.GitAuth; import com.appsmith.server.dtos.AutoCommitResponseDTO; +import com.appsmith.server.dtos.AutoCommitResponseDTO.AutoCommitResponse; import com.appsmith.server.dtos.BranchProtectionRequestDTO; import com.appsmith.server.dtos.GitAuthDTO; import com.appsmith.server.dtos.GitConnectDTO; @@ -288,9 +289,12 @@ public class GitApplicationControllerCE { artifactType = ArtifactType.APPLICATION, operation = GitRouteOperation.AUTO_COMMIT) public Mono> autoCommitApplication(@PathVariable String branchedApplicationId) { - return autoCommitService - .autoCommitApplication(branchedApplicationId) - .map(data -> new ResponseDTO<>(HttpStatus.OK, data)); + // disabling autocommit till in-memory git has been incorporated in the auto-commit + AutoCommitResponseDTO autoCommitResponseDTO = new AutoCommitResponseDTO(); + autoCommitResponseDTO.setAutoCommitResponse(AutoCommitResponse.IDLE); + autoCommitResponseDTO.setProgress(0); + + return Mono.just(autoCommitResponseDTO).map(data -> new ResponseDTO<>(HttpStatus.OK, data)); } @JsonView(Views.Public.class)