Commit eb63272
committed
merge: sync with origin/development (taxonomy publish, branch settings, deps update)
Merges development branch changes:
- feat: add taxonomy.publish() method with optional api_version and branch params
- feat: add branch.updateSettings() method for AM v2 linked workspace configuration
- fix: dependencies updated (snyk security fixes)
- chore: version bump and changelog update
- chore: update sanity-report.mjs
Conflict resolutions:
- .talismanrc: kept all existing checksums, updated package-lock.json checksum,
added new checksums for lib/stack/branch/index.js and lib/stack/taxonomy/index.js
- terms-test.js: kept our comprehensive async/await test suite (discarded development's
old callback-style test structure which targeted the legacy test file)File tree
11 files changed
+1107
-2601
lines changed- lib/stack
- branch
- taxonomy
- test/unit
- types/stack
- branch
- taxonomy
11 files changed
+1107
-2601
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
123 | 127 | | |
0 commit comments