[bot] Merge 26.3 to 26.6 (Conflicts)#642
Merged
Merged
Conversation
- Added server-side kaptcha verification to SignUpApiAction and BeginAction - Extracted shared helpers so both action paths follow the same verification sequence in the same order - Added emailConfirm field requiring users to enter their email address twice - Fixed two API path bugs: EmailValidator.isValid was not called, and a sendEmail failure was falling through to status=USER_ADDED - Wrapped TempUser insert + confirmation email in a transaction so the row is rolled back if email delivery fails - Rewrote signupPage.jsp to use <labkey:form> and <labkey:input> taglibs
Conflicts: signup/src/org/labkey/signup/signupPage.jsp
labkey-tchad
force-pushed
the
26.6_fb_bot_merge_26.3
branch
from
0537891 to
e920dad
Compare
labkey-tchad
approved these changes
Jun 2, 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
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.6_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.6_fb_bot_merge_26.3