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 the Ad Rewards settings panel 0.63.x #2281

Merged
merged 1 commit into from
May 6, 2019
Merged

Fix the Ad Rewards settings panel 0.63.x #2281

merged 1 commit into from
May 6, 2019

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Apr 18, 2019

Uplift for #2269
Fixes brave/brave-browser#4008

@tmancey tmancey added this to the 0.63.x - Release milestone Apr 18, 2019
@tmancey tmancey requested a review from a team April 18, 2019 22:57
@tmancey tmancey self-assigned this Apr 18, 2019
@tmancey tmancey marked this pull request as ready for review April 18, 2019 22:58
@jsecretan
Copy link

Let's cancel this one please because I don't think it will make 0.63.

@tmancey tmancey closed this Apr 19, 2019
@tmancey
Copy link
Collaborator Author

tmancey commented Apr 19, 2019

Cancelled, thanks

@tmancey tmancey deleted the issues/4008-0.63.x branch April 19, 2019 12:27
@tmancey tmancey removed this from the 0.63.x - Release milestone Apr 19, 2019
@tmancey tmancey restored the issues/4008-0.63.x branch April 25, 2019 12:08
@tmancey tmancey reopened this Apr 25, 2019
@tmancey
Copy link
Collaborator Author

tmancey commented Apr 25, 2019

Discussed with Jimmy and re-opening ticket for discussion whether to uplift

@bsclifton bsclifton added this to the 0.63.x - Release Hotfix 1 milestone May 2, 2019
@tmancey tmancey force-pushed the issues/4008-0.63.x branch 2 times, most recently from 87d1c93 to 0c0b2c4 Compare May 4, 2019 16:00
bsclifton
bsclifton approved these changes May 6, 2019
View reviewed changes
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

Approved by @rebron and myself; PR builder encountered errors, but I ran tests locally and it worked fine

I believe the build would have passed if we cleared workspace and/or git cache 😄 Thanks for rebasing @tmancey

@bsclifton bsclifton merged commit abd9de5 into 0.63.x May 6, 2019
@bsclifton bsclifton deleted the issues/4008-0.63.x branch May 6, 2019 00:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bsclifton bsclifton bsclifton approved these changes

Assignees

@tmancey tmancey

Labels
feature/ads feature/rewards
Projects
None yet
Milestone
0.63.x - Release Hotfix 1
Development

Successfully merging this pull request may close these issues.
3 participants
@tmancey @jsecretan @bsclifton