Skip to content

[bot] Merge 26.3 to 26.4 (Conflicts)#7554

Open
github-actions[bot] wants to merge 5 commits intorelease26.4-SNAPSHOTfrom
26.4_fb_bot_merge_26.3
Open

[bot] Merge 26.3 to 26.4 (Conflicts)#7554
github-actions[bot] wants to merge 5 commits intorelease26.4-SNAPSHOTfrom
26.4_fb_bot_merge_26.3

Conversation

@github-actions
Copy link
Copy Markdown

@github-actions github-actions bot commented Apr 7, 2026

Automatic merge failed! Please merge 26.3 into 26.4_fb_bot_merge_26.3 and resolve conflicts manually.

git fetch
git checkout 26.4_fb_bot_merge_26.3
git reset --hard origin/release26.4-SNAPSHOT
git merge be13ff50beebdc5c878d805c445cc6d49297552f -m "Merge 26.3 to 26.4"

Resolve all conflicts (using IntelliJ or git mergetool)

git commit
git push --force

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.4_fb_bot_merge_26.3

labkey-jeckels and others added 5 commits March 31, 2026 16:43
…abs (#7534)

#### Rationale
We are inappropriately tagging our folder portal tabs with
`role="presentation"`. You're not allowed to use it on an `<li>` without
a similar tag on a parent element like the `<ul>`.

Since these tabs are full-page navigations instead of in-page
replacements, it seems the most appropriate thing is to simply remove
this incorrect attribute.

https://www.w3.org/WAI/ARIA/apg/practices/hiding-semantics/

#### Changes
- Remove `role="presentation"` from folder portal tabs
- Signify the active tab using `aria-current="page"`

<!-- list of standard tasks (remove this comment to enable)
#### Tasks 📍
- [ ] Manual Testing
- [ ] Needs Automation
- [ ] Verify Fix
-->
…igner (#7544)

- update @labkey/components package version
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.

4 participants