Merge branch '17690-user-ssh-key-page' into main. Closes #17690

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>

diff --git a/Makefile b/Makefile
index 3df3c78ce1f9e9c7f8708fad65e9ffbc081511b0..aaf2271c60fab7f10f30765f23cd5fcbae4c2437 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ VERSION?=$(shell ./version-at-commit.sh HEAD)
 # changes in the package. (i.e. example config files externally added
 ITERATION?=1
 
-TARGETS?=centos7 debian8 debian10 ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004
+TARGETS?=centos7 debian10 debian11 ubuntu1804 ubuntu2004
 
 ARVADOS_DIRECTORY?=unset
 

diff --git a/src/common/formatters.ts b/src/common/formatters.ts
index eeab703d0d4955f915efa782730135e945ffe83c..779809f1569494da93c599706fd1d977201df46a 100644 (file)
--- a/src/common/formatters.ts
+++ b/src/common/formatters.ts
@@ -66,19 +66,19 @@ export function formatUploadSpeed(prevLoaded: number, loaded: number, prevTime:
 
 const FILE_SIZES = [
     {
-        base: 1000000000000,
+        base: 1099511627776,
         unit: "TB"
     },
     {
-        base: 1000000000,
+        base: 1073741824,
         unit: "GB"
     },
     {
-        base: 1000000,
+        base: 1048576,
         unit: "MB"
     },
     {
-        base: 1000,
+        base: 1024,
         unit: "KB"
     },
     {