[bot] Merge 26.3 to 26.7 (Conflicts)#988
Merged
Merged
Conversation
#### Rationale Jen reported some issues with the hematology upload. This patch is a fix for those problems. #### Related Pull Requests * <!-- list of links to related pull requests (replace this comment) --> #### Changes - Updated the parser to accept multiple tests for the same animal - Fixed the incorrect MPV value due to a change in the analyzer - Fixed a problem causing the parser to fail / give 0 value if tests not included in the report were uploaded
#### Rationale Fixes two bugs caused by recent changes in the current cageUI version. #### Related Pull Requests #### Changes - Bug fix for crashes caused by clicking on room object items that were not gates. - Bug fix causing two rooms to be loaded in one display caused by a race condition.
#### Rationale cageui_svg_urls line in lookup_sets (added as part of related PR) uses spaces instead of tab causing TC failure: https://teamcity.labkey.org/buildConfiguration/LabKey_263Release_External_Wnprc_WnprcEhrPostgres2/4068462?expandedTest=build%3A%28id%3A4068462%29%2Cid%3A2000000006 org.openqa.selenium.NoSuchElementException: Expected condition failed: waiting for xpath=//div[contains(text(), 'Delete Complete')] #### Related Pull Requests * #968 #### Changes * Use tab
cnathe
force-pushed
the
26.7_fb_bot_merge_26.3
branch
from
3c6c6d1 to
c6e6412
Compare
cnathe
approved these changes
Jul 7, 2026
github-actions
Bot
merged commit ef44268
into
release26.7-SNAPSHOT
9 of 11 checks passed
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.7_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.7_fb_bot_merge_26.3