Skip to content

[bot] Fast-forward for 26.6.0#214

Merged
github-actions[bot] merged 8 commits into
release26.6from
26.6_ff_bot_26.6.0
Jun 22, 2026
Merged

[bot] Fast-forward for 26.6.0#214
github-actions[bot] merged 8 commits into
release26.6from
26.6_ff_bot_26.6.0

Conversation

@github-actions

Copy link
Copy Markdown

Generated automatically.
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
View all PRs: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.6_ff_bot_26.6.0

labkey-jeckels and others added 8 commits June 9, 2026 07:52
#### Rationale
Lint cleanup and SQL improvements

#### Changes
* Clear assorted IntelliJ warnings
* Use JDBC parameter
#### 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
@github-actions github-actions Bot merged commit 4f7d46a into release26.6 Jun 22, 2026
11 checks passed
@github-actions github-actions Bot deleted the 26.6_ff_bot_26.6.0 branch June 22, 2026 16:39
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.

3 participants