Merge pull request #18152 from mvdbeek/fix_merge_forward

Fix import broken with forward merge

client/src/components/Login/RegisterForm.vue

@@ -14,7 +14,7 @@ import {
     BFormInput,
     BFormText,
 } from "bootstrap-vue";
-import { computed, ref } from "vue";
+import { computed, type Ref, ref } from "vue";
 
 import { Toast } from "@/composables/toast";
 import localize from "@/utils/localization";
@@ -46,7 +46,7 @@ const confirm = ref(null);
 const password = ref(null);
 const username = ref(null);
 const subscribe = ref(null);
-const messageText = ref(null);
+const messageText: Ref<string | null> = ref(null);
 const disableCreate = ref(false);
 const labelPassword = ref(localize("Password"));
 const labelPublicName = ref(localize("Public name"));

client/src/components/User/ExternalIdentities/ExternalLogin.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import axios, { type AxiosError } from "axios";
 import { BAlert, BButton, BForm, BFormCheckbox, BFormGroup } from "bootstrap-vue";
-import { errorMessageAsString } from "utils/simple-error";
 import { computed, onMounted, ref } from "vue";
 import Multiselect from "vue-multiselect";
 
 import { useConfig } from "@/composables/config";
 import { withPrefix } from "@/utils/redirect";
+import { errorMessageAsString } from "@/utils/simple-error";
 
 import LoadingSpan from "@/components/LoadingSpan.vue";
 

lib/galaxy/model/scripts/history_table_pruner.py

@@ -64,7 +64,7 @@ def get_high(low):
         high = get_high(low)
         batch_counter = 1
         while low <= self.max_id:
-            log.info(f"Running batch {batch_counter} of {self.batches}: history id range {low}-{high-1}:")
+            log.info(f"Running batch {batch_counter} of {self.batches}: history id range {low}-{high - 1}:")
             self._run_batch(low, high)
             low = high
             high = get_high(high)
@@ -76,7 +76,7 @@ def _get_default_max_create_time(self):
         return today.replace(month=today.month - 1)
 
     def _run_batch(self, low, high):
-        empty_batch_msg = f" No histories to delete in id range {low}-{high-1}"
+        empty_batch_msg = f" No histories to delete in id range {low}-{high - 1}"
         self._mark_histories_as_deleted_and_purged(low, high)
         histories = self._get_histories(low, high)
         if not histories:
@@ -200,7 +200,7 @@ def _set_references_to_null(self):
 
     def _delete_histories(self, low, high):
         """Last step: delete histories that are safe to delete."""
-        log.info(f" Deleting histories in id range {low}-{high-1}")
+        log.info(f" Deleting histories in id range {low}-{high - 1}")
         stmt = text(f"DELETE FROM history WHERE id IN (SELECT id FROM {TMP_TABLE})")
         with self.engine.begin() as conn:
             conn.execute(stmt)