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

Default shield advanced view to TRUE for existing users. (uplift to 0.69.x) #3186

Merged
merged 2 commits into from
Sep 4, 2019

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Aug 15, 2019

Fixes brave/brave-browser#5582

Uplift of #3154

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.

@bsclifton bsclifton added this to the 0.69.x - Beta milestone Aug 15, 2019
@bsclifton bsclifton requested a review from a team August 15, 2019 06:55
@bsclifton bsclifton self-assigned this Aug 15, 2019
@bsclifton bsclifton changed the title Merge pull request #3154 from brave/bsc-shields-advanced-default-change Default shield advanced view to TRUE for existing users. (uplift to 0.69.x) Aug 15, 2019
@bsclifton
Copy link
Member Author

NOTE: not ready to be merged; there is a failing browser test on WINDOWS only... investigating...

@bsclifton
Copy link
Member Author

Ready for consideration 😄 Above issue fixed

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.

@bsclifton mind taking a look at some of these failures?

13:30:54  [33367/40121] CXX obj/brave/browser/ui/ui/brave_web_ui_controller_factory.o
13:30:54  [33368/40121] CXX obj/brave/browser/browser_process/brave_profile_prefs.o
13:30:54  FAILED: obj/brave/browser/browser_process/brave_profile_prefs.o 
13:31:03  [33405/40121] CXX obj/brave/browser/browser_process/brave_content_browser_client.o
13:31:03  ninja: build stopped: subcommand failed.
12:55:42  [21825/37908] CXX obj/chrome/browser/ui/ui/sad_tab.o
12:55:42  [21826/37908] CXX obj/brave/browser/browser_process/brave_profile_prefs.o
12:55:42  FAILED: obj/brave/browser/browser_process/brave_profile_prefs.o
12:55:52  [21863/37908] CXX obj/brave/browser/browser_process/brave_content_browser_client.o
12:55:52  ninja: build stopped: subcommand failed.
13:54:31  [27495/37908] CXX obj/brave/browser/browser_process/brave_profile_prefs.o
13:54:31  FAILED: obj/brave/browser/browser_process/brave_profile_prefs.o 
13:54:32  [27508/37908] CXX obj/brave/browser/ui/ui/brave_new_tab_button.o
13:54:32  ninja: build stopped: subcommand failed.

@bsclifton
Copy link
Member Author

@kjozwiak I believe we need to accept #3187 first (and then I can rebase this). Will mark as blocked

@bsclifton
Copy link
Member Author

Rebased - ready for approval / merge (after CI runs)

@kjozwiak
Copy link
Member

kjozwiak commented Sep 3, 2019

@bsclifton looks like the following checks have failed under CI/Jenkins:

npm run test -- brave_browser_tests Release --output brave_browser_tests.xml under linux via the following:

npm run test -- brave_browser_tests Release --output brave_browser_tests.xml via under MacOS via the following:

@bsclifton
Copy link
Member Author

Problem found + fixed - when uplifting, I missed the removal of the check in browser/brave_profile_prefs_browsertest.cc. Added this back in (so it matches other branches) and CI is re-running now

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. Both CI/Jenkins and CI/Travis passed without any issues or failures. Please make sure that the correct labels are added and the associated issue is moved into the correct milestone.

@bsclifton bsclifton merged commit 868f846 into 0.69.x Sep 4, 2019
@bsclifton bsclifton deleted the pr3154-0.69.x branch September 4, 2019 04:48
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.

2 participants