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

Fix hmmm #808

Merged
merged 1 commit into from
Nov 6, 2018
Merged

Fix hmmm #808

merged 1 commit into from
Nov 6, 2018

Conversation

srirambv
Copy link
Contributor

@srirambv srirambv commented Nov 5, 2018 •
edited
Loading

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) on
    • Windows
    • macOS
    • Linux
  • 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:

Fixes: brave/brave-browser#1858

  • Enable rewards and fail the CAPTCHA, error message Hmmm, not quite... should be shown

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

@srirambv srirambv self-assigned this Nov 5, 2018
@srirambv srirambv mentioned this pull request Nov 5, 2018
Closed
bradleyrichter
bradleyrichter approved these changes Nov 6, 2018
View reviewed changes
Copy link
Contributor

@bradleyrichter bradleyrichter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perfect. Thanks for the help...

@NejcZdovc NejcZdovc merged commit 8d440ef into brave:master Nov 6, 2018
@NejcZdovc
Copy link
Contributor

NejcZdovc commented Nov 6, 2018 •
edited
Loading

master (0.59.x) 8d440ef
0.58.x 1e7e900
0.57.x edb7f58
0.56.x 34bdc93

@srirambv
Copy link
Contributor Author

srirambv commented Nov 6, 2018

@kjozwiak @rebron @bbondy request to uplift as the original PR is already in 0.56.x

@kjozwiak
Copy link
Member

kjozwiak commented Nov 6, 2018

Approved for 0.56.x uplift 👍

@srirambv
Copy link
Contributor Author

srirambv commented Nov 6, 2018

@NejcZdovc could you add it to 0.56.x and update the merged labels

NejcZdovc added a commit that referenced this pull request Nov 6, 2018
@NejcZdovc
Merge pull request #808 from srirambv/text
1e7e900 
Fix hmmm
NejcZdovc added a commit that referenced this pull request Nov 6, 2018
@NejcZdovc
Merge pull request #808 from srirambv/text
edb7f58 
Fix hmmm
NejcZdovc added a commit that referenced this pull request Nov 6, 2018
@NejcZdovc
Merge pull request #808 from srirambv/text
34bdc93 
Fix hmmm
@NejcZdovc
Copy link
Contributor

@srirambv merged to 56

@srirambv srirambv deleted the text branch November 6, 2018 19:22
@bbondy bbondy added this to the 0.56.x - Release milestone Jan 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bradleyrichter bradleyrichter bradleyrichter approved these changes

@NejcZdovc NejcZdovc Awaiting requested review from NejcZdovc

Assignees

@srirambv srirambv

Labels
feature/rewards
Projects
None yet
Milestone
0.56.x - Release
Development

Successfully merging this pull request may close these issues.

Replaced temp strings with final strings
6 participants
@srirambv @NejcZdovc @kjozwiak @bradleyrichter @bbondy @bsclifton