Restore main branch
#6343
Merged
Restore main branch
#6343
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* remove data broker from dashboard * big sweep * fix build errors * fix filterexposures component * remove data broker from exposurecarddataclass * fix dashboard top banner * fix resolution container * fix guided resolution flow * include missed story * fix build error in high riks data breaches * remove email address plus const * remove emails * big sweep * remove isEligibleForPremium guard * remove dashboard tests * fix bad rebase * Remove plus settings stories * landing page remaining deprecation * remove data broker exposure card tests and onerep functions * onerep funcs cleanup * remove removalprocess * remove cancel flow * more code removal * remove location data from build command * remove broken imports * fix unit tests * fix breaking build * add invalid test case * fix tests * remove accounts metric flow and search param logic * fix unit tests * add useviewtelemetry test * fix all tests * remove more subscription code * revert string dashboard-exposures-all-fixed-label * revert getAllQaCustomBreaches * remove fxauid route * remove getreferrerurl * remove feature flag prop drilling * remove unsubscribe link from emailfooter * add product-email test back * update comment * add back isadmin
Bumps the stylelint group with 1 update: [stylelint](https://github.com/stylelint/stylelint). Updates `stylelint` from 16.26.0 to 16.26.1 - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](stylelint/stylelint@16.26.0...16.26.1) --- updated-dependencies: - dependency-name: stylelint dependency-version: 16.26.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: stylelint ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps the eslint group with 3 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin), [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) and [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest). Updates `@typescript-eslint/eslint-plugin` from 8.47.0 to 8.48.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.48.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.47.0 to 8.48.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.48.1/packages/parser) Updates `eslint-plugin-jest` from 29.2.0 to 29.2.1 - [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases) - [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md) - [Commits](jest-community/eslint-plugin-jest@v29.2.0...v29.2.1) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.48.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint - dependency-name: "@typescript-eslint/parser" dependency-version: 8.48.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint - dependency-name: eslint-plugin-jest dependency-version: 29.2.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: eslint ... Signed-off-by: dependabot[bot] <[email protected]>
* chore(hibp): handle multiple keys in webhook endpoint * chore: simplify and add trimming * chore: handle if user has multiple tokens in env
Bumps [next](https://github.com/vercel/next.js) from 15.5.7 to 15.5.9. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](vercel/next.js@v15.5.7...v15.5.9) --- updated-dependencies: - dependency-name: next dependency-version: 15.5.9 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
* chore(hibp): handle multiple keys in webhook endpoint * chore: simplify and add trimming * chore: handle if user has multiple tokens in env
Collaborator
|
Ping me when conflicts are resolved and I'll review |
Collaborator
Author
|
Thanks @kschelonka. I'm not sure how to view just the conflict resolutions in a merge commit, but the conflict was updating the |
kschelonka
approved these changes
Dec 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I force-pushed the current production release (https://github.com/mozilla/blurts-server/releases/tag/2025.12.05) to
main. This branch contains what used to be inmain; we can merge that back in when ready.