Skip to content

Commit 0c5817a

Browse files
authored
Merge pull request #10360 from gitbutlerapp/copilot/fix-a94ad9dc-8da5-41db-83cb-1ae75addd7ab
Add test to detect JSON defaults vs FeatureFlags struct mismatches
2 parents ec09647 + 11c4bba commit 0c5817a

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

crates/but-settings/assets/defaults.jsonc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
"oauthClientId": "cd51880daa675d9e6452"
1919
},
2020
"featureFlags": {
21-
// Deprecated, was used for the new version of the UI.
22-
"v3": true,
2321
// Enables the v3 safe checkout.
2422
"cv3": false,
2523
/// Enable the usage of V3 workspace APIs.
2624
"ws3": true,
2725
/// Enable undo/redo support.
2826
"undo": false,
29-
/// Enable the usage of GitButler Acitions.
27+
/// Enable the usage of GitButler Actions.
3028
"actions": false,
3129
/// Enable the usage of the butbot chat.
3230
"butbot": false,

crates/but-settings/src/app_settings.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ pub struct GitHubOAuthAppSettings {
2424
#[serde(rename_all = "camelCase")]
2525
pub struct FeatureFlags {
2626
/// Enable the usage of V3 workspace APIs.
27-
#[serde(default = "default_true")]
2827
pub ws3: bool,
2928
/// Turn on the set a v3 version of checkout
3029
pub cv3: bool,
@@ -53,10 +52,6 @@ pub struct FeatureFlags {
5352
pub single_branch: bool,
5453
}
5554

56-
fn default_true() -> bool {
57-
true
58-
}
59-
6055
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
6156
#[serde(rename_all = "camelCase")]
6257
pub struct ExtraCsp {

0 commit comments

Comments
 (0)