make gen

f0ssel · f0ssel · commit db340756e09a · 2023-12-15T13:53:22.000Z
diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
@@ -16,8 +16,7 @@ SUBCOMMANDS:
 OPTIONS:
       --allow-workspace-renames bool, $CODER_ALLOW_WORKSPACE_RENAMES (default: false)
           DEPRECATED: Allow users to rename their workspaces. Use only for
-          temporary compatibility reasons, this flag will no longer function
-          after 2024-04-01.
+          temporary compatibility reasons.
 
       --cache-dir string, $CODER_CACHE_DIRECTORY (default: [cache dir])
           The directory to cache temporary files. If unspecified and
diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
@@ -450,7 +450,6 @@ wgtunnelHost: ""
 userQuietHoursSchedule:
   # The default daily cron schedule applied to users that haven't set a custom quiet
   # hours schedule themselves. The quiet hours schedule determines when workspaces
-<<<<<<< HEAD
   # will be force stopped due to the template's autostop requirement, and will round
   # the max deadline up to be within the user's quiet hours window (or default). The
   # format is the same as the standard cron format, but the day-of-month, month and
@@ -463,16 +462,7 @@ userQuietHoursSchedule:
   # change their quiet hours schedule and the site default is always used.
   # (default: true, type: bool)
   allowCustomQuietHours: true
-=======
-  # will be force stopped due to the template's max TTL, and will round the max TTL
-  # up to be within the user's quiet hours window (or default). The format is the
-  # same as the standard cron format, but the day-of-month, month and day-of-week
-  # must be *. Only one hour and minute can be specified (ranges or comma separated
-  # values are not supported).
-  # (default: <unset>, type: string)
-  defaultQuietHoursSchedule: ""
 # DEPRECATED: Allow users to rename their workspaces. Use only for temporary
-# compatibility reasons, this flag will no longer function after 2024-04-01.
+# compatibility reasons.
 # (default: false, type: bool)
 allowWorkspaceRenames: false
->>>>>>> 899e802d6 (update golden)
diff --git a/docs/cli/server.md b/docs/cli/server.md
diff --git a/enterprise/cli/testdata/coder_server_--help.golden b/enterprise/cli/testdata/coder_server_--help.golden
@@ -17,8 +17,7 @@ SUBCOMMANDS:
 OPTIONS:
       --allow-workspace-renames bool, $CODER_ALLOW_WORKSPACE_RENAMES (default: false)
           DEPRECATED: Allow users to rename their workspaces. Use only for
-          temporary compatibility reasons, this flag will no longer function
-          after 2024-04-01.
+          temporary compatibility reasons.
 
       --cache-dir string, $CODER_CACHE_DIRECTORY (default: [cache dir])
           The directory to cache temporary files. If unspecified and
