This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch 7.1.x in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 7af49e11bea7352ea3cdb940303476a5b8635a27 Merge: 2a92830b90 b184964f0f Author: James Daugherty <[email protected]> AuthorDate: Wed Jan 14 09:30:10 2026 -0500 Merge branch '7.0.x' into 7.1.x .github/workflows/codestyle.yml | 6 +++--- .github/workflows/gradle.yml | 18 +++++++++--------- .github/workflows/rat.yml | 2 +- grails-data-graphql/core/build.gradle | 1 - .../examples/spring-boot-app/build.gradle | 1 - .../docs/asciidoc/gettingStarted/outsideGrails.adoc | 19 +++++++++++-------- grails-doc/src/en/guide/async/asyncGorm.adoc | 2 +- grails-doc/src/en/guide/async/asyncPromises.adoc | 8 ++++++-- grails-doc/src/en/guide/async/events.adoc | 4 ++-- grails-doc/src/en/guide/async/rxjava.adoc | 2 +- grails-doc/src/en/guide/commandLine.adoc | 5 +++-- .../commandLine/gradleBuild/gradleDependencies.adoc | 6 +++--- .../en/guide/gettingStarted/developmentReloading.adoc | 13 ++++++++++++- .../src/en/guide/profiles/profileStructure.adoc | 4 ++-- grails-doc/src/en/guide/scaffolding.adoc | 2 +- .../en/guide/testing/unitTesting/installation.adoc | 4 ++-- .../guide/theWebLayer/fields/fieldsInstallation.adoc | 2 +- .../fields/scaffolding/installation/index.adoc | 2 +- .../src/en/guide/theWebLayer/gson/gsonTesting.adoc | 2 +- .../en/guide/theWebLayer/gson/jsonInstallation.adoc | 6 +++--- .../src/en/guide/theWebLayer/gson/pluginSupport.adoc | 8 ++++---- grails-doc/src/en/guide/theWebLayer/gsp.adoc | 2 +- .../theWebLayer/gsp/taglibs/usingJSPTagLibraries.adoc | 2 +- grails-doc/src/en/guide/upgrading/upgrading60x.adoc | 12 +++++++++++- grails-gsp/grails-layout/build.gradle | 2 -- .../mapping/mvc/UrlMappingsInfoHandlerAdapter.groovy | 2 +- 26 files changed, 81 insertions(+), 56 deletions(-)
