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

Fixed string for sync on device with wrong time #2191

Merged
merged 1 commit into from Apr 18, 2019

Conversation

@AlexeyBarabash
Copy link
Contributor

AlexeyBarabash commented Apr 10, 2019

This is fix according the comment #2155 (comment)
For issue brave/brave-browser#3962 .

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 && npm run test-security) on
    • Windows
    • macOS
    • Linux
  • Verified that all lint errors/warnings are resolved (npm run lint)
  • 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:

  1. Adjust computer time 20 minutes forward.
  2. Create a sync chain
  3. Actual result:
    See error of You might be having wrong system time or timezone setup on your device. Please setup the correct time and timezone
    Expected result:
    See error of Your computer's clock may be set to the wrong time or time zone. Check your clock settings.

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
@AlexeyBarabash
Copy link
Contributor Author

AlexeyBarabash commented Apr 10, 2019

Screenshot from 2019-04-10 20-26-24

@AlexeyBarabash AlexeyBarabash requested a review from brave/uplift-approvers Apr 11, 2019
@AlexeyBarabash AlexeyBarabash force-pushed the sync_fix_time_string branch 5 times, most recently from 479c6cb to 4f54900 Apr 11, 2019
@AlexeyBarabash AlexeyBarabash force-pushed the sync_fix_time_string branch 4 times, most recently from b861a36 to 12943bf Apr 15, 2019
@AlexeyBarabash AlexeyBarabash force-pushed the sync_fix_time_string branch from 12943bf to 08b22d4 Apr 17, 2019
@AlexeyBarabash
Copy link
Contributor Author

AlexeyBarabash commented Apr 17, 2019

@brave/uplift-approvers , @bradleyrichter , @tomlowenthal CI finally succeeded, so could please you review it?

@tomlowenthal
Copy link
Member

tomlowenthal commented Apr 17, 2019

The only thing I'd be reviewing is a text match. So that lg2m.

@tomlowenthal tomlowenthal removed their request for review Apr 17, 2019
@bbondy
bbondy approved these changes Apr 18, 2019
@bbondy
Copy link
Member

bbondy commented Apr 18, 2019

@brave/uplift-approvers is only for PR's against Dev and Beta channels which are currently at 0.64.x and 0.63.x. Does this need to be uplifted to those too?

Please merge.

@AlexeyBarabash
Copy link
Contributor Author

AlexeyBarabash commented Apr 18, 2019

Yes, once I will see it in nightly, I will update #2161 and #2155 with proper strings and DEPS for brave-sync.

Will not use brave/uplift-approvers for PRs agains master anymore.

@AlexeyBarabash AlexeyBarabash merged commit 792baaf into master Apr 18, 2019
2 checks passed
2 checks passed
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@AlexeyBarabash
Copy link
Contributor Author

AlexeyBarabash commented Apr 19, 2019

This is already in Nightly:
image

@mihaiplesa mihaiplesa deleted the sync_fix_time_string branch May 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Sync - All platforms
  
Awaiting triage
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.