Merge branch 'main' of https://github.com/coder/coder into bq/upgrade-msw

BrunoQuaresma · BrunoQuaresma · commit 538f1e2eaecc · 2024-03-18T14:49:08.000Z
diff --git a/go.mod b/go.mod
@@ -208,7 +208,7 @@ require go.uber.org/mock v0.4.0
 
 require (
 	github.com/benbjohnson/clock v1.3.5
-	github.com/coder/serpent v0.4.1-0.20240315163851-a0148c87ea3f
+	github.com/coder/serpent v0.5.0
 	github.com/gomarkdown/markdown v0.0.0-20231222211730-1d6d20845b47
 )
 
diff --git a/go.sum b/go.sum
@@ -214,8 +214,8 @@ github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 h1:3A0ES21Ke+FxEM8CXx
 github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0/go.mod h1:5UuS2Ts+nTToAMeOjNlnHFkPahrtDkmpydBen/3wgZc=
 github.com/coder/retry v1.5.1 h1:iWu8YnD8YqHs3XwqrqsjoBTAVqT9ml6z9ViJ2wlMiqc=
 github.com/coder/retry v1.5.1/go.mod h1:blHMk9vs6LkoRT9ZHyuZo360cufXEhrxqvEzeMtRGoY=
-github.com/coder/serpent v0.4.1-0.20240315163851-a0148c87ea3f h1:nqJ/Mvm+nLI22n5BIYhvSmTZ6CD+MRo/aGVZwVQgr1k=
-github.com/coder/serpent v0.4.1-0.20240315163851-a0148c87ea3f/go.mod h1:REkJ5ZFHQUWFTPLExhXYZ1CaHFjxvGNRlLXLdsI08YA=
+github.com/coder/serpent v0.5.0 h1:9p7u3BRYohQjkeN2T4nU4aQJcnDGz3rwezZG2EvH6yA=
+github.com/coder/serpent v0.5.0/go.mod h1:REkJ5ZFHQUWFTPLExhXYZ1CaHFjxvGNRlLXLdsI08YA=
 github.com/coder/ssh v0.0.0-20231128192721-70855dedb788 h1:YoUSJ19E8AtuUFVYBpXuOD6a/zVP3rcxezNsoDseTUw=
 github.com/coder/ssh v0.0.0-20231128192721-70855dedb788/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ=
 github.com/coder/tailscale v1.1.1-0.20240214140224-3788ab894ba1 h1:A7dZHNidAVH6Kxn5D3hTEH+iRO8slnM0aRer6/cxlyE=

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ require go.uber.org/mock v0.4.0`
`208`	`208`
`209`	`209`	`require (`
`210`	`210`	`github.com/benbjohnson/clock v1.3.5`
`211`		`- github.com/coder/serpent v0.4.1-0.20240315163851-a0148c87ea3f`
	`211`	`+ github.com/coder/serpent v0.5.0`
`212`	`212`	`github.com/gomarkdown/markdown v0.0.0-20231222211730-1d6d20845b47`
`213`	`213`	`)`
`214`	`214`