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 71.0.3578.75 to 71.0.3578.80 #1018

Merged
merged 3 commits into from
Dec 4, 2018
Merged

Upgrade from 71.0.3578.75 to 71.0.3578.80 #1018

merged 3 commits into from
Dec 4, 2018

Conversation

bbondy
Copy link
Member

@bbondy bbondy commented Dec 4, 2018 •
edited
Loading

Fix brave/brave-browser#2352
Related https://github.com/brave/brave-browser/pull/2353/files

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@bbondy
Upgrade patches from 71.0.3578.75 to 71.0.3578.80
d94c167
@bbondy
Fix removed parameter for ContentBrowserClient
b662c72 
See also:

commit 61e87f87814462cd83093b61f419282eb4bc42b0
Author: Alexei Svitkine <asvitkine@chromium.org>
Date:   Thu Nov 29 06:23:36 2018 +0000

    Remove code that loads resources.pak earlier.

    This was introduce in https://crrev.com/c/1034133. In the follow up CL, we plan
    to create the entire ResouceBundle earlier, not just loading the DataPack which
    contains the service manifests earlier.

    TBR=hanxi@google.com
@bbondy
Fix removed param for SetApplicationLocale in tests
84b8717
@bbondy bbondy self-assigned this Dec 4, 2018
@bbondy bbondy requested a review from emerick December 4, 2018 13:19
@bbondy bbondy mentioned this pull request Dec 4, 2018
Merged
16 tasks
emerick
emerick approved these changes Dec 4, 2018
View reviewed changes
Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

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

LGTM

@bbondy bbondy merged commit 312cec8 into master Dec 4, 2018
bbondy added a commit that referenced this pull request Dec 4, 2018
@bbondy
Merge pull request #1018 from brave/71.0.3578.80
32ca7ec 
Upgrade from 71.0.3578.75 to 71.0.3578.80
bbondy added a commit that referenced this pull request Dec 4, 2018
@bbondy
Merge pull request #1018 from brave/71.0.3578.80
3747aff 
Upgrade from 71.0.3578.75 to 71.0.3578.80
bbondy added a commit that referenced this pull request Dec 4, 2018
@bbondy
Merge pull request #1018 from brave/71.0.3578.80
032dc47 
Upgrade from 71.0.3578.75 to 71.0.3578.80
@bbondy
Copy link
Member Author

bbondy commented Dec 4, 2018

master: 312cec8
0.59.x: 32ca7ec
0.58.x: 3747aff
0.57.x: 032dc47

@bbondy bbondy deleted the 71.0.3578.80 branch December 5, 2018 15:28
@bbondy bbondy added this to the 0.57.x - Release milestone Jan 14, 2019
NejcZdovc pushed a commit that referenced this pull request Sep 19, 2019
@ryanml @NejcZdovc
Rewards: Imported from brave-ui: Android fixes (#1136, #1018, #1004, #…
eabb47f 
…1147)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emerick emerick emerick approved these changes

Assignees

@bbondy bbondy

Labels
None yet
Projects
None yet
Milestone
0.57.x - Release
Development

Successfully merging this pull request may close these issues.

Upgrade from 71.0.3578.75 to 71.0.3578.80
2 participants
@bbondy @emerick