Skip to content

Commit 2f07f99

Browse files
committed
Merge branch 'main' into 18307-refresh-tokens
2 parents 566fe99 + dcc8e9e commit 2f07f99

14 files changed

+9
-26
lines changed

docs/admin/integrations/island.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<div>
44
<a href="https://github.com/ericpaulsen" style="text-decoration: none; color: inherit;">
55
<span style="vertical-align:middle;">Eric Paulsen</span>
6-
<img src="https://github.com/ericpaulsen.png" alt="ericpaulsen" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
76
</a>
87
</div>
98
April 24, 2024

docs/admin/integrations/jfrog-xray.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<div>
44
<a href="https://github.com/matifali" style="text-decoration: none; color: inherit;">
55
<span style="vertical-align:middle;">Muhammad Atif Ali</span>
6-
<img src="https://github.com/matifali.png" alt="matifali" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
7-
86
</a>
97
</div>
108
March 17, 2024

docs/admin/integrations/vault.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<div>
44
<a href="https://github.com/matifali" style="text-decoration: none; color: inherit;">
55
<span style="vertical-align:middle;">Muhammad Atif Ali</span>
6-
<img src="https://github.com/matifali.png" alt="matifali" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
7-
86
</a>
97
</div>
108
August 05, 2024

docs/admin/monitoring/health-check.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,7 @@ that they are able to successfully connect to Coder. Otherwise, ensure
300300
is set to a value greater than 0.
301301

302302
> [!NOTE]
303-
> This may be a transient issue if you are currently in the process of
304-
updating your deployment.
303+
> This may be a transient issue if you are currently in the process of updating your deployment.
305304
306305
### EPD02
307306

@@ -316,8 +315,7 @@ of API incompatibility.
316315
version of Coder.
317316

318317
> [!NOTE]
319-
> This may be a transient issue if you are currently in the process of
320-
updating your deployment.
318+
> This may be a transient issue if you are currently in the process of updating your deployment.
321319
322320
### EPD03
323321

@@ -332,8 +330,7 @@ connect to Coder.
332330
version of Coder.
333331

334332
> [!NOTE]
335-
> This may be a transient issue if you are currently in the process of
336-
updating your deployment.
333+
> This may be a transient issue if you are currently in the process of updating your deployment.
337334
338335
### EUNKNOWN
339336

docs/tutorials/azure-federation.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<div>
44
<a href="https://github.com/ericpaulsen" style="text-decoration: none; color: inherit;">
55
<span style="vertical-align:middle;">Eric Paulsen</span>
6-
<img src="https://github.com/ericpaulsen.png" alt="ericpaulsen" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
76
</a>
87
</div>
98
January 26, 2024

docs/tutorials/cloning-git-repositories.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<span style="vertical-align:middle;">Author: </span>
55
<a href="https://github.com/BrunoQuaresma" style="text-decoration: none; color: inherit; margin-bottom: 0px;">
66
<span style="vertical-align:middle;">Bruno Quaresma</span>
7-
<img src="https://avatars.githubusercontent.com/u/3165839?v=4" alt="Bruno Quaresma" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
87
</a>
98
</div>
109
August 06, 2024

docs/tutorials/configuring-okta.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<span style="vertical-align:middle;">Author: </span>
55
<a href="https://github.com/Emyrk" style="text-decoration: none; color: inherit; margin-bottom: 0px;">
66
<span style="vertical-align:middle;">Steven Masley</span>
7-
<img src="https://avatars.githubusercontent.com/u/5446298?v=4" alt="Steven Masley" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
87
</a>
98
</div>
109
Updated: June, 2025

docs/tutorials/example-guide.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<div>
44
<a href="https://github.com/coder" style="text-decoration: none; color: inherit;">
55
<span style="vertical-align:middle;">Your Name</span>
6-
<img src="https://github.com/coder.png" alt="Coder" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
76
</a>
87
</div>
98
December 13, 2023

docs/tutorials/gcp-to-aws.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<div>
44
<a href="https://github.com/ericpaulsen" style="text-decoration: none; color: inherit;">
55
<span style="vertical-align:middle;">Eric Paulsen</span>
6-
<img src="https://github.com/ericpaulsen.png" alt="ericpaulsen" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
76
</a>
87
</div>
98
January 4, 2024

docs/tutorials/image-pull-secret.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<div>
44
<a href="https://github.com/ericpaulsen" style="text-decoration: none; color: inherit;">
55
<span style="vertical-align:middle;">Eric Paulsen</span>
6-
<img src="https://github.com/ericpaulsen.png" alt="ericpaulsen" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
76
</a>
87
</div>
98
January 12, 2024

docs/tutorials/postgres-ssl.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<div>
44
<a href="https://github.com/ericpaulsen" style="text-decoration: none; color: inherit;">
55
<span style="vertical-align:middle;">Eric Paulsen</span>
6-
<img src="https://github.com/ericpaulsen.png" alt="ericpaulsen" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
76
</a>
87
</div>
98
February 24, 2024

docs/tutorials/testing-templates.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<div>
44
<a href="https://github.com/matifali" style="text-decoration: none; color: inherit;">
55
<span style="vertical-align:middle;">Muhammad Atif Ali</span>
6-
<img src="https://github.com/matifali.png" alt="matifali" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
7-
86
</a>
97
</div>
108
November 15, 2024

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ require (
170170
github.com/prometheus/common v0.63.0
171171
github.com/quasilyte/go-ruleguard/dsl v0.3.22
172172
github.com/robfig/cron/v3 v3.0.1
173-
github.com/shirou/gopsutil/v4 v4.25.3
173+
github.com/shirou/gopsutil/v4 v4.25.4
174174
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
175175
github.com/spf13/afero v1.14.0
176176
github.com/spf13/pflag v1.0.6
@@ -481,7 +481,7 @@ require (
481481

482482
require (
483483
github.com/anthropics/anthropic-sdk-go v0.2.0-beta.3
484-
github.com/coder/preview v0.0.2-0.20250604144457-c9862a17f652
484+
github.com/coder/preview v0.0.2-0.20250611164554-2e5caa65a54a
485485
github.com/fsnotify/fsnotify v1.9.0
486486
github.com/kylecarbs/aisdk-go v0.0.8
487487
github.com/mark3labs/mcp-go v0.31.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -910,8 +910,8 @@ github.com/coder/pq v1.10.5-0.20240813183442-0c420cb5a048 h1:3jzYUlGH7ZELIH4XggX
910910
github.com/coder/pq v1.10.5-0.20240813183442-0c420cb5a048/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
911911
github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 h1:3A0ES21Ke+FxEM8CXx9n47SZOKOpgSE1bbJzlE4qPVs=
912912
github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0/go.mod h1:5UuS2Ts+nTToAMeOjNlnHFkPahrtDkmpydBen/3wgZc=
913-
github.com/coder/preview v0.0.2-0.20250604144457-c9862a17f652 h1:GukgWbsop8A3vZXXwYtjJfLOIgLygvFw8I6BF0UuvNo=
914-
github.com/coder/preview v0.0.2-0.20250604144457-c9862a17f652/go.mod h1:nXz3bBwbU8/9NYI4OISUsoLDFlEREtTozYhJq6FAE8E=
913+
github.com/coder/preview v0.0.2-0.20250611164554-2e5caa65a54a h1:rArAOPl5zHB7lhT2sy+jfcmyLeDlm6tXDoGkGdWNq7g=
914+
github.com/coder/preview v0.0.2-0.20250611164554-2e5caa65a54a/go.mod h1:nXz3bBwbU8/9NYI4OISUsoLDFlEREtTozYhJq6FAE8E=
915915
github.com/coder/quartz v0.2.1 h1:QgQ2Vc1+mvzewg2uD/nj8MJ9p9gE+QhGJm+Z+NGnrSE=
916916
github.com/coder/quartz v0.2.1/go.mod h1:vsiCc+AHViMKH2CQpGIpFgdHIEQsxwm8yCscqKmzbRA=
917917
github.com/coder/retry v1.5.1 h1:iWu8YnD8YqHs3XwqrqsjoBTAVqT9ml6z9ViJ2wlMiqc=
@@ -1711,8 +1711,8 @@ github.com/secure-systems-lab/go-securesystemslib v0.9.0 h1:rf1HIbL64nUpEIZnjLZ3
17111711
github.com/secure-systems-lab/go-securesystemslib v0.9.0/go.mod h1:DVHKMcZ+V4/woA/peqr+L0joiRXbPpQ042GgJckkFgw=
17121712
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
17131713
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
1714-
github.com/shirou/gopsutil/v4 v4.25.3 h1:SeA68lsu8gLggyMbmCn8cmp97V1TI9ld9sVzAUcKcKE=
1715-
github.com/shirou/gopsutil/v4 v4.25.3/go.mod h1:xbuxyoZj+UsgnZrENu3lQivsngRR5BdjbJwf2fv4szA=
1714+
github.com/shirou/gopsutil/v4 v4.25.4 h1:cdtFO363VEOOFrUCjZRh4XVJkb548lyF0q0uTeMqYPw=
1715+
github.com/shirou/gopsutil/v4 v4.25.4/go.mod h1:xbuxyoZj+UsgnZrENu3lQivsngRR5BdjbJwf2fv4szA=
17161716
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
17171717
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
17181718
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=

0 commit comments

Comments
 (0)