Merge 25.11 to 26.1

labkey-teamcity · labkey-teamcity · commit 42b911649d32 · 2026-01-20T10:07:59.000Z
diff --git a/ehr/test/src/org/labkey/test/tests/ehr/AbstractGenericEHRTest.java b/ehr/test/src/org/labkey/test/tests/ehr/AbstractGenericEHRTest.java
@@ -329,7 +329,8 @@ protected List<String> skipLinksForValidation()
         return List.of(
                 "showAllErrors.view",
                 "query-exportRowsExcel.view",
-                "ldk-runNotification.view"  // need to scope notifications to enabled modules then can remove this
+                "ldk-runNotification.view",  // need to scope notifications to enabled modules then can remove this
+                "ehr-postgresMigration.view"
         ); // Override if there are links to pages that are known to throw errors
     }
 

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,8 @@ protected List<String> skipLinksForValidation()`
`329`	`329`	`return List.of(`
`330`	`330`	`"showAllErrors.view",`
`331`	`331`	`"query-exportRowsExcel.view",`
`332`		`- "ldk-runNotification.view" // need to scope notifications to enabled modules then can remove this`
	`332`	`+ "ldk-runNotification.view", // need to scope notifications to enabled modules then can remove this`
	`333`	`+ "ehr-postgresMigration.view"`
`333`	`334`	`); // Override if there are links to pages that are known to throw errors`
`334`	`335`	`}`
`335`	`336`