[bot] Merge 25.7 to develop (Conflicts) #2587
Merged
Conversation
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
- Regression test - Issue 51569: Can't customize Files webpart in a container with spaces - Update `FilesWebpartFileRootTest` to cover subfolder with spaces - Regression test - Issue 51815: FileRootMaintenanceTask throws RuntimeException for S3-backed folders - `FileContentUploadTest.testCalculateFileRootSize` (inherited by `S3FileContentUploadTest`) - Create `ConfigureSystemMaintenancePage` with minimal functionality
labkey-tchad
force-pushed
the
fb_bot_merge_25.7
branch
from
4e04e70 to
bc5f7d2
Compare
labkey-tchad
approved these changes
Jul 29, 2025
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
25.7intofb_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=fb_bot_merge_25.7