[bot] Merge 25.7 to 25.11 (Conflicts)#7748
Merged
github-actions[bot] merged 4 commits intoJun 12, 2026
Merged
Conversation
#### Rationale We give very opaque error feedback if an attempted ETL remote connection fails. #### Changes - Differentiate between IO and TLS problems - Log full exception #### Tasks 📍 - [x] Claude Code Review - ~Manual Testing~ - [x] Test Automation
#### Rationale Lint cleanup and SQL improvements #### Changes - Clear assorted IntelliJ warnings - Use JDBC parameter
#### Rationale We can improve our parameter validation #### Changes - New helpful base class for integration tests, `AbstractContainerScopingTest` - New test coverage - Assorted scoping checks
labkey-tchad
force-pushed
the
25.11_fb_bot_merge_25.7
branch
from
f77c076 to
77091ce
Compare
Conflicts: core/src/org/labkey/core/CoreModule.java query/src/org/labkey/query/QueryModule.java study/src/org/labkey/study/StudyModule.java wiki/src/org/labkey/wiki/WikiController.java
labkey-tchad
force-pushed
the
25.11_fb_bot_merge_25.7
branch
from
77091ce to
db27abf
Compare
labkey-tchad
approved these changes
Jun 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automatic merge failed! Please merge
25.7into25.11_fb_bot_merge_25.7and resolve conflicts manually.Resolve all conflicts (using IntelliJ or
git mergetool)Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=25.11_fb_bot_merge_25.7