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

Allow adlist duplicates #1886

Merged
merged 2 commits into from Mar 2, 2024
Merged

Allow adlist duplicates #1886

merged 2 commits into from Mar 2, 2024

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Feb 13, 2024

What does this implement/fix?

Allow narrowing down the (ad)list type using the (optional) query parameter ?type={allow,block}.

Accompanying change related to pi-hole/pi-hole#5572. See reasoning therein.

This is a feature request submitted on Discourse (see link below).

Note

This pull requests requires all three Pi-hole components to be checked out

pihole checkout core tweak/allow_adlist_dups
pihole checkout web tweak/allow_adlist_dups
pihole checkout ftl tweak/allow_adlist_dups

for testing


Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

…ameter ?type={allow,block}

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team February 13, 2024 09:07
@DL6ER DL6ER marked this pull request as ready for review February 13, 2024 09:07
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/lists-cant-add-identical-url-twice-blocklist-allowlist/68261/12

@DL6ER DL6ER changed the title Allow narrowing down the (ad)list type using the (optional) query parameter ?type={allow,block} Allow adlist duplicates Feb 13, 2024
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Copy link

Conflicts have been resolved.

@DL6ER
Copy link
Member Author

DL6ER commented Feb 15, 2024

Has been confirmed working on the related Discourse thread

Copy link
Member

@PromoFaux PromoFaux left a comment

Choose a reason for hiding this comment

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

Has been confirmed working on the related Discourse thread

👍

@DL6ER
Copy link
Member Author

DL6ER commented Feb 17, 2024

Merge only once pi-hole/pi-hole#5572 and pi-hole/web#2958 are approved as well as these branches depend on each other

@DL6ER DL6ER merged commit d4792bb into development-v6 Mar 2, 2024
17 checks passed
@DL6ER DL6ER deleted the tweak/allow_adlist_dups branch March 2, 2024 17:28
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.

None yet

3 participants