[bot] Merge 25.7 to 25.11 (Conflicts)#910
Merged
github-actions[bot] merged 2 commits intorelease25.11-SNAPSHOTfrom Apr 17, 2026
Merged
[bot] Merge 25.7 to 25.11 (Conflicts)#910github-actions[bot] merged 2 commits intorelease25.11-SNAPSHOTfrom
github-actions[bot] merged 2 commits intorelease25.11-SNAPSHOTfrom
Conversation
* Factor out unnecessary and unsupported packages * Update all other packages to latest versions (including react, redux and react-dnd) * Update webpack build to use standard @labkey/build * Update entrypoint and production/dev server entry points * Many refactors associated with package updates including bootstrap and react-data-grid updates * Refactor all grids using react-bootstrap-table to instead use react-data-grid * Start conversion of JS and JSX files to TS and TSX * Update jest tests to new libraries and webpack
cnathe
force-pushed
the
25.11_fb_bot_merge_25.7
branch
from
f51af2a to
56c4db6
Compare
cnathe
approved these changes
Apr 17, 2026
github-actions
Bot
merged commit 56c4db6
into
release25.11-SNAPSHOT
7 of 8 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
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