Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade from Chromium 93 to Chromium 94 (1.30.x). #10086

Merged
merged 6 commits into from
Sep 17, 2021
Merged

Upgrade from Chromium 93 to Chromium 94 (1.30.x). #10086

merged 6 commits into from
Sep 17, 2021

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Sep 14, 2021 •
edited
Loading

Fixes brave/brave-browser#17170
Fixes brave/brave-browser#18070
Fixes brave/brave-browser#18077
Fixes brave/brave-browser#18099
Fixes brave/brave-browser#18138
Fixes brave/brave-browser#18149

Related PR: brave/brave-browser#18117

Uplift from #9558
Uplift from #10072
Uplift from #10075
Uplift from #10082
Uplift from #10108
Uplift from #10114

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

mkarolin and others added 3 commits September 14, 2021 16:36
@mkarolin
Merge pull request #9558 from brave/cr94
17ea208 
Upgrade from Chromium 93 to Chromium 94.
@simonhong @mkarolin
Merge pull request #10072 from brave/fix_crash_while_theme_changing
1d6c22b 
Fixed crash while changing theme type
@mkarolin
Merge pull request #10082 from brave/maxk-fix-mac-signing
a2b4734 
Revert "[MacOS][Signing] Revert overwriting Alerts helper app id."
@mkarolin mkarolin added the CI/run-network-audit Run network-audit label Sep 14, 2021
@mkarolin mkarolin requested a review from a team September 14, 2021 20:44
@mkarolin mkarolin self-assigned this Sep 14, 2021
@mkarolin mkarolin requested review from a team as code owners September 14, 2021 20:44
@mkarolin mkarolin requested review from bsclifton and szilardszaloki and removed request for a team September 14, 2021 20:44
@mkarolin mkarolin mentioned this pull request Sep 14, 2021
Merged
24 tasks
darkdh and others added 3 commits September 16, 2021 00:36
@darkdh @mkarolin
Merge pull request #10108 from brave/keychain_mac_fix
5f36ef3 
Fix wrong default service name and account name are used when getting
@mkarolin
Merge pull request #10075 from brave/maxk-fix-reset-profile-dialog
1cefa60 
Fixes reset profile dialog.
@kjozwiak @mkarolin
Merge pull request #10114 from brave/94.0.4606.50_master_118
aa7c989 
Upgrade patches from Chromium 94.0.4606.41 to Chromium 94.0.4606.50
@mkarolin mkarolin changed the title [WIP] Upgrade from Chromium 93 to Chromium 94 (1.30.x). Upgrade from Chromium 93 to Chromium 94 (1.30.x). Sep 16, 2021
kjozwiak
kjozwiak approved these changes Sep 17, 2021
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.30.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit 069b6e2 into 1.30.x Sep 17, 2021
@kjozwiak kjozwiak deleted the cr94-1.30.x branch September 17, 2021 02:18
@kjozwiak kjozwiak added this to the 1.30.x - Beta milestone Sep 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

@bridiver bridiver Awaiting requested review from bridiver bridiver is a code owner

@goodov goodov Awaiting requested review from goodov goodov is a code owner

@iefremov iefremov Awaiting requested review from iefremov iefremov is a code owner

@samartnik samartnik Awaiting requested review from samartnik samartnik is a code owner

@simonhong simonhong Awaiting requested review from simonhong simonhong is a code owner

@bsclifton bsclifton Awaiting requested review from bsclifton

@szilardszaloki szilardszaloki Awaiting requested review from szilardszaloki

Assignees

@mkarolin mkarolin

Labels
CI/run-network-audit Run network-audit
Projects
None yet
Milestone
1.30.x - Release
Development

Successfully merging this pull request may close these issues.
4 participants
@mkarolin @kjozwiak @simonhong @darkdh