Skip to content

Commit 1def246

Browse files
authored
Merge branch 'main' into migrations/189-remove-null-seedphrase
2 parents 5a2e246 + aa07203 commit 1def246

File tree

267 files changed

+11387
-3398
lines changed

Some content is hidden

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

267 files changed

+11387
-3398
lines changed

.github/CODEOWNERS

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -177,17 +177,21 @@ app/scripts/lib/smart-transaction @MetaMask/transactions
177177
shared/lib/multichain/addresses/* @MetaMask/new-networks
178178

179179
# QA Team - E2E Framework
180-
test/e2e/page-objects/ @MetaMask/qa
181-
test/e2e/seeder/ @MetaMask/qa
182-
test/e2e/default-fixture.js @MetaMask/qa
183-
test/e2e/fixture-builder.js @MetaMask/qa
184-
test/e2e/fixture-server.js @MetaMask/qa
185-
test/e2e/helpers.js @MetaMask/qa
186-
test/e2e/mock-e2e-allowlist.js @MetaMask/qa
187-
test/e2e/mock-e2e.js @MetaMask/qa
188-
test/e2e/tests/settings/state-logs-helpers.ts @MetaMask/qa
189-
test/e2e/tests/settings/state-logs.json @MetaMask/qa @MetaMask/extension-privacy-reviewers
190-
test/e2e/tests/privacy/privacy-max-allowlist-onboarding.json @MetaMask/qa @MetaMask/extension-privacy-reviewers
180+
test/e2e/page-objects/ @MetaMask/qa
181+
test/e2e/seeder/ @MetaMask/qa
182+
test/e2e/default-fixture.js @MetaMask/qa
183+
test/e2e/fixture-builder.js @MetaMask/qa
184+
test/e2e/fixture-server.js @MetaMask/qa
185+
test/e2e/helpers.js @MetaMask/qa
186+
test/e2e/mock-e2e-allowlist.js @MetaMask/qa
187+
test/e2e/mock-e2e.js @MetaMask/qa
188+
test/e2e/tests/settings/state-logs-helpers.ts @MetaMask/qa
189+
test/e2e/tests/settings/state-logs.json @MetaMask/qa @MetaMask/extension-privacy-reviewers
190+
test/e2e/tests/privacy/ @MetaMask/qa @MetaMask/extension-privacy-reviewers
191+
test/e2e/fixtures/onboarding-fixture.json @MetaMask/qa @MetaMask/extension-platform
192+
test/e2e/fixtures/fixture-validation.ts @MetaMask/qa @MetaMask/extension-platform
193+
test/e2e/dist/wallet-fixture-export.spec.ts @MetaMask/qa @MetaMask/extension-platform
194+
test/e2e/dist/wallet-fixture-validation.spec.ts @MetaMask/qa @MetaMask/extension-platform
191195

192196
# Wallet Integrations
193197
app/scripts/lib/rpc-method-middleware @MetaMask/wallet-integrations

.github/workflows/cla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
url-to-cladocument: 'https://metamask.io/cla'
2828
# This branch can't have protections, commits are made directly to the specified branch.
2929
branch: 'cla-signatures'
30-
allowlist: 'dependabot[bot],metamaskbot,metamaskbotv2[bot],crowdin-bot,runway-github[bot],cursor,copilot[bot]'
30+
allowlist: 'dependabot[bot],metamaskbot,metamaskbotv2[bot],crowdin-bot,runway-github[bot],cursoragent,Copilot'
3131
allow-organization-members: true
3232
blockchain-storage-flag: false

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ jobs:
572572
- build-dist-browserify
573573
runs-on: ubuntu-latest
574574
timeout-minutes: 5
575+
environment: release-branch
575576
steps:
576577
- name: Trigger regression validation in external repo
577578
env:

0 commit comments

Comments
 (0)