Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 2.19.x up into 2.20.x #11656

Merged
merged 6 commits into from
Oct 10, 2024
Merged

Merge 2.19.x up into 2.20.x #11656

merged 6 commits into from
Oct 10, 2024

Commits on Oct 9, 2024

  1. Configuration menu
    Copy the full SHA
    16a8f10 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Run risky code in finally block

    catch blocks are not supposed to fail. If you want to do something
    despite an exception happening, you should do it in a finally block.
    
    Closes #7545
    greg0ire committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    51be1b1 View commit details
    Browse the repository at this point in the history
  2. Add guard clause

    It maybe happen that the SQL COMMIT statement is successful, but then
    something goes wrong. In that kind of case, you do not want to attempt a
    rollback.
    
    This was implemented in UnitOfWork::commit(), but for some reason not in
    the similar EntityManager methods.
    greg0ire committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    b6137c8 View commit details
    Browse the repository at this point in the history
  3. Remove submodule remnant

    This should make a warning we have in the CI go away.
    
    >  fatal: No url found for submodule path 'docs/en/_theme' in .gitmodules
    greg0ire committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    bac1c17 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #11655 from greg0ire/submodule-cleanup

    Submodule cleanup
    greg0ire authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    6281c2b View commit details
    Browse the repository at this point in the history
  5. Merge pull request #11646 from greg0ire/finally-fix-bug

    Run risky code in finally block
    greg0ire authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    c2c5000 View commit details
    Browse the repository at this point in the history