[bot] Merge 26.3 to 26.7 (Conflicts)#1261
Merged
github-actions[bot] merged 3 commits intoJul 20, 2026
Merged
Conversation
…during heavy bot traffic (#1259) - Added a site-admin console page "Targeted MS Guest Access" (`GuestAccessSettingsAction`) with a master switch that is off by default plus one checkbox per action that can be restricted. - The actions checked by default are: `showProtein`, `showPeptide`, `showMolecule`, and `showCalibrationCurve`. - The following actions are offered but off by default: `showPrecursorList` and four chart-image endpoints (`showPeakAreas`, `showRetentionTimesChart`, `precursorChromatogramChart`, `groupChromatogramChart`). - Detail pages show the inline login view to a blocked guest. The chart-image endpoints cannot return that HTML, so they redirect a blocked guest to the login page. - Settings are stored as site properties on the root container, and a change is recorded in the site-settings audit log. - The admin-console link appears only when the `panoramapublic` module is available on a server. - Added a Selenium test, TargetedMSGuestAccessTest, covering the detail pages, a chart endpoint, per-action independence, and confirming that pages already restricted to guests (e.g. the precursor all-chromatograms page) stay blocked whether the toggle is on or off. --------- Co-authored-by: Claude <noreply@anthropic.com>
cnathe
force-pushed
the
26.7_fb_bot_merge_26.3
branch
from
July 20, 2026 13:33
af34125 to
9460f6c
Compare
cnathe
approved these changes
Jul 20, 2026
github-actions
Bot
merged commit Jul 20, 2026
9460f6c
into
release26.7-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
26.3into26.7_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.7_fb_bot_merge_26.3