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

Fixes ad conversion detection fails if the target URL of the last shown ad matches the conversion URL pattern - 1.5.x #4719

Merged
merged 1 commit into from
Mar 12, 2020

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Feb 22, 2020

Uplift of #4717
Resolves brave/brave-browser#8362

  • 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.

@tmancey tmancey added this to the 1.5.x - Beta milestone Feb 22, 2020
@tmancey tmancey requested a review from a team February 22, 2020 00:48
@tmancey tmancey self-assigned this Feb 22, 2020
@tmancey tmancey force-pushed the issues/8362-1.5.x branch 3 times, most recently from b031ec3 to 9559357 Compare February 26, 2020 17:31
@kjozwiak
Copy link
Member

Restarted several times but looks like init is failing on all the platforms with the following error:

00:01:40  1 failed patches:
00:01:40  chrome/VERSION
00:01:40    - Patch applied because: No corresponding .patchinfo file was found.
00:01:40    - Error - Program git exited with error code 1.
00:01:40  error: patch failed: chrome/VERSION:1
00:01:40  error: chrome/VERSION: patch does not apply

@tmancey
Copy link
Collaborator Author

tmancey commented Feb 27, 2020

Restarted several times but looks like init is failing on all the platforms with the following error:

00:01:40  1 failed patches:
00:01:40  chrome/VERSION
00:01:40    - Patch applied because: No corresponding .patchinfo file was found.
00:01:40    - Error - Program git exited with error code 1.
00:01:40  error: patch failed: chrome/VERSION:1
00:01:40  error: chrome/VERSION: patch does not apply

Rebased and built successfully, thanks

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.5.x approved after deliberating with @brave/uplift-approvers. Both Jenkins and Travis passed without any failures. QA has also run through the issue via brave/brave-browser#8362 (comment). Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit 98af710 into 1.5.x Mar 12, 2020
@kjozwiak kjozwiak deleted the issues/8362-1.5.x branch March 12, 2020 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants