Merge branch 'main' into lilac/app-groups-frontend

aslilac · aslilac · commit fbf1f782aef6 · 2025-05-29T17:03:38.000Z
diff --git a/dogfood/coder/main.tf b/dogfood/coder/main.tf
@@ -267,14 +267,11 @@ module "vscode-web" {
 }
 
 module "jetbrains" {
-  count    = data.coder_workspace.me.start_count
-  source   = "git::https://github.com/coder/modules.git//jetbrains?ref=jetbrains"
-  agent_id = coder_agent.dev.id
-  folder   = local.repo_dir
-  options  = ["WS", "GO"]
-  default  = "GO"
-  latest   = true
-  channel  = "eap"
+  count         = data.coder_workspace.me.start_count
+  source        = "git::https://github.com/coder/registry.git//registry/coder/modules/jetbrains?ref=jetbrains"
+  agent_id      = coder_agent.dev.id
+  folder        = local.repo_dir
+  major_version = "latest"
 }
 
 module "filebrowser" {
diff --git a/site/src/pages/TaskPage/TaskPage.tsx b/site/src/pages/TaskPage/TaskPage.tsx
@@ -255,7 +255,7 @@ const TaskPage = () => {
 
 					<Button variant="outline" asChild>
 						<RouterLink
-							to={`/@${task.workspace.owner_username}/${task.workspace.name}`}
+							to={`/@${task.workspace.owner_name}/${task.workspace.name}`}
 						>
 							View workspace
 						</RouterLink>

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ const TaskPage = () => {`
`255`	`255`
`256`	`256`	`<Button variant="outline" asChild>`
`257`	`257`	`<RouterLink`
`258`		- to={`/@${task.workspace.owner_username}/${task.workspace.name}`}
	`258`	+ to={`/@${task.workspace.owner_name}/${task.workspace.name}`}
`259`	`259`	`>`
`260`	`260`	`View workspace`
`261`	`261`	`</RouterLink>`