Merge branch 'release_24.1' into release_24.2

galaxyproject · Dec 17, 2024 · 614ecbb · 614ecbb
2 parents e921a29 + 1bf1d59
commit 614ecbb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
@@ -411,5 +411,6 @@ export default {
 <style>
 .modal-with-selector {
     overflow: initial;
+    min-height: 300px; /* To make room for the selector */
 }
 </style>
diff --git a/client/src/components/User/DiskUsage/Visualizations/ObjectStoreActions.vue b/client/src/components/User/DiskUsage/Visualizations/ObjectStoreActions.vue
@@ -17,7 +17,7 @@ const props = defineProps<Props>();
 
 library.add(faChartBar);
 
-const label = computed(() => props.data.id);
+const label = computed(() => props.data.label);
 const viewDetailsIcon = computed(() => "chart-bar");
 
 const emit = defineEmits<{

diff --git a/client/src/style/scss/multiselect.scss b/client/src/style/scss/multiselect.scss
@@ -95,3 +95,7 @@
         }
     }
 }
+
+.multiselect--active {
+    z-index: 1500; // Should be on top of everything
+}
diff --git a/lib/galaxy/tool_util/deps/mulled/invfile.lua b/lib/galaxy/tool_util/deps/mulled/invfile.lua
@@ -42,7 +42,7 @@ end
 
 local conda_image = VAR.CONDA_IMAGE
 if conda_image == '' then
-    conda_image = 'quay.io/condaforge/mambaforge:latest'
+    conda_image = 'quay.io/condaforge/miniforge3:latest'
 end
 
 local conda_bin = VAR.CONDA_BIN
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,3 +95,7 @@ @@
             }
         }
     }
+    .multiselect--active {
+        z-index: 1500; // Should be on top of everything
+    }