Skip to content

Commit d5e480e

Browse files
committed
Remove ws3 feature flag from APIs
1 parent 9cefc94 commit d5e480e

File tree

7 files changed

+0
-21
lines changed

7 files changed

+0
-21
lines changed

crates/but-settings/assets/defaults.jsonc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
"oauthClientId": "cd51880daa675d9e6452"
1919
},
2020
"featureFlags": {
21-
// Enables the v3 design, as well as the purgatory mode (no uncommitted diff ownership assignments).
22-
"v3": false,
23-
/// Enable the usage of V3 workspace APIs.
24-
"ws3": false,
2521
/// Enable undo/redo support.
2622
"undo": false,
2723
/// Enable the usage of GitButler Acitions.

crates/but-settings/src/api.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ pub struct TelemetryUpdate {
1515
#[serde(rename_all = "camelCase")]
1616
/// Update request for [`crate::app_settings::FeatureFlags`].
1717
pub struct FeatureFlagsUpdate {
18-
pub ws3: Option<bool>,
1918
pub actions: Option<bool>,
2019
pub butbot: Option<bool>,
2120
pub rules: Option<bool>,
@@ -52,16 +51,12 @@ impl AppSettingsWithDiskSync {
5251
pub fn update_feature_flags(
5352
&self,
5453
FeatureFlagsUpdate {
55-
ws3,
5654
actions,
5755
butbot,
5856
rules,
5957
}: FeatureFlagsUpdate,
6058
) -> Result<()> {
6159
let mut settings = self.get_mut_enforce_save()?;
62-
if let Some(ws3) = ws3 {
63-
settings.feature_flags.ws3 = ws3;
64-
}
6560
if let Some(actions) = actions {
6661
settings.feature_flags.actions = actions;
6762
}

crates/but-settings/src/app_settings.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ pub struct GitHubOAuthAppSettings {
2323
#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
2424
#[serde(rename_all = "camelCase")]
2525
pub struct FeatureFlags {
26-
/// Enable the usage of V3 workspace APIs.
27-
#[serde(default = "default_true")]
28-
pub ws3: bool,
2926
/// Enable undo/redo support.
3027
///
3128
/// ### Progression for implementation
@@ -49,10 +46,6 @@ pub struct FeatureFlags {
4946
pub rules: bool,
5047
}
5148

52-
fn default_true() -> bool {
53-
true
54-
}
55-
5649
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
5750
#[serde(rename_all = "camelCase")]
5851
pub struct ExtraCsp {

crates/but-testing/src/command/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,13 +336,11 @@ pub mod stacks {
336336
description: Option<&str>,
337337
current_dir: &Path,
338338
use_json: bool,
339-
ws3: bool,
340339
) -> anyhow::Result<()> {
341340
let project = project_from_path(current_dir)?;
342341
// Enable v3 feature flags for the command context
343342
let app_settings = AppSettings {
344343
feature_flags: but_settings::app_settings::FeatureFlags {
345-
ws3,
346344
undo: false,
347345
actions: false,
348346
butbot: false,

crates/but-testing/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ async fn main() -> Result<()> {
183183
description.as_deref(),
184184
&args.current_dir,
185185
args.json,
186-
args.v3,
187186
),
188187
(None, Some(id)) => command::stacks::branches(*id, &args.current_dir, args.json),
189188
(None, None) => {

crates/but/src/mcp_internal/stack.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ pub fn create_stack_with_branch(
3131
let app_settings = AppSettings {
3232
feature_flags: but_settings::app_settings::FeatureFlags {
3333
// Keep this off until it caught up at least.
34-
ws3: false,
3534
undo: false,
3635
actions: false,
3736
butbot: false,

crates/but/src/mcp_internal/status.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pub fn project_status(project_dir: &Path) -> anyhow::Result<but_tools::workspace
1111
let app_settings = AppSettings {
1212
feature_flags: but_settings::app_settings::FeatureFlags {
1313
// Keep this off until it caught up at least.
14-
ws3: false,
1514
undo: false,
1615
actions: false,
1716
butbot: false,

0 commit comments

Comments
 (0)