[bot] Merge 26.3 to 26.6 (Conflicts)#212
Merged
github-actions[bot] merged 4 commits intoJun 21, 2026
Merged
Conversation
#### Rationale We don't need to maintain unused code. We like proper HTML encoding. #### Changes * Delete Galaxy pipeline job code. Last used in 2013 * Remove migration code for experiment migration completed many years ago * HTML encode
Conflicts: genotyping/src/org/labkey/genotyping/GenotypingController.java
Conflicts: OConnorExperiments/src/org/labkey/oconnorexperiments/OConnorExperimentsController.java genotyping/src/org/labkey/genotyping/SubmitAnalysisJob.java genotyping/test/src/org/labkey/test/tests/GenotypingTest.java
Conflicts: OConnorExperiments/src/org/labkey/oconnorexperiments/OConnorExperimentsController.java genotyping/src/org/labkey/genotyping/GenotypingController.java genotyping/src/org/labkey/genotyping/SubmitAnalysisJob.java genotyping/src/org/labkey/genotyping/galaxy/GalaxyFolderSettings.java genotyping/src/org/labkey/genotyping/galaxy/GalaxyManager.java genotyping/src/org/labkey/genotyping/galaxy/GalaxyServer.java genotyping/src/org/labkey/genotyping/galaxy/GalaxyUserSettings.java genotyping/src/org/labkey/genotyping/galaxy/GalaxyUtils.java genotyping/src/org/labkey/genotyping/galaxy/WorkflowCompletionMonitor.java genotyping/src/org/labkey/genotyping/view/analyze.jsp genotyping/src/org/labkey/genotyping/view/mySettings.jsp
labkey-tchad
force-pushed
the
26.6_fb_bot_merge_26.3
branch
from
e13fc15 to
4f7d46a
Compare
labkey-tchad
approved these changes
Jun 21, 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