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

Updates text from ads claim process (0.72) #3783

Merged
merged 2 commits into from
Oct 31, 2019
Merged

Updates text from ads claim process (0.72) #3783

merged 2 commits into from
Oct 31, 2019

Conversation

ryanml
Copy link
Contributor

@ryanml ryanml commented Oct 23, 2019

@ryanml ryanml added this to the 0.72.x - Dev milestone Oct 23, 2019
@ryanml ryanml requested a review from a team October 23, 2019 07:53
@ryanml ryanml requested a review from NejcZdovc as a code owner October 23, 2019 07:53
@ryanml ryanml self-assigned this Oct 23, 2019
@NejcZdovc NejcZdovc removed their request for review October 23, 2019 07:59
@kjozwiak
Copy link
Member

Restarting on Win x64 due to the following failure as per https://staging.ci.brave.com/job/brave-browser-build-pr/job/uplift-6359-72/3/execution/node/160/log/:

00:56:48  WindowsError: [Error 123] The filename, directory name, or volume label syntax is incorrect: 'C:\\Users\x07dministrator'

Looks like both iOS and macOS failed lint due to ImportError: No module named httplib2 which is a known issue and being addressed by both @bsclifton and @jumde:

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Oct 28, 2019
@kjozwiak
Copy link
Member

@bsclifton looks like the rerun/rebase still failed on Win x64 due to WindowsError: [Error 123] The filename, directory name, or volume label syntax is incorrect: 'C:\\Users\x07dministrator' as per https://staging.ci.brave.com/job/brave-browser-build-pr/job/uplift-6359-72/5/execution/node/327/log/.

@kjozwiak kjozwiak mentioned this pull request Oct 30, 2019
Merged
ryanml added 2 commits October 30, 2019 14:57
@ryanml @bsclifton
Merge pull request #3729 from brave/fix-6359
2cecb8d 
Updating Ads earnings claim text
@ryanml @bsclifton
Merge pull request #3775 from brave/fix-6359-2
0af8dc7 
Updates panel text from ads grant claim
kjozwiak
kjozwiak approved these changes Oct 31, 2019
View reviewed changes
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.72.x approved after deliberating with @brave/uplift-approvers. Both CI/Jenkins and CI/Travis passed after several retries.

Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@ryanml ryanml merged commit 8ba64de into 0.72.x Oct 31, 2019
@ryanml ryanml deleted the uplift-6359-72 branch October 31, 2019 04:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@ryanml ryanml

Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64 feature/rewards
Projects
None yet
Milestone
1.1.x - Release
Development

Successfully merging this pull request may close these issues.
2 participants
@ryanml @kjozwiak