From 4a9bcb069465e20e487c5e8cad6fdad8b2301a94 Mon Sep 17 00:00:00 2001 From: Timshel Date: Tue, 21 Jul 2026 17:59:40 +0000 Subject: [PATCH 1/3] Remove old compatibility code (#7434) Co-authored-by: Timshel --- src/db/models/cipher.rs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs index 8357c9eb..2fa6260a 100644 --- a/src/db/models/cipher.rs +++ b/src/db/models/cipher.rs @@ -306,16 +306,6 @@ impl Cipher { type_data_json = Value::Null; } - // Clone the type_data and add some default value. - let mut data_json = type_data_json.clone(); - - // NOTE: This was marked as *Backwards Compatibility Code*, but as of January 2021 this is still being used by upstream - // data_json should always contain the following keys with every atype - data_json["fields"] = json!(fields_json); - data_json["name"] = json!(self.name); - data_json["notes"] = json!(self.notes); - data_json["passwordHistory"] = Value::Array(password_history_json.clone()); - let collection_ids = if let Some(cipher_sync_data) = cipher_sync_data { if let Some(cipher_collections) = cipher_sync_data.cipher_collections.get(&self.uuid) { Cow::from(cipher_collections) @@ -355,8 +345,6 @@ impl Cipher { "notes": self.notes, "fields": fields_json, - "data": data_json, - "passwordHistory": password_history_json, // All Cipher types are included by default as null, but only the matching one will be populated From 683a23e43c5a440cab80300f47cb0d2639e616fa Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 21 Jul 2026 22:54:10 +0300 Subject: [PATCH 2/3] Fix compilation with newer `rust-musl` version (#7453) --- docker/Dockerfile.alpine | 2 +- docker/Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 7bea0d0d..494411fb 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -66,7 +66,7 @@ RUN USER=root cargo new --bin /app WORKDIR /app # Environment variables for Cargo on Alpine based builds -RUN echo "export CARGO_TARGET=${RUST_MUSL_CROSS_TARGET}" >> /env-cargo && \ +RUN echo "export CARGO_TARGET=${CARGO_BUILD_TARGET}" >> /env-cargo && \ # Output the current contents of the file cat /env-cargo diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index f7a056ff..5e33d512 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -106,7 +106,7 @@ WORKDIR /app {% if base == "alpine" %} # Environment variables for Cargo on Alpine based builds -RUN echo "export CARGO_TARGET=${RUST_MUSL_CROSS_TARGET}" >> /env-cargo && \ +RUN echo "export CARGO_TARGET=${CARGO_BUILD_TARGET}" >> /env-cargo && \ # Output the current contents of the file cat /env-cargo From 660faee68e3406d33244b67eadc18524c47674c2 Mon Sep 17 00:00:00 2001 From: Tom <83423411+tom27052006@users.noreply.github.com> Date: Tue, 21 Jul 2026 22:06:45 +0200 Subject: [PATCH 3/3] Fix custom role dialog selectors (#7442) --- src/static/templates/scss/vaultwarden.scss.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/static/templates/scss/vaultwarden.scss.hbs b/src/static/templates/scss/vaultwarden.scss.hbs index 477cdd34..5bbe5db2 100644 --- a/src/static/templates/scss/vaultwarden.scss.hbs +++ b/src/static/templates/scss/vaultwarden.scss.hbs @@ -116,8 +116,8 @@ app-security > app-two-factor-setup > form { } /* Hide unsupported Custom Role options */ -bit-dialog div.tw-ml-4:has(bit-form-control input), -bit-dialog div.tw-col-span-4:has(input[formcontrolname*="access"], input[formcontrolname*="manage"]) { +:is(bit-dialog, [bit-dialog]) div.tw-ml-4:has(bit-form-control input), +:is(bit-dialog, [bit-dialog]) div.tw-col-span-4:has(input[formcontrolname*="access"], input[formcontrolname*="manage"]) { @extend %vw-hide; }