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.

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

Show bookmark bar on NTP by default (uplift to 0.69.x) #3275

Merged
merged 1 commit into from
Aug 30, 2019

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Aug 27, 2019

Uplift of #3251
Fix brave/brave-browser#5781

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.

@brave-builds brave-builds self-assigned this Aug 27, 2019
@brave-builds brave-builds added this to the 0.69.x - Beta milestone Aug 27, 2019
@simonhong simonhong self-assigned this Aug 27, 2019
@kjozwiak
Copy link
Member

kjozwiak commented Aug 28, 2019

@simonhong mind checking https://staging.ci.brave.com/job/brave-browser-build-pr/job/pr3251_show_bookmark_bar_on_ntp_by_default_0.69.x/1/execution/node/645/log/? Looks like it failed during npm run test -- brave_browser_tests Release --output brave_browser_tests.xml:

22:24:44  [ RUN      ] NavigatorGetBatteryDisabledTest.IsDisabled
22:24:44  [19/223] NavigatorGetBatteryDisabledTest.IsDisabled (TIMED OUT)
22:24:44  [ RUN      ] BraveContentSettingsRegistryBrowserTest.WithWildcardContentSetting
22:24:44  [20/223] BraveContentSettingsRegistryBrowserTest.WithWildcardContentSetting (TIMED OUT)
22:24:44  [ RUN      ] BraveContentSettingsRegistryBrowserTest.WithoutWildcardContentSetting
22:24:44  [21/223] BraveContentSettingsRegistryBrowserTest.WithoutWildcardContentSetting (TIMED OUT)
22:24:44  [ RUN      ] SecurityIndicatorTest.CheckIndicatorText
22:24:44  [22/223] SecurityIndicatorTest.CheckIndicatorText (TIMED OUT)
22:24:44  Too many badly broken tests (22), exiting now.
22:24:44  Sending SIGTERM to 6 child processes... done.
22:24:44  Giving processes a chance to terminate cleanly... done.
22:24:44  Sending SIGKILL to 6 child processes... done.

Looks like #3274 passed without any issues. Going to see if a restart clears up the issue 👍

@simonhong
Copy link
Member

@kjozwiak Restart fixes :)

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 0.69.x approved after deliberating with @brave/uplift-approvers. Looks like both CI/Jenkins and CI/Travis have passed without any errors. Please make sure that all the correct labels are added and the appropriate issue is moved into the correct milestone.

@simonhong simonhong merged commit 5a910c5 into 0.69.x Aug 30, 2019
@simonhong simonhong deleted the pr3251_show_bookmark_bar_on_ntp_by_default_0.69.x branch August 30, 2019 00:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants