Merge branch 'develop'

eecs485staff · Nov 8, 2023 · 8d0aec1 · 8d0aec1
2 parents fb3ecb0 + f8d9114
commit 8d0aec1
Show file tree

Hide file tree

Showing 32 changed files with 9,281 additions and 7,196 deletions.
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
@@ -10,7 +10,7 @@ GITHOOKS_DIR=`pwd -P`
 popd
 PROJECT_ROOT=`dirname $GITHOOKS_DIR`
 
-MINOR_VERSION=$(cat $PROJECT_ROOT/VERSION | grep -o "[[:digit:]]\.[[:digit:]]")
+MINOR_VERSION=$(cat $PROJECT_ROOT/VERSION | grep -oE "\\d+\\.\\d+")
 
 if [[ -z "${STAGE_STATIC_ASSETS:-}" ]]; then
   echo "[pre-commit]: Unstaging assets directory"

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.9.3
+1.10.0
diff --git a/_layouts/spec.html b/_layouts/spec.html
@@ -1,5 +1,5 @@
 ---
-version_string: v1.9
+version_string: v1.10
 ---
 <!DOCTYPE html>
 <html lang="{{ site.lang | default: "en-US" }}">
@@ -40,7 +40,7 @@
                 font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji" !important;
             }
         </style>
-        <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js" crossorigin="anonymous" defer></script>
+        <script src="https://cdn.jsdelivr.net/npm/mermaid@9/dist/mermaid.min.js" crossorigin="anonymous" defer></script>
         {%- endif %}
 
         <!--

diff --git a/assets/v1.9/css/primer-spec-base.scss → assets/v1.10/css/primer-spec-base.scss b/assets/v1.9/css/primer-spec-base.scss → assets/v1.10/css/primer-spec-base.scss
diff --git a/assets/v1.9/css/style.scss → assets/v1.10/css/style.scss b/assets/v1.9/css/style.scss → assets/v1.10/css/style.scss
diff --git a/assets/v1.10/js/262.primer_spec_plugin.min.js b/assets/v1.10/js/262.primer_spec_plugin.min.js
diff --git a/assets/v1.10/js/262.primer_spec_plugin.min.js.map b/assets/v1.10/js/262.primer_spec_plugin.min.js.map
diff --git a/assets/v1.10/js/424.primer_spec_plugin.min.js b/assets/v1.10/js/424.primer_spec_plugin.min.js