[PR #148] [MERGED] Merge Beta to master #2637

New issue

Closed

opened 2026-03-03 02:20:09 +03:00 by kerem · 0 comments

kerem commented

2026-03-03 02:20:09 +03:00

Owner

📋 Pull Request Information

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

Base: master ← Head: beta

📝 Commits (10+)

a291dea Updated dependencies and Docker image to new web-vault
659f677 Add missing slash, to put it like it was at first
ceb3d03 Use stable release of v2.0.0
07a30c8 Merge pull request #106 from mprasil/beta_stable
91a2319 Implementing PUT for ciphers/move (#99)
fcc4853 clean up
2f6aa3c Reverting removal of 'api/ciphers/move' POST as it is required for backward compatibility
0e095a9 change to reuse the logic for POST in PUT as well
fcb479a Merge pull request #108 from krankur/beta
b163aeb Merge changes in master to beta branch (concurrency fixes)

📊 Changes

19 files changed (+457 additions, -216 deletions)

View changed files

📝 Cargo.lock (+117 -149)
📝 Cargo.toml (+8 -8)
📝 Dockerfile (+12 -16)
➕ docker/set-vault-baseurl.patch (+23 -0)
➖ docker/settings.Production.json (+0 -9)
📝 rust-toolchain (+1 -1)
📝 src/api/core/accounts.rs (+5 -0)
📝 src/api/core/ciphers.rs (+88 -3)
📝 src/api/core/mod.rs (+17 -0)
📝 src/api/core/organizations.rs (+60 -14)
📝 src/api/core/two_factor.rs (+23 -0)
📝 src/db/models/attachment.rs (+6 -0)
📝 src/db/models/cipher.rs (+22 -1)
📝 src/db/models/collection.rs (+12 -0)
📝 src/db/models/folder.rs (+2 -0)
📝 src/db/models/organization.rs (+31 -6)
📝 src/db/models/user.rs (+19 -0)
📝 src/main.rs (+1 -0)
📝 src/util.rs (+10 -9)

📄 Description

I believe all of the bugs we spotted with vault 2.0 are now resolved.

This also bumps up version to 1.0.0 to mark new epoch 🍾

_{🔄 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/148 **Author:** [@mprasil](https://github.com/mprasil) **Created:** 8/21/2018 **Status:** ✅ Merged **Merged:** 8/21/2018 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `master` ← **Head:** `beta` --- ### 📝 Commits (10+) - [`a291dea`](https://github.com/dani-garcia/vaultwarden/commit/a291dea16f46f2bca78ddaa4bb7c5fb6fe2f858b) Updated dependencies and Docker image to new web-vault - [`659f677`](https://github.com/dani-garcia/vaultwarden/commit/659f6778974ed91dabb933d7875a96914a0045fc) Add missing slash, to put it like it was at first - [`ceb3d03`](https://github.com/dani-garcia/vaultwarden/commit/ceb3d0314d3f02cdb406ef6111429361ace938dd) Use stable release of v2.0.0 - [`07a30c8`](https://github.com/dani-garcia/vaultwarden/commit/07a30c83344bb1520d6b8c95e3fae4a182cc81f6) Merge pull request #106 from mprasil/beta_stable - [`91a2319`](https://github.com/dani-garcia/vaultwarden/commit/91a23193251366b630b6c25cb2c5d7429604ee7e) Implementing PUT for ciphers/move (#99) - [`fcc4853`](https://github.com/dani-garcia/vaultwarden/commit/fcc485384f37583cb3261e833b5acc91e7f30c65) clean up - [`2f6aa3c`](https://github.com/dani-garcia/vaultwarden/commit/2f6aa3c36381f802bddf97fbb988020a302e7a2b) Reverting removal of 'api/ciphers/move' POST as it is required for backward compatibility - [`0e095a9`](https://github.com/dani-garcia/vaultwarden/commit/0e095a9fa4c8417ba308cbd0de974278654a65e1) change to reuse the logic for POST in PUT as well - [`fcb479a`](https://github.com/dani-garcia/vaultwarden/commit/fcb479a45734cf7ea06b6e81f0e18c0b9568f777) Merge pull request #108 from krankur/beta - [`b163aeb`](https://github.com/dani-garcia/vaultwarden/commit/b163aeb8caa2502ee3e6f8d62a0ac53d59bb15e3) Merge changes in master to beta branch (concurrency fixes) ### 📊 Changes **19 files changed** (+457 additions, -216 deletions) <details> <summary>View changed files</summary> 📝 `Cargo.lock` (+117 -149) 📝 `Cargo.toml` (+8 -8) 📝 `Dockerfile` (+12 -16) ➕ `docker/set-vault-baseurl.patch` (+23 -0) ➖ `docker/settings.Production.json` (+0 -9) 📝 `rust-toolchain` (+1 -1) 📝 `src/api/core/accounts.rs` (+5 -0) 📝 `src/api/core/ciphers.rs` (+88 -3) 📝 `src/api/core/mod.rs` (+17 -0) 📝 `src/api/core/organizations.rs` (+60 -14) 📝 `src/api/core/two_factor.rs` (+23 -0) 📝 `src/db/models/attachment.rs` (+6 -0) 📝 `src/db/models/cipher.rs` (+22 -1) 📝 `src/db/models/collection.rs` (+12 -0) 📝 `src/db/models/folder.rs` (+2 -0) 📝 `src/db/models/organization.rs` (+31 -6) 📝 `src/db/models/user.rs` (+19 -0) 📝 `src/main.rs` (+1 -0) 📝 `src/util.rs` (+10 -9) </details> ### 📄 Description I believe all of the bugs we spotted with vault 2.0 are now resolved. This also bumps up version to 1.0.0 to mark new epoch :champagne: --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>