Skip to content

Commit b2d159b

Browse files
authored
Merge pull request #237 from LabKey/fb_merge_24.11_to_develop
Merge discvr-24.11 to develop
2 parents 3f12b2b + 55ba8ce commit b2d159b

File tree

6 files changed

+732
-1046
lines changed

6 files changed

+732
-1046
lines changed

mGAP/src/org/labkey/mgap/mGAPModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void doStartupAfterSpringConfig(ModuleContext moduleContext)
107107

108108
SystemMaintenance.addTask(new mGapMaintenanceTask());
109109

110-
ContentSecurityPolicyFilter.registerAllowedConnectionSource(this.getClass().getName(), "https://*.fontawesome.com");
110+
ContentSecurityPolicyFilter.registerAllowedConnectionSource(this.getClass().getName(), "https://*.fontawesome.com", "https://code.jquery.com", "https://www.gstatic.com");
111111

112112
new PipelineStartup();
113113
}

mGAP/src/org/labkey/mgap/mGapMaintenanceTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ public class mGapMaintenanceTask implements SystemMaintenance.MaintenanceTask
3838
@Override
3939
public String getDescription()
4040
{
41-
return "Deletes unused mGAP VCFs and ETL artifacts";
41+
return "mGAP Artifact Cleanup";
4242
}
4343

4444
@Override
4545
public String getName()
4646
{
47-
return "mGAP Maintenance Task";
47+
return "mGAPMaintenanceTask";
4848
}
4949

5050
@Override

0 commit comments

Comments
 (0)