Merge branch 'main' into psk-tags

coder · aslilac · Sep 17, 2024 · Sep 5, 2024 · Sep 6, 2024 · Sep 6, 2024
commit cc620a50850dc83b0983c06a13a3c81f90ae28f7
diff --git a/site/src/modules/provisioners/ProvisionerGroup.tsx b/site/src/modules/provisioners/ProvisionerGroup.tsx
@@ -134,13 +134,7 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
 				>
 					<Tooltip title="Scope">
 						<Pill size="lg" icon={iconScope}>
-							<span
-								css={{
-									textTransform: "capitalize",
-								}}
-							>
-								{daemonScope}
-							</span>
+							<span css={{ textTransform: "capitalize" }}>{daemonScope}</span>
 						</Pill>
 					</Tooltip>
 					{type === "key" &&

diff --git a/site/src/pages/ManagementSettingsPage/OrganizationProvisionersPageView.stories.tsx b/site/src/pages/ManagementSettingsPage/OrganizationProvisionersPageView.stories.tsx
@@ -38,7 +38,7 @@ export const Provisioners: Story = {
 						},
 					],
 				],
-				["じぇいダレン", [MockProvisioner, MockProvisioner2]],
+				["ジャイデン", [MockProvisioner, MockProvisioner2]],
 				[
 					"ケイラ",
 					[
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ export const Provisioners: Story = { @@
     						},
     					],
     				],
-    				["じぇいダレン", [MockProvisioner, MockProvisioner2]],
+    				["ジャイデン", [MockProvisioner, MockProvisioner2]],
     				[
     					"ケイラ",
     					[
@@ Expand Down @@