Skip to content

[bot] Fast-forward for 26.6.0#1246

Merged
github-actions[bot] merged 14 commits into
release26.6from
26.6_ff_bot_26.6.0
Jun 22, 2026
Merged

[bot] Fast-forward for 26.6.0#1246
github-actions[bot] merged 14 commits into
release26.6from
26.6_ff_bot_26.6.0

Conversation

@github-actions

Copy link
Copy Markdown

Generated automatically.
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
View all PRs: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.6_ff_bot_26.6.0

ankurjuneja and others added 14 commits June 2, 2026 07:06
… dense plots (#1225)

#### Rationale
LabKey/internal-issues#1207 - Annotations on
dense plots gets hindered by 'Add Annotation' markers making it
difficult to hover or click the annotation to see/modify the details.

#### Changes
* Render annotation glyphs after add annotation glyphs
…1226)

- Do not show library spectra to guests when the spectrum library file is ≥ 500 MB; show the existing "Login to view this data" message instead.
- The restriction applies to all library-read paths (the spectrum panel, the spectrum AJAX endpoint, and the chromatogram peptide-ID retention-time markers).
- Logged-in users and small libraries are unaffected.

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
#1231)

- Log a single WARN line (with the exception type) instead of the full trace.
- Keep the full stack trace at DEBUG (off by default at INFO) for when it is needed.
…MS CV (#1232)

- ~120 instruments were added in a single release in Sept 2025 (driven by metabolomics data repositories)
- Recently, new instruments announced at ASMS 2026 were added in release 4.1.254
#### Rationale
PassportTest needs an update to expect the updated data being pulled
dynamically from UniProt

#### Changes
* Be tolerant of changes in protein metadata from third-party service
* Add container checks
* Backport query name quoting
 Conflicts:
	src/org/labkey/targetedms/outliers/OutlierGenerator.java
	test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
 Conflicts:
	test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java
 Conflicts:
	src/org/labkey/targetedms/parser/skyaudit/AuditLogEntry.java
@github-actions github-actions Bot merged commit 71ebccd into release26.6 Jun 22, 2026
15 of 17 checks passed
@github-actions github-actions Bot deleted the 26.6_ff_bot_26.6.0 branch June 22, 2026 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants