[bot] Merge 26.3 to 26.7 (Conflicts)#7604
Closed
github-actions[bot] wants to merge 9 commits intorelease26.4-SNAPSHOTfrom
Closed
[bot] Merge 26.3 to 26.7 (Conflicts)#7604github-actions[bot] wants to merge 9 commits intorelease26.4-SNAPSHOTfrom
github-actions[bot] wants to merge 9 commits intorelease26.4-SNAPSHOTfrom
Conversation
…#7578) #### Rationale We read transform scripts during assay design save. We open but don't close the file. This is impolite, and Windows automated tests have been noticing. https://teamcity.labkey.org/buildConfiguration/LabKey_263Release_Premium_CommunitySqlserver_DailyCSqlserver/3929893?buildTab=tests&status=failed&expandedTest=build%3A%28id%3A3929893%29%2Cid%3A2000000048 #### Related Pull Requests - LabKey/testAutomation#2946 #### Changes - try-with-resources is the polite way to handle InputStreams <!-- list of standard tasks (remove this comment to enable) #### Tasks 📍 - [ ] Manual Testing - [ ] Needs Automation - [ ] Verify Fix -->
…that update storage data (#7579)
… browser (#7567) #### Rationale More elements in the header need aria-label values too. We also need to more in our file UI and when we show attachments. See details at https://www.labkey.org/MacCoss/support%20tickets/issues-download.view?issueId=54460&entityId=143f5498-165e-103f-837d-d61362bf9037&name=New%20Dubbot%20findings%20on%20https___skyline.ms.pdf #### Changes - Add the missing attributes in the header - Improve consistency for attachment rendering - Add labels to buttons in WebDav UI - Improve scrollability #### Tasks 📍 - [x] Manual Testing @labkey-matthewb - [x] Fix [FileContentTest](https://teamcity.labkey.org/buildConfiguration/LabKey_263Release_Community_ModuleSuites_FileContentPostgres/3934680) - ~Needs Automation~ - ~Verify Fix~
…Visit resolver field is set to 'fixed value' default (#7592) - ParticipantVisitResolverChooser disabled state fix to use getHtmlString() isntead of appendTo()
#### Rationale Fix McpServerTest also switch default back to the default of gemini-flash #### Related Pull Requests - <!-- list of links to related pull requests (replace this comment) --> #### Changes - <!-- list of descriptions of changes that are worth noting (replace this comment) --> <!-- list of standard tasks (remove this comment to enable) #### Tasks 📍 - [ ] Manual Testing - [ ] Test Automation - [ ] Verify Fix -->
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
7 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.4_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.4_fb_bot_merge_26.3