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

Hide sync option from settings if it's disabled (uplift to 1.3.x) #4573

Merged
merged 1 commit into from
Feb 14, 2020

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented Feb 10, 2020

Uplift of #4572
fix brave/brave-browser#8159

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.

@simonhong simonhong added this to the 1.3.x - Release Hotfix 1 milestone Feb 10, 2020
@simonhong simonhong requested review from petemill and a team February 10, 2020 08:35
@simonhong simonhong self-assigned this Feb 10, 2020
@simonhong
Copy link
Member Author

settings option was changed from 1.4
So, #4572 could be used for uplift to 1.4 if needed.

@simonhong simonhong removed this from the 1.3.x - Release Hotfix 1 milestone Feb 12, 2020
@kjozwiak
Copy link
Member

Linux & maOSfailed ontest-browser` which was a known issue and was already fixed:

Linux failure on test-browser - https://ci.brave.com/job/brave-browser-build-pr/job/hide_sync_from_settings_1_3/1/execution/node/596/log/
macOS failure on test-browser - https://ci.brave.com/job/brave-browser-build-pr/job/hide_sync_from_settings_1_3/1/execution/node/672/log/

macOS also failed on test-install which is a known issue and not related to this specific PR.

@bsclifton bsclifton added this to the 1.3.x - Release Hotfix 2 milestone Feb 13, 2020
@bsclifton bsclifton changed the title [1.3] Hide sync option from settings if it's disabled Hide sync option from settings if it's disabled (uplift to 1.3.x) Feb 13, 2020
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.3.x approved after deliberating with @brave/uplift-approvers. Both CI/Jenkins and CI/Travis passed without any failures. QA has also ran through the PR on Nightly as per #4572 (comment). Please make sure that the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit d997e26 into 1.3.x Feb 14, 2020
@kjozwiak kjozwiak deleted the hide_sync_from_settings_1_3 branch February 14, 2020 16:54
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.

3 participants