Merge branch 'release_25.1' into dev

Author: mvdbeek

client/src/components/Collections/wizard/UploadFetchWorkbook.vue

@@ -2,6 +2,8 @@
 import { BCardGroup } from "bootstrap-vue";
 import { computed } from "vue";
 
+import { withPrefix } from "@/utils/redirect";
+
 import type { ParsedFetchWorkbookForCollectionCollectionType, RulesCreatingWhat } from "./types";
 
 import CardDownloadWorkbook from "./CardDownloadWorkbook.vue";
@@ -25,7 +27,7 @@ const emit = defineEmits(["workbookContents"]);
 const generateWorkbookHref = computed(() => {
     let type;
     if (props.creatingWhat === "datasets") {
-        type = "dataset";
+        type = "datasets";
     } else if (props.includeCollectionName) {
         type = "collections";
     } else {
@@ -36,7 +38,7 @@ const generateWorkbookHref = computed(() => {
     if (type === "collection" || type === "collections") {
         url = `${url}&collection_type=${props.collectionType}`;
     }
-    return url;
+    return withPrefix(url);
 });
 </script>
 

lib/galaxy/tool_util/xsd/galaxy.xsd

@@ -72,6 +72,10 @@ List of behavior changes associated with profile versions:
 
 - require a valid `data_ref` attribute for `data_column` parameters
 
+### 25.1
+
+- Do not use user preferences to store credentials for tools anymore. Use the new `<credentials>` tag in the `<requirements>` section of the tool XML instead.
+
 ### Examples
 
 A normal tool: