[PR #109] [MERGED] Merge changes from master to beta #2587

New Issue

OVERLORD · 2026-02-05T04:49:04+03:00

OVERLORD commented

2026-02-05 04:49:04 +03:00

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/109
Author: @mprasil
Created: 8/1/2018
Status: ✅ Merged
Merged: 8/1/2018
Merged by: @dani-garcia

Base: beta ← Head: beta_merge

📝 Commits (10+)

31349a4 Very dirty addition of missing api's
98bae4a Cleanup and working with 2 or less attachments
51450a0 Fixed the documentation for https (resolves #101)
3726da9 Merge pull request #103 from mprasil/https_doc_fix
d073f06 Update matrix.to link in the README
d7df545 Merge pull request #104 from jcgruenhage/patch-1
2872f40 WAL journal mode and delete retry added
01875c3 Merge pull request #1 from mprasil/concurrency_fix
f39c4fe Merge pull request #2 from dani-garcia/master
34d2648 Merge pull request #3 from shauder/master

📊 Changes

6 files changed (+79 additions, -32 deletions)

View changed files

📝 Cargo.toml (+1 -1)
📝 README.md (+2 -2)
📝 src/api/core/ciphers.rs (+43 -23)
📝 src/api/core/mod.rs (+3 -0)
📝 src/db/models/attachment.rs (+25 -6)
📝 src/main.rs (+5 -0)

📄 Description

There were some major changes that might affect the beta fixes.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/dani-garcia/vaultwarden/pull/109 **Author:** [@mprasil](https://github.com/mprasil) **Created:** 8/1/2018 **Status:** ✅ Merged **Merged:** 8/1/2018 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `beta` ← **Head:** `beta_merge` --- ### 📝 Commits (10+) - [`31349a4`](https://github.com/dani-garcia/vaultwarden/commit/31349a47d3fa12ed15f409654d0af2c0ba0645d2) Very dirty addition of missing api's - [`98bae4a`](https://github.com/dani-garcia/vaultwarden/commit/98bae4a0a195eaf611f43669e3cdcfd3ac76a374) Cleanup and working with 2 or less attachments - [`51450a0`](https://github.com/dani-garcia/vaultwarden/commit/51450a0df96425721e49fbb08a9f8d2a5347d45f) Fixed the documentation for https (resolves #101) - [`3726da9`](https://github.com/dani-garcia/vaultwarden/commit/3726da9c14ccfd9ff93cafbb1156957c4febf6e8) Merge pull request #103 from mprasil/https_doc_fix - [`d073f06`](https://github.com/dani-garcia/vaultwarden/commit/d073f06652c4b90dacfcefa4464cee06f97ab5f4) Update matrix.to link in the README - [`d7df545`](https://github.com/dani-garcia/vaultwarden/commit/d7df54507807b15b6caef6241a675b1cf23921d8) Merge pull request #104 from jcgruenhage/patch-1 - [`2872f40`](https://github.com/dani-garcia/vaultwarden/commit/2872f40d13682e9905771da900e13bc8045d509f) WAL journal mode and delete retry added - [`01875c3`](https://github.com/dani-garcia/vaultwarden/commit/01875c395bd4050141bae0737d3a0417e48fca70) Merge pull request #1 from mprasil/concurrency_fix - [`f39c4fe`](https://github.com/dani-garcia/vaultwarden/commit/f39c4fe2f45a4036f83b3c94762554639b673533) Merge pull request #2 from dani-garcia/master - [`34d2648`](https://github.com/dani-garcia/vaultwarden/commit/34d26485096e6d808c6c1de1bb82744bb3185dbd) Merge pull request #3 from shauder/master ### 📊 Changes **6 files changed** (+79 additions, -32 deletions) <details> <summary>View changed files</summary> 📝 `Cargo.toml` (+1 -1) 📝 `README.md` (+2 -2) 📝 `src/api/core/ciphers.rs` (+43 -23) 📝 `src/api/core/mod.rs` (+3 -0) 📝 `src/db/models/attachment.rs` (+25 -6) 📝 `src/main.rs` (+5 -0) </details> ### 📄 Description There were some major changes that might affect the beta fixes. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

OVERLORD added the pull-request label 2026-02-05 04:49:04 +03:00

OVERLORD closed this issue

2026-02-05 04:49:07 +03:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/vaultwarden#2587