[bot] Merge 26.3 to 26.5 (Conflicts)#7662
Merged
github-actions[bot] merged 4 commits intoMay 12, 2026
Merged
Conversation
#### Rationale Exporting a folder archive with many samples or other experiment objects can result in thousands or hundreds of thousands of not very interesting log entries. #### Changes - Reduce entity row level logging to `DEBUG` - Delete dead code - Always use a logger, falling back to a default on `XarExporter` #### Tasks 📍 - ~Manual Testing~ - ~Test Automation~
#### Rationale We should switch cache clearing and heap dumping from GET to POST, and we can do more specific permission checks on a few actions. #### Changes - Move cache clearing and garbage collecting to an API - Add a confirmation on heap dumping - Use DOM builder for cache listings - Generics and other lint cleanup #### Tasks 📍 - [x] Manual Testing @labkey-adam - [x] Verify caches page continues to render - [x] Verify that cache clearing, GC, and heap dumping UI still works from Admin Console - [x] Verify that clear caches, GC, and heap dump require POST - [x] Test Automation
labkey-klum
force-pushed
the
26.5_fb_bot_merge_26.3
branch
from
84dbb31 to
a90363d
Compare
labkey-klum
approved these changes
May 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
4 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.5_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.5_fb_bot_merge_26.3