Merge pull request appsmithorg#40460 from appsmithorg/release 28/04 Daily Promotion

Merge pull request appsmithorg#40337 from appsmithorg/release 22/04 Daily Promotion

Merge pull request appsmithorg#40240 from appsmithorg/release 14/04 Daily Promotion

Merge pull request appsmithorg#40186 from appsmithorg/cp/20250410-1 chore: Cherry picking to nightly 09/04 - 1

Merge pull request appsmithorg#40080 from appsmithorg/cherry-pick/spe… …c-fix-4Apr25 chore: Adding handling for empty environment variable for SSO configu…

chore: cherry pick git executor revert (appsmithorg#39954) ## Description - Git executor CE Impl revert PR appsmithorg#39949 Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.Git" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!CAUTION] > 🔴 🔴 🔴 Some tests have failed. > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/14106311517> > Commit: cef9ab7 > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=14106311517&attempt=2&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank">Cypress dashboard</a>. > Tags: @tag.Git > Spec: > The following are new failures, please fix them before merging the PR: <ol> > <li>cypress/e2e/Regression/Apps/ImportExportForkApplication_spec.js > <li>cypress/e2e/Regression/ClientSide/BugTests/CatchBlock_Spec.ts > <li>cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28985_spec.ts > <li>cypress/e2e/Regression/ClientSide/BugTests/GraphQL_Binding_Bug16702_Spec.ts > <li>cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts > <li>cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js > <li>cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js > <li>cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js > <li>cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js > <li>cypress/e2e/Regression/ClientSide/Widgets/Migration_Spec.js > <li>cypress/e2e/Regression/ServerSide/ApiTests/API_MultiPart_Spec.ts > <li>cypress/e2e/Regression/ServerSide/ApiTests/API_TestExecuteWithDynamicBindingInUrl_spec.ts > <li>cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad2_Spec.ts > <li>cypress/e2e/Regression/ServerSide/Params/PassingParams_Spec.ts</ol> > <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">List of identified flaky tests</a>. > <hr>Thu, 27 Mar 2025 15:43:27 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Bug Fixes** - Improved recovery for repository operations by automatically reverting to a stable state when errors occur, reducing conflict risks and ensuring a consistent environment. - **Refactor** - Optimized the overall error handling and state management logic to better maintain system stability during update and merge operations. <!-- end of auto-generated comment: release notes by coderabbit.ai -->

fix: CSRF token in email verification form 

Merge pull request appsmithorg#39555 from appsmithorg/release 05/03 Daily Promotion

chore: Code split for logout success handler (appsmithorg#39296) 

Merge pull request appsmithorg#39177 from appsmithorg/chore/cherry-pi… …ck-11Feb24 fix: Scheduling the heavy database ops on bounded elastic thread pool…