[bot] Merge 26.5 to develop (Conflicts)#636
Merged
Merged
Conversation
…tion, and Selenium tests (#622) - `TestResultsSchema `extends UserSchema with DefaultSchema.registerProvider() registration, FK lookup columns, and wrapAllColumns() in createTable() - _Post-deploy_: Delete external schema on skyline.ms since the code-level registration now supersedes it. - Added form classes replacing all request.getParameter() calls across all actions - Integer/Boolean for optional form parameters with null guards and descriptive error messages - ParseException handling with SimpleErrorView for date parameters - `cause` field added to error API responses; JSP alert messages updated to display it - Added addNavTrail overrides to prevent missing page title warnings - New `TestResultsTest` Selenium test class covering begin page, show run, run lookup, user runs, long-term trends, failures, flagging, and training data workflows - `BeginAction` (rundown page, date navigation, viewType selector) - `ShowRunAction` (run detail, pass sorting) - `ShowUserAction` (user page, date range) - `LongTermAction` (viewType selector) - `ShowFailuresAction` (failure detail, viewType selector) - `FlagRunAction` / `ShowFlaggedAction` (flag/unflag workflow) - `TrainRunAction` / `TrainingDataViewAction` (add/remove training set workflow) - `ViewLogAction` (view run log) - `ViewXMLAction` (view run XML) - `ChangeBoundariesAction` (update warning/error boundaries) - `SetUserActiveAction` (activate/deactivate user) - `DeleteRunAction` (delete a run) - Replaced deprecated `javax.management.modelmbean.XMLParseException` with `IllegalArgumentException` - Switched from `org.springframework.util.StringUtils` to `org.apache.commons.lang3.StringUtils`
labkey-klum
force-pushed
the
fb_bot_merge_26.5
branch
from
daf4629 to
9de34b1
Compare
labkey-klum
approved these changes
May 20, 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.5intofb_bot_merge_26.5and 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=fb_bot_merge_26.5