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

Fixes panel / NTP initialization (uplift to 1.13.x) #6338

Merged
merged 2 commits into from
Aug 5, 2020
Merged

Fixes panel / NTP initialization (uplift to 1.13.x) #6338

merged 2 commits into from
Aug 5, 2020

Conversation

NejcZdovc
Copy link
Contributor

@NejcZdovc NejcZdovc commented Aug 4, 2020 •
edited by LaurenWags
Loading

Uplift of #6321
Uplift of #6323
Resolves brave/brave-browser#11038
Resolves brave/brave-browser#11039
Resolves brave/brave-browser#10783
Resolves brave/brave-browser#10717

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@NejcZdovc
Merge pull request #6323 from brave/ksmith-rewards-1-10-upgrade
e12b3bf 
Add rewards page initialization check
@NejcZdovc NejcZdovc requested a review from tmancey as a code owner August 4, 2020 18:20
@NejcZdovc NejcZdovc self-assigned this Aug 4, 2020
@NejcZdovc NejcZdovc requested review from a team and removed request for tmancey August 4, 2020 18:21
@NejcZdovc NejcZdovc added this to the 1.13.x - Beta milestone Aug 4, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Aug 5, 2020

Restarting macOS as build failed as per https://ci.brave.com/job/pr-brave-browser-rewards-init-1.13/2/execution/node/650/log/

17:17:12  FAILED: obj/brave/browser/ui/bookmark/bookmark/brave_bookmark_tab_helper.o

Restarting Win x64 as we lost the instance/agent as per Agent was removed via https://ci.brave.com/job/pr-brave-browser-rewards-init-1.13/2/execution/node/355/log/.

15:57:06  Cannot contact i-0243e2392df4ad2af: hudson.remoting.RequestAbortedException: java.io.IOException: Unexpected termination of the channel
16:02:06  Could not connect to i-0243e2392df4ad2af to send interrupt signal to process

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels Aug 5, 2020
LaurenWags
LaurenWags approved these changes Aug 5, 2020
View reviewed changes
Copy link
Member

@LaurenWags LaurenWags 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.13.x approved after deliberating with @brave/uplift-approvers. QA has also verified the PR on Nightly as per #6321 (comment) and #6323 (comment).

@LaurenWags LaurenWags merged commit df8a878 into 1.13.x Aug 5, 2020
@LaurenWags LaurenWags deleted the rewards-init-1.13 branch August 5, 2020 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LaurenWags LaurenWags LaurenWags approved these changes

Assignees

@NejcZdovc NejcZdovc

Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS feature/rewards
Projects
None yet
Milestone
1.13.x - Release #1
Development

Successfully merging this pull request may close these issues.
3 participants
@NejcZdovc @kjozwiak @LaurenWags