Skip to content

Commit c70ea10

Browse files
committed
Merge remote-tracking branch 'origin/master' into enelson-mcp-tool-metric
* origin/master: (22 commits) feat: add UrlMatcher to inspect if the Misk Application has a handler for a given URL (#3457) Fix edge-case issue with `RetryingTransacter` (#3456) Add http_response_header_size to WebConfig (#3453) add blpop to redis (#3441) fix post message request field name (#3450) Support getChatPermalink and threaded responses on slack api (#3447) misk-hibernate: use single connection in Vitess shard targeting and improve interface (#3409) [bug fix] Fix `del` operation in FakeRedis.kt (#3449) fix: Use TCCL to load classes (#3448) adds support for server instructions (#3430) misk-testing: create TestFixtureBindingValidator (#3440) fix: flaky ExclusiveTimingInterceptorTest (#3446) fix: some more flakiness in SubscriptionTest (#3445) Bump form-data in /misk-admin/web-actions/development-proxy (#3432) fix: flaky SqsJobQueueTest (#3438) Misk servlet embeddable to an external servlet containers (#3435) feat: reattempt in introducing configurable http/2 control frame limiter with observability (#3422) fix: flaky SubscriptionTest (#3437) Bump tar-fs from 2.1.1 to 2.1.4 (#3431) Bump sha.js from 2.4.11 to 2.4.12 in /misk-admin/web/tabs/database (#3434) ... # Conflicts: # misk-mcp/src/main/kotlin/misk/mcp/McpServerModule.kt # misk-mcp/src/main/kotlin/misk/mcp/MiskMcpServer.kt
2 parents 84b1e21 + 4cd057d commit c70ea10

File tree

57 files changed

+2643
-852
lines changed

Some content is hidden

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

57 files changed

+2643
-852
lines changed

.github/workflows/Build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v5
2626

2727
- name: Hermit
2828
run: ./bin/hermit env -r >> $GITHUB_ENV
@@ -64,7 +64,7 @@ jobs:
6464

6565
steps:
6666
- name: Checkout
67-
uses: actions/checkout@v3
67+
uses: actions/checkout@v5
6868

6969
- name: Hermit
7070
run: ./bin/hermit env -r >> $GITHUB_ENV
@@ -94,7 +94,7 @@ jobs:
9494

9595
steps:
9696
- name: Checkout
97-
uses: actions/checkout@v3
97+
uses: actions/checkout@v5
9898

9999
- name: Hermit
100100
run: ./bin/hermit env -r >> $GITHUB_ENV

.github/workflows/Linting.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v5
2626

2727
- name: Hermit
2828
run: ./bin/hermit env -r >> $GITHUB_ENV
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout
39-
uses: actions/checkout@v3
39+
uses: actions/checkout@v5
4040

4141
- name: Hermit
4242
run: ./bin/hermit env -r >> $GITHUB_ENV

.github/workflows/Publish-Website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checkout the repo
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v5
1919

2020
- name: Hermit
2121
run: ./bin/hermit env -r >> $GITHUB_ENV

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ errorproneAnnotations = { module = "com.google.errorprone:error_prone_annotation
7676
findbugsJsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
7777
gax = { module = "com.google.api:gax", version = "2.70.2" }
7878
gcpCloudCore = { module = "com.google.cloud:google-cloud-core", version = "2.60.2" }
79-
gcpDatastore = { module = "com.google.cloud:google-cloud-datastore", version = "2.32.0" }
79+
gcpDatastore = { module = "com.google.cloud:google-cloud-datastore", version = "2.32.1" }
8080
gcpKms = { module = "com.google.apis:google-api-services-cloudkms", version = "v1-rev20250911-2.0.0" }
8181
gcpLogback = { module = "com.google.cloud:google-cloud-logging-logback", version = "0.130.11-alpha" }
8282
gcpLogging = { module = "com.google.cloud:google-cloud-logging", version = "3.23.4" }

misk-admin/web-actions/development-proxy/package-lock.json

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)