Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite0b1082

Browse files
stirbydependabot[bot]DanielleMaywoodjohnstcnkylecarbs
authored
chore: cherry picks for release 2.21 (#17206)
Cherry-picked fix: add fallback icons for notifications (#17013)Related:coder/internal#522Co-authored-by: Vincent Vielle <vincent@coder.com>Bumps[vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite)from 5.4.14 to 5.4.15.<details><summary>Release notes</summary><p><em>Sourced from <ahref="https://github.com/vitejs/vite/releases">vite'sreleases</a>.</em></p><blockquote><h2>v5.4.15</h2><p>Please refer to <ahref="https://github.com/vitejs/vite/blob/v5.4.15/packages/vite/CHANGELOG.md">CHANGELOG.md</a>for details.</p></blockquote></details><details><summary>Changelog</summary><p><em>Sourced from <ahref="https://github.com/vitejs/vite/blob/v5.4.15/packages/vite/CHANGELOG.md">vite'schangelog</a>.</em></p><blockquote><h2><!-- raw HTML omitted -->5.4.15 (2025-03-24)<!-- raw HTML omitted--></h2><ul><li>fix: backport <ahref="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/19702">#19702</a>,fs raw query with query separators (<ahref="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/19703">#19703</a>)(<ahref="https://github.com/vitejs/vite/commit/807d7f06d33ab49c48a2a3501da3eea1906c0d41">807d7f0</a>),closes <ahref="https://redirect.github.com/vitejs/vite/issues/19702">#19702</a><ahref="https://redirect.github.com/vitejs/vite/issues/19703">#19703</a></li></ul></blockquote></details><details><summary>Commits</summary><ul><li><ahref="https://github.com/vitejs/vite/commit/9b0f4c80eea8b136d262c705234353e96abfbe75"><code>9b0f4c8</code></a>release: v5.4.15</li><li><ahref="https://github.com/vitejs/vite/commit/807d7f06d33ab49c48a2a3501da3eea1906c0d41"><code>807d7f0</code></a>fix: backport <ahref="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/19702">#19702</a>,fs raw query with query separators (<ahref="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/19703">#19703</a>)</li><li>See full diff in <ahref="https://github.com/vitejs/vite/commits/v5.4.15/packages/vite">compareview</a></li></ul></details><br />[![Dependabot compatibilityscore](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=vite&package-manager=npm_and_yarn&previous-version=5.4.14&new-version=5.4.15)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)Dependabot will resolve any conflicts with this PR as long as you don'talter it yourself. You can also trigger a rebase manually by commenting`@dependabot rebase`.[//]: # (dependabot-automerge-start)[//]: # (dependabot-automerge-end)---<details><summary>Dependabot commands and options</summary><br />You can trigger Dependabot actions by commenting on this PR:- `@dependabot rebase` will rebase this PR- `@dependabot recreate` will recreate this PR, overwriting any editsthat have been made to it- `@dependabot merge` will merge this PR after your CI passes on it- `@dependabot squash and merge` will squash and merge this PR afteryour CI passes on it- `@dependabot cancel merge` will cancel a previously requested mergeand block automerging- `@dependabot reopen` will reopen this PR if it is closed- `@dependabot close` will close this PR and stop Dependabot recreatingit. You can achieve the same result by closing it manually- `@dependabot show <dependency name> ignore conditions` will show allof the ignore conditions of the specified dependency- `@dependabot ignore this major version` will close this PR and stopDependabot creating any more for this major version (unless you reopenthe PR or upgrade to it yourself)- `@dependabot ignore this minor version` will close this PR and stopDependabot creating any more for this minor version (unless you reopenthe PR or upgrade to it yourself)- `@dependabot ignore this dependency` will close this PR and stopDependabot creating any more for this dependency (unless you reopen thePR or upgrade to it yourself)You can disable automated security fix PRs for this repo from the[Security Alerts page](https://github.com/coder/coder/network/alerts).</details>Signed-off-by: dependabot[bot] <support@github.com>Co-authored-by: dependabot[bot]<49699333+dependabot[bot]@users.noreply.github.com>(cherry picked from commit38f404f)---------Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>Co-authored-by: Danielle Maywood <danielle@themaywoods.com>Co-authored-by: Cian Johnston <cian@coder.com>Co-authored-by: Kyle Carberry <kyle@coder.com>Co-authored-by: Bruno Quaresma <bruno@coder.com>
1 parentebefec6 commite0b1082

File tree

105 files changed

+8065
-1586
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+8065
-1586
lines changed

‎agent/agent.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
"tailscale.com/util/clientmetric"
3737

3838
"cdr.dev/slog"
39+
"github.com/coder/clistat"
3940
"github.com/coder/coder/v2/agent/agentcontainers"
4041
"github.com/coder/coder/v2/agent/agentexec"
4142
"github.com/coder/coder/v2/agent/agentscripts"
@@ -44,7 +45,6 @@ import (
4445
"github.com/coder/coder/v2/agent/proto/resourcesmonitor"
4546
"github.com/coder/coder/v2/agent/reconnectingpty"
4647
"github.com/coder/coder/v2/buildinfo"
47-
"github.com/coder/coder/v2/cli/clistat"
4848
"github.com/coder/coder/v2/cli/gitauth"
4949
"github.com/coder/coder/v2/coderd/database/dbtime"
5050
"github.com/coder/coder/v2/codersdk"

‎agent/proto/resourcesmonitor/fetcher.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package resourcesmonitor
33
import (
44
"golang.org/x/xerrors"
55

6-
"github.com/coder/coder/v2/cli/clistat"
6+
"github.com/coder/clistat"
77
)
88

99
typeStatterinterface {

‎agent/proto/resourcesmonitor/fetcher_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"github.com/stretchr/testify/require"
77
"golang.org/x/xerrors"
88

9+
"github.com/coder/clistat"
910
"github.com/coder/coder/v2/agent/proto/resourcesmonitor"
10-
"github.com/coder/coder/v2/cli/clistat"
1111
"github.com/coder/coder/v2/coderd/util/ptr"
1212
)
1313

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp