Merge branch 'main' into renovate/linting

TUM-Dev · Jan 12, 2024 · 94150ec · 94150ec
2 parents 074dd64 + 60fbb81
commit 94150ec
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 79 deletions.
diff --git a/.github/workflows/server-cicd.yml b/.github/workflows/server-cicd.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup | Checkout
         uses: actions/checkout@v4
       - name: Setup | Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.6.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.7.0
         with:
           toolchain: stable
           components: clippy
@@ -37,7 +37,7 @@ jobs:
       - name: Setup | Checkout
         uses: actions/checkout@v4
       - name: Setup | Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.6.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.7.0
         with:
           toolchain: stable
           cache: false

diff --git a/server/Cargo.lock b/server/Cargo.lock
diff --git a/server/feedback/Cargo.toml b/server/feedback/Cargo.toml
@@ -36,7 +36,7 @@ actix-governor = { version = "0.5.0", features = ["logger"] }
 # proposing feedback
 tempfile = "3.9.0"
 image = { version = "0.24.7", features = ["default", "webp-encoder"] }
-base64 = "0.21.6"
+base64 = "0.21.7"
 serde_yaml = "0.9"
 
 [dev-dependencies]

diff --git a/webclient/package.json b/webclient/package.json
@@ -27,7 +27,7 @@
     "swagger-ui-dist": "5.11.0",
     "swaggerdark": "github:octycs/SwaggerDark#f02d394c8ff698cdd93e09c2188b058d2d686ca3",
     "unplugin-vue-markdown": "0.25.2",
-    "vue": "3.4.8",
+    "vue": "3.4.11",
     "vue-router": "4.2.5"
   },
   "devDependencies": {