[bot] Merge 26.6 to develop (Conflicts)#7721
Merged
Merged
Conversation
#### Rationale Simple server-side action to help with LabKey/internal-issues#1023 #### Tasks 📍 - [x] Claude Code Review - [x] Code Review - [x] Manual Testing (server action) @cnathe - [x] Manual Testing (client) @labkey-adam Testing and verification of the issue fix will come after the client changes are implemented. #### Related PR - LabKey/testAutomation#3023 --------- Co-authored-by: cnathe <cnathe@labkey.com>
#### Rationale Google now documents their CSP requirements for using Google Analytics. Let's include everything they list, even if Firefox is the only browser that needs the extra server. #### Changes - Add `www.google.com` to `connect-src`
Conflicts: study/test/src/org/labkey/test/tests/study/AssayTest.java
Conflicts: study/test/src/org/labkey/test/tests/study/AssayTest.java
labkey-tchad
force-pushed
the
fb_bot_merge_26.6
branch
from
df68a3f to
158a680
Compare
labkey-tchad
approved these changes
Jun 3, 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
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.6intofb_bot_merge_26.6and 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.6