Merge branch 'master' into vertical-scroll#4727

upsaurav12 · Mar 4, 2024 · 16cfe01 · 16cfe01
2 parents 21bf8b6 + a52711e
commit 16cfe01
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -9,7 +9,6 @@
 		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
 	},
     "waitFor": "onCreateCommand",
-    "initializeCommand": "git submodule update --init --recursive",
     "postCreateCommand": ".devcontainer/setup.sh",
     "postAttachCommand": {
       "server": ".devcontainer/boot.sh"

diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+git submodule update --init --recursive
 # Setup database
 cp config/database.docker.yml config/database.yml
 createuser -s postgres

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -77,7 +77,7 @@ Please note:  If you wanted to work on an issue, let us know by leaving a commen
 - `no activity` labeled PRs are meant to have no activity in the PR from since a while.
 - `blocked` labeled PRs are meant not to go ahead for review.
 - `do not merge` labeled PRs are meant not to merge the PR right now(may be later).
-- [awaiting-approval](https://github.com/CircuitVerse/CircuitVerse/labels/awaiting-approval) labeled PRs are meant to be waiting for other communtiy members.
+- [awaiting-approval](https://github.com/CircuitVerse/CircuitVerse/labels/awaiting-approval) labeled PRs are meant to be waiting for other community members.
 
 ## Community
 Discussions about CircuitVerse issues and features take place on the repository's [Discussions](https://github.com/CircuitVerse/CircuitVerse/discussions) sections. Anybody is welcome to join these conversations. See the [README](README.md) for more information on communication channels.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -268,10 +268,10 @@ GEM
     geocoder (1.7.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-protobuf (3.25.1)
-    google-protobuf (3.25.1-arm64-darwin)
-    google-protobuf (3.25.1-x86_64-darwin)
-    google-protobuf (3.25.1-x86_64-linux)
+    google-protobuf (3.25.3)
+    google-protobuf (3.25.3-arm64-darwin)
+    google-protobuf (3.25.3-x86_64-darwin)
+    google-protobuf (3.25.3-x86_64-linux)
     googleapis-common-protos-types (1.6.0)
       google-protobuf (~> 3.14)
     hairtrigger (0.2.25)
@@ -888,7 +888,7 @@ GEM
       will_paginate (>= 3.0.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.34)
+    yard (0.9.36)
     zeitwerk (2.6.13)
 
 PLATFORMS

diff --git a/cv-frontend-vue b/cv-frontend-vue
diff --git a/simulator/src/data/save.js b/simulator/src/data/save.js
@@ -104,7 +104,7 @@ export function generateSaveData(name, setName = true) {
         }
 
         completed[id] = true;
-        update(scopeList[id], true); // For any pending integrity checks on subcircuits
+        update(scopeList[id]); // For any pending integrity checks on subcircuits
         data.scopes.push(backUp(scopeList[id]));
     }