From 83a75eaa524d8bba5c1d97116c17acb10f2dcafd Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 12 Feb 2025 07:55:34 -0500 Subject: [PATCH 1/4] Update registration warning message, improve tone. --- lib/galaxy/config/schemas/config_schema.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/config/schemas/config_schema.yml b/lib/galaxy/config/schemas/config_schema.yml index e659efd6d21c..712ce7fda9d6 100644 --- a/lib/galaxy/config/schemas/config_schema.yml +++ b/lib/galaxy/config/schemas/config_schema.yml @@ -1306,9 +1306,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 From 1e0d76526cfc601fe6cb90e28b5ea649db4c1259 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 12 Feb 2025 07:55:59 -0500 Subject: [PATCH 2/4] Config rebuild for registration message update. --- doc/source/admin/galaxy_options.rst | 2 +- lib/galaxy/config/sample/galaxy.yml.sample | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst index a2a077224750..7709a4cfef5e 100644 --- a/doc/source/admin/galaxy_options.rst +++ b/doc/source/admin/galaxy_options.rst @@ -1826,7 +1826,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 index d2da6d1723ca..2af315de2c12 100644 --- a/lib/galaxy/config/sample/galaxy.yml.sample +++ b/lib/galaxy/config/sample/galaxy.yml.sample @@ -1220,7 +1220,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 From 578f4392cc27678fd0a29822f1f9aaee422a9a0a Mon Sep 17 00:00:00 2001 From: davelopez <46503462+davelopez@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:24:22 +0100 Subject: [PATCH 3/4] Add missing component import Accidentally drop in 1736eb17d8f1cf4d3f41dd3210e11d1a8cf7b90e --- client/src/components/ObjectStore/Instances/ManageIndex.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/components/ObjectStore/Instances/ManageIndex.vue b/client/src/components/ObjectStore/Instances/ManageIndex.vue index f4d4f419737e..b9a8d84f8fb3 100644 --- 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"; From af8d4335d89fc700f8336f0c2888d10f7d021488 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Thu, 13 Feb 2025 09:48:28 +0000 Subject: [PATCH 4/4] Add ``upgrade_codes.json`` to tool-util package --- packages/tool_util/MANIFEST.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tool_util/MANIFEST.in b/packages/tool_util/MANIFEST.in index a60b960699b6..414da413053e 100644 --- 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 \ No newline at end of file +include galaxy/tool_util/linters/datatypes_conf.xml.sample +include galaxy/tool_util/upgrade/upgrade_codes.json