[PR #2846] [MERGED] Group support | applied .diff #3164

New issue

Closed

opened 2026-03-03 09:41:40 +03:00 by kerem · 0 comments

kerem commented

2026-03-03 09:41:40 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/2846
Author: @MFijak
Created: 10/20/2022
Status: ✅ Merged
Merged: 10/20/2022
Merged by: @dani-garcia

Base: main ← Head: group_support_diff

📝 Commits (1)

21bc3bf group support

📊 Changes

17 files changed (+1188 additions, -19 deletions)

View changed files

➕ migrations/mysql/2022-07-27-110000_add_group_support/down.sql (+3 -0)
➕ migrations/mysql/2022-07-27-110000_add_group_support/up.sql (+23 -0)
➕ migrations/postgresql/2022-07-27-110000_add_group_support/down.sql (+3 -0)
➕ migrations/postgresql/2022-07-27-110000_add_group_support/up.sql (+23 -0)
➕ migrations/sqlite/2022-07-27-110000_add_group_support/down.sql (+3 -0)
➕ migrations/sqlite/2022-07-27-110000_add_group_support/up.sql (+23 -0)
📝 src/api/core/ciphers.rs (+14 -0)
📝 src/api/core/organizations.rs (+370 -3)
📝 src/api/mod.rs (+1 -0)
📝 src/db/models/cipher.rs (+88 -11)
📝 src/db/models/collection.rs (+22 -2)
➕ src/db/models/group.rs (+501 -0)
📝 src/db/models/mod.rs (+2 -0)
📝 src/db/models/organization.rs (+4 -3)
📝 src/db/schemas/mysql/schema.rs (+36 -0)
📝 src/db/schemas/postgresql/schema.rs (+36 -0)
📝 src/db/schemas/sqlite/schema.rs (+36 -0)

📄 Description

As discussed with @dani-garcia and @BlackDex on the Matrix-Channel I created a new branch and applied the resulting .diff from my original branch to this branch.

Original pull request #2667

_{🔄 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/2846 **Author:** [@MFijak](https://github.com/MFijak) **Created:** 10/20/2022 **Status:** ✅ Merged **Merged:** 10/20/2022 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `main` ← **Head:** `group_support_diff` --- ### 📝 Commits (1) - [`21bc3bf`](https://github.com/dani-garcia/vaultwarden/commit/21bc3bfd538157b341191c9caeddc86ca6fe49c3) group support ### 📊 Changes **17 files changed** (+1188 additions, -19 deletions) <details> <summary>View changed files</summary> ➕ `migrations/mysql/2022-07-27-110000_add_group_support/down.sql` (+3 -0) ➕ `migrations/mysql/2022-07-27-110000_add_group_support/up.sql` (+23 -0) ➕ `migrations/postgresql/2022-07-27-110000_add_group_support/down.sql` (+3 -0) ➕ `migrations/postgresql/2022-07-27-110000_add_group_support/up.sql` (+23 -0) ➕ `migrations/sqlite/2022-07-27-110000_add_group_support/down.sql` (+3 -0) ➕ `migrations/sqlite/2022-07-27-110000_add_group_support/up.sql` (+23 -0) 📝 `src/api/core/ciphers.rs` (+14 -0) 📝 `src/api/core/organizations.rs` (+370 -3) 📝 `src/api/mod.rs` (+1 -0) 📝 `src/db/models/cipher.rs` (+88 -11) 📝 `src/db/models/collection.rs` (+22 -2) ➕ `src/db/models/group.rs` (+501 -0) 📝 `src/db/models/mod.rs` (+2 -0) 📝 `src/db/models/organization.rs` (+4 -3) 📝 `src/db/schemas/mysql/schema.rs` (+36 -0) 📝 `src/db/schemas/postgresql/schema.rs` (+36 -0) 📝 `src/db/schemas/sqlite/schema.rs` (+36 -0) </details> ### 📄 Description As discussed with @dani-garcia and @BlackDex on the Matrix-Channel I created a [new branch](/MFijak/vaultwarden/tree/group_support_diff) and applied the resulting .diff from my [original branch](/MFijak/vaultwarden/tree/group_support) to this [branch](/MFijak/vaultwarden/tree/group_support_diff). Original pull request #2667 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>