[PR #987] [MERGED] GlobalEquivalentDomains updates from upstream bitwarden #2841

Closed
opened 2026-03-03 08:53:19 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/987
Author: @theycallmesteve
Created: 5/7/2020
Status: Merged
Merged: 5/7/2020
Merged by: @dani-garcia

Base: masterHead: global_domains


📝 Commits (2)

  • 632f4d5 Whitespace fixes
  • 42e37eb Apply upstream global domain values and whitespace fixes

📊 Changes

6 files changed (+73 additions, -78 deletions)

View changed files

📝 src/api/core/ciphers.rs (+1 -5)
📝 src/api/core/two_factor/authenticator.rs (+1 -0)
📝 src/config.rs (+0 -1)
📝 src/db/models/device.rs (+0 -1)
📝 src/db/models/organization.rs (+3 -3)
📝 src/static/global_domains.json (+68 -68)

📄 Description

Updates the global equivalent domain values from bitwarden. It also fixes some whitespace inconsistencies that I noticed.


🔄 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/987 **Author:** [@theycallmesteve](https://github.com/theycallmesteve) **Created:** 5/7/2020 **Status:** ✅ Merged **Merged:** 5/7/2020 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `master` ← **Head:** `global_domains` --- ### 📝 Commits (2) - [`632f4d5`](https://github.com/dani-garcia/vaultwarden/commit/632f4d545367b5ab1cefce66bc526e5dc0a786de) Whitespace fixes - [`42e37eb`](https://github.com/dani-garcia/vaultwarden/commit/42e37ebea1ae8fe25c861d0a073a67973f89e4a1) Apply upstream global domain values and whitespace fixes ### 📊 Changes **6 files changed** (+73 additions, -78 deletions) <details> <summary>View changed files</summary> 📝 `src/api/core/ciphers.rs` (+1 -5) 📝 `src/api/core/two_factor/authenticator.rs` (+1 -0) 📝 `src/config.rs` (+0 -1) 📝 `src/db/models/device.rs` (+0 -1) 📝 `src/db/models/organization.rs` (+3 -3) 📝 `src/static/global_domains.json` (+68 -68) </details> ### 📄 Description Updates the global equivalent domain values from bitwarden. It also fixes some whitespace inconsistencies that I noticed. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-03-03 08:53:19 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/vaultwarden#2841
No description provided.