Merge branch 'release_24.2' into dev

galaxyproject · Feb 13, 2025 · 2bf7c7e · 2bf7c7e
2 parents 64d385f + 22af784
commit 2bf7c7e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/client/src/components/ObjectStore/Instances/ManageIndex.vue b/client/src/components/ObjectStore/Instances/ManageIndex.vue
@@ -9,6 +9,7 @@ import { useFiltering } from "@/components/ConfigTemplates/useInstanceFiltering"
 import { useObjectStoreInstancesStore } from "@/stores/objectStoreInstancesStore";
 import _l from "@/utils/localization";
 
+import InstanceDropdown from "./InstanceDropdown.vue";
 import ManageIndexHeader from "@/components/ConfigTemplates/ManageIndexHeader.vue";
 import LoadingSpan from "@/components/LoadingSpan.vue";
 import ObjectStoreBadges from "@/components/ObjectStore/ObjectStoreBadges.vue";

diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst
@@ -1864,7 +1864,7 @@
     registering multiple accounts.  Applies mostly for the main Galaxy
     instance. If no message specified the warning box will not be
     shown.
-:Default: ``Please register only one account - we provide this service free of charge and have limited computational resources. Multi-accounts are tracked and will be subjected to account termination and data deletion.``
+:Default: ``Please register only one account to ensure fair sharing of computational resources. Multiple registrations are monitored and will result in account termination and data deletion.``
 :Type: str
 
 

diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample
@@ -1260,7 +1260,7 @@ galaxy:
   # Registration warning message is used to discourage people from
   # registering multiple accounts.  Applies mostly for the main Galaxy
   # instance. If no message specified the warning box will not be shown.
-  #registration_warning_message: Please register only one account - we provide this service free of charge and have limited computational resources. Multi-accounts are tracked and will be subjected to account termination and data deletion.
+  #registration_warning_message: Please register only one account to ensure fair sharing of computational resources. Multiple registrations are monitored and will result in account termination and data deletion.
 
   # User account activation feature global flag.  If set to false, the
   # rest of the Account activation configuration is ignored and user

diff --git a/lib/galaxy/config/schemas/config_schema.yml b/lib/galaxy/config/schemas/config_schema.yml
@@ -1387,9 +1387,9 @@ mapping:
       registration_warning_message:
         type: str
         default: >-
-          Please register only one account - we provide this service free of charge and have limited
-          computational resources. Multi-accounts are tracked and will be subjected to account
-          termination and data deletion.
+          Please register only one account to ensure fair sharing of
+          computational resources. Multiple registrations are monitored and will
+          result in account termination and data deletion.
         required: false
         desc: |
           Registration warning message is used to discourage people from registering

diff --git a/packages/tool_util/MANIFEST.in b/packages/tool_util/MANIFEST.in
@@ -5,4 +5,5 @@ include galaxy/tool_util/toolbox/filters/*.sample
 include galaxy/tool_util/verify/test_config.sample.yml
 include galaxy/tool_util/xsd/*
 include galaxy/tool_util/ontologies/*tsv
-include galaxy/tool_util/linters/datatypes_conf.xml.sample
+include galaxy/tool_util/linters/datatypes_conf.xml.sample
+include galaxy/tool_util/upgrade/upgrade_codes.json