Skip to content

[bot] Merge 26.3 to develop#7699

Open
github-actions[bot] wants to merge 7 commits into
developfrom
fb_bot_merge_26.3
Open

[bot] Merge 26.3 to develop#7699
github-actions[bot] wants to merge 7 commits into
developfrom
fb_bot_merge_26.3

Conversation

@github-actions
Copy link
Copy Markdown

Generated automatically.
Merging changes from: 55fbb3f
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.3

XingY and others added 7 commits May 19, 2026 13:17
#### Rationale
Protein name display looks better when the popup widget isn't wrapped to
the next line in a table cell.

#### Changes
- Inject a non-breaking space to ensure no inopportune wrapping

#### Tasks 📍
- [x] Claude Code Review
- [x] Manual Testing @labkey-tchad 
  - Create a Panorama folder (subtype: Experiment)
- Import MRMer.zip
(https://github.com/LabKey/targetedms/blob/develop/test/sampledata/TargetedMS/MRMer.zip)
  - Click the Peptide Groups link in the runs grid
- Check that the protein name and down-arrow render without wrapping
       - [x] Verify Safari
       - [x] Verify Firefox
       - [x] Verify Chrome  
- ~Test Automation~

<img width="1085" height="355" alt="image"
src="https://github.com/user-attachments/assets/a1642c62-49fc-4925-8ce7-789e9cc6c39a"
/>
…>boolean (#7669)

- `AuditModule.registerMigrationHandlers` registers the audit schema with `DatabaseMigrationService` so all source rows are carried.
- `HasDetailsCastColumn` (private static `WrappedColumn`) wraps the `HasDetails` column to emit `CAST(... AS BIT)` in the source SELECT and report `JdbcType.BOOLEAN`.

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
#### Rationale
Simplify the `study` schema's queries.

#### Changes
- Remove unused table
#### Rationale
Servers that run both HTTP and HTTPS can end up choosing to send
`jsessionid` values as GET parameters, because they may have an HTTP
cookie that set to `Secure`. In scenarios like this, we want to be sure
that we end up redirecting the client to HTTPS. We don't want session
IDs to ever leak onto the URL.

#### Changes
- Tell Tomcat to only use cookies for communicating sessions

#### Tasks 📍
- [x] Claude Code Review
- [x] Manual Testing @labkey-tchad 
  - Configure HTTPS via `application.properties`
  - Enable a separate HTTP port
  - Don't have HTTP->HTTPS redirect enabled in Site Settings
  - Log in via HTTPS
  - Hit the server via HTTP
  - Ensure you don't see a session on the URL 
- ~Test Automation~
- ~Verify Fix~
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.

5 participants