[bot] Merge 26.3 to 26.6 (Conflicts)#1033
Merged
github-actions[bot] merged 7 commits intoJun 21, 2026
Merged
Conversation
#### Rationale We want consistent XML parser config #### Related Pull Requests * LabKey/platform#7751 #### Changes * Use central XML parser config * Clarify permissions on protein naming
#### Rationale Add permission checks for objects referenced by rowID. - Flow module updates with FlowManager integration tests. - NAb module updates. - Elispot module updates - Luminex module updates #### Related Pull Requests - LabKey/platform#7747 - #1022 - LabKey/testAutomation#3042 --------- Co-authored-by: labkey-nicka <nickk@labkey.com> Co-authored-by: cnathe <cnathe@labkey.com>
#### Rationale Adds improved container scoping validation for module objects that are referenced through an ID. Test automation to validate the scenario is also added. --------- Co-authored-by: cnathe <cnathe@labkey.com>
Conflicts: flow/src/org/labkey/flow/data/FlowProtocol.java nab/src/org/labkey/nab/NabAssayController.java signalData/src/org/labkey/signaldata/SignalDataController.java signalData/src/org/labkey/signaldata/SignalDataModule.java
Conflicts: protein/api-src/org/labkey/api/protein/annotation/XMLProteinHandler.java
Conflicts: elispotassay/src/org/labkey/elispot/ElispotController.java microarray/src/org/labkey/microarray/MicroarrayManager.java signalData/src/org/labkey/signaldata/SignalDataModule.java
labkey-tchad
force-pushed
the
26.6_fb_bot_merge_26.3
branch
from
8238f40 to
14813e7
Compare
labkey-tchad
approved these changes
Jun 21, 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
5 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
26.3into26.6_fb_bot_merge_26.3and 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=26.6_fb_bot_merge_26.3