[bot] Merge 26.7 to develop (Conflicts)#7850
Merged
Merged
Conversation
## Rationale Client requested a few more options in the "Require terms-of-use acceptance" drop-down list. LabKey/internal-issues#1202 ## Related Pull Requests - #7776 ## Changes - Add 90, 180, and 365 days as options
## Rationale Make the sql-execute code reusable, and expose new tool QueryMCP.executeSQL ## 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 📍 - [ ] Claude Code Review - [ ] Manual Testing - [ ] Test Automation - [ ] Verify Fix --> --------- Co-authored-by: Adam Rauch <adam@labkey.com>
## Rationale Update to the latest API key dialog ## Related Pull Requests - LabKey/labkey-ui-components#2032 - LabKey/limsModules#2327
## Rationale LabKey Server's OWASP Dependency Check build is failing on develop; ActiveMQ 5.19.7 accounts for nine of those findings. Bumping to 5.19.8 clears all nine. this is a backport from develop ## Related Pull Requests - #7824 ## Changes - Bump ActiveMQ 5.19.7 -> 5.19.8: CVE-2026-49877 (HIGH 8.1) plus CVE-2026-49432, CVE-2026-49434, CVE-2026-50734, CVE-2026-50750, CVE-2026-53916, CVE-2026-53917, CVE-2026-54475, CVE-2026-52760 <!-- list of standard tasks (remove this comment to enable) ## Tasks 📍 - [ ] Claude Code Review - [ ] Manual Testing - [ ] Test Automation - [ ] Verify Fix -->
## Rationale The `frame-ancestors` directive of our standard CSP is the modern way to control what other sites can "frame" a LabKey deployment (none, by default). The `X-Frame-Options` header is effectively obsolete, ignored by any browser that supports `frame-ancestors`. [All major browsers have supported `frame-ancestors` for 10 years](https://caniuse.com/?search=frame-ancestors+) and hence ignore `X-Frame-Options`. ## Related Pull Requests - LabKey/testAutomation#3094
## Rationale The `Excel multi-tab` metric uses a subquery without an alias which isn't supported until Postgres 16+ ## Changes - Add an alias ## Tasks 📍 - [x] Claude Code Review - ~Manual Testing~ - ~Test Automation~
## Rationale For troubleshooting asistance ## 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 📍 - [ ] Claude Code Review - [ ] Manual Testing - [ ] Test Automation - [ ] Verify Fix --> Co-authored-by: Adam Rauch <adam@labkey.com>
## Rationale This permission is added to SiteAdmin and PlatformDeveloper when mode=dev [<!-- Rationale describing why this pull request is needed, what behavior it's adding/changing/removing, etc. (replace this comment) -->](LabKey/internal-issues#1305) ## 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 📍 - [ ] Claude Code Review - [ ] Manual Testing - [ ] Test Automation - [ ] Verify Fix -->
## Rationale BulkUpgradeGroupAction is inconsistent with other actions for its permission checks ## Changes - Check container and for a separate permission for adding a new user
…dsAction (#7841) ## Rationale We no longer support cross-folder imports, so no need to look beyond the current container ## Related Pull Requests - <!-- list of links to related pull requests (replace this comment) --> ## Changes - Always use the current container for filtering purposes ## Tasks 📍 - [x] Claude Code Review - ~Manual Testing~ - ~Test Automation~
cnathe
force-pushed
the
fb_bot_merge_26.7
branch
from
d69d0ed to
dd6832a
Compare
cnathe
approved these changes
Jul 15, 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
10 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.7intofb_bot_merge_26.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_26.7