Skip to content

Commit 8aa0642

Browse files
authored
Merge branch 'master' into shortanswer-refactoring
2 parents cd053ce + 4c190f4 commit 8aa0642

File tree

98 files changed

+2233
-1673
lines changed

Some content is hidden

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

98 files changed

+2233
-1673
lines changed

.github/workflows/filterDuplicates.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ async function run() {
111111
console.log('%s duplicates found', filteredDuplicates.length)
112112
if (filteredDuplicates.length > 0) {
113113
console.log(formatDuplicates(filteredDuplicates, commitHash, repoName))
114+
console.log(
115+
'* Hint: if these duplicates appear unrelated to the changes, rebase onto or merge in the latest target branch.'
116+
)
114117
process.exit(1)
115118
}
116119
}

buildspec/linuxE2ETests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ phases:
2626
# - '>/dev/null apt-get -qq install -y ca-certificates'
2727
# - 'apt-get install --reinstall ca-certificates'
2828
- bash buildspec/shared/linux-install.sh
29+
# increase file watcher count (ENOSPC error)
30+
- sysctl fs.inotify.max_user_watches=524288
2931

3032
pre_build:
3133
commands:

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
4242
},
4343
"devDependencies": {
44-
"@aws-toolkits/telemetry": "^1.0.305",
44+
"@aws-toolkits/telemetry": "^1.0.307",
4545
"@playwright/browser-chromium": "^1.43.1",
4646
"@stylistic/eslint-plugin": "^2.11.0",
4747
"@types/he": "^1.2.3",
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"date": "2025-03-06",
3+
"version": "1.50.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "/doc: Usage in multiple chat tabs may cause unexpected behavior."
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "/review: subsequent reviews weren't possible"
12+
},
13+
{
14+
"type": "Feature",
15+
"description": "Amazon Q chat: Use `@` to add folders, files, and saved prompts as context"
16+
},
17+
{
18+
"type": "Feature",
19+
"description": "Amazon Q chat: increase chat input height to 3 lines"
20+
},
21+
{
22+
"type": "Feature",
23+
"description": "Amazon Q chat: Show list of files sent as context in chat response"
24+
},
25+
{
26+
"type": "Feature",
27+
"description": "Amazon Q chat: Add support for `.md` file rules in workspace-level `.amazonq/rules` directory"
28+
},
29+
{
30+
"type": "Test",
31+
"description": "add Q Chat /review command test coverage"
32+
}
33+
]
34+
}

packages/amazonq/.changes/next-release/Bug Fix-4f4a3fc1-a25a-4c26-abe8-8de424ddaabd.json

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Bug Fix",
3+
"description": "Amazon Q chat: Create a new prompt form does not autofocus or submit with Enter press"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Bug Fix",
3+
"description": "/review: Zip files are created with the wrong file path for file scans in multifolder workspaces."
4+
}

packages/amazonq/.changes/next-release/Bug Fix-c2494a35-1254-4920-abec-2fb44a15ac1d.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/.changes/next-release/Feature-1707f610-2dde-4af1-b704-0e541efb7c4a.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)