Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Closes #4098, #4110: Exposing new categories of content blocking. #4117

Merged
merged 2 commits into from
Aug 14, 2019
Merged

Closes #4098, #4110: Exposing new categories of content blocking. #4117

merged 2 commits into from
Aug 14, 2019

Conversation

Amejia481
Copy link
Contributor

Pull Request checklist

  • Quality: This PR builds and passes detekt/ktlint checks (A pre-push hook is recommended)
  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Changelog: This PR includes a changelog entry or does not need one
  • Accessibility: The code in this PR follows accessibility best practices or does not include any user facing features

After merge

  • Milestone: Make sure issues closed by this pull request are added to the milestone of the version currently in development.
  • Breaking Changes: If this is a breaking change, please push a draft PR on Reference Browser to address the breaking issues.

@Amejia481 Amejia481 added the 🕵️‍♀️ needs review PRs that need to be reviewed label Aug 14, 2019
@Amejia481 Amejia481 requested a review from pocmo August 14, 2019 07:39
@Amejia481 Amejia481 requested a review from a team as a code owner August 14, 2019 07:39
@Amejia481 Amejia481 assigned ekager and unassigned ekager Aug 14, 2019
@Amejia481 Amejia481 requested a review from ekager August 14, 2019 07:48
@Amejia481 Amejia481 force-pushed the update_new_blocking_categories branch 2 times, most recently from d4900af to 2eada8b Compare August 14, 2019 07:57
pocmo
pocmo approved these changes Aug 14, 2019
View reviewed changes
Copy link
Contributor

@pocmo pocmo left a comment

Choose a reason for hiding this comment

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

LGTM! 👍

🚢

...e-gecko-beta/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt Outdated Show resolved Hide resolved
@pocmo pocmo removed the 🕵️‍♀️ needs review PRs that need to be reviewed label Aug 14, 2019
@Amejia481 Amejia481 force-pushed the update_new_blocking_categories branch from 2eada8b to 98bf974 Compare August 14, 2019 16:28
@Amejia481 Amejia481 force-pushed the update_new_blocking_categories branch from 98bf974 to f7c7da1 Compare August 14, 2019 16:29
pocmo
pocmo approved these changes Aug 14, 2019
View reviewed changes
Copy link
Contributor

@pocmo pocmo left a comment

Choose a reason for hiding this comment

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

✨

bors r+

@bors
Copy link

bors bot commented Aug 14, 2019

Merge conflict (retrying...)

@bors
Copy link

bors bot commented Aug 14, 2019

Canceled

@Amejia481
Copy link
Contributor Author

bors retry

bors bot pushed a commit that referenced this pull request Aug 14, 2019
@MickeyMoz @Amejia481
Merge #4117
6a60a8a 
4117: Closes #4098, #4110: Exposing new categories of content blocking. r=pocmo a=Amejia481



Co-authored-by: Arturo Mejia <[email protected]>
@bors
Copy link

bors bot commented Aug 14, 2019

Build failed

@Amejia481
Copy link
Contributor Author

bors retry

bors bot pushed a commit that referenced this pull request Aug 14, 2019
@MickeyMoz @Amejia481
Merge #4117
1701f9e 
4117: Closes #4098, #4110: Exposing new categories of content blocking. r=pocmo a=Amejia481



Co-authored-by: Arturo Mejia <[email protected]>
@bors
Copy link

bors bot commented Aug 14, 2019

Build succeeded

@bors bors bot merged commit 3e9b264 into mozilla-mobile:master Aug 14, 2019
@Amejia481 Amejia481 mentioned this pull request Aug 14, 2019
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@pocmo pocmo pocmo approved these changes

@ekager ekager Awaiting requested review from ekager

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Amejia481 @pocmo @ekager