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

Add antigravity support to gravity #5330

Merged
merged 7 commits into from
Sep 29, 2023
Merged

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Jul 6, 2023

What does this implement/fix?

Add support for subscribed allowlists. To differentiate between lists that block and those that allow, we add a new column type which is an enum with values 0 (block) and 1 (allow)

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.

@DL6ER DL6ER requested a review from a team July 6, 2023 17:10
@DL6ER DL6ER added the Feature Request: Discourse Implements a Feature Request from Discourse label Jul 6, 2023
@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/use-to-whitelist-in-abp-style-adlists/63603/63

gravity.sh Outdated Show resolved Hide resolved
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@PromoFaux
Copy link
Member

(rebased to fix tests)

@PromoFaux
Copy link
Member

PromoFaux commented Sep 10, 2023

Seemingly the upgrade does not add in the vw_antigravity, I had to recreate my gravity db with pihole -g -r recreate in order for the new views to populate

(edit: And like an idiot I didn't backup my v16 db)

@github-actions
Copy link

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

@github-actions github-actions bot added the PR: Merge Conflict Issue blocking check and merge of code label Sep 10, 2023
Signed-off-by: DL6ER <dl6er@dl6er.de>
@github-actions github-actions bot removed the PR: Merge Conflict Issue blocking check and merge of code label Sep 11, 2023
@github-actions
Copy link

Conflicts have been resolved.

…to vw_adlist

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team September 12, 2023 18:43
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

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

All the changes in 15_to_16.sql should be moved to 16_to_17.sql as they are unrelated to abp_entries.

@PromoFaux PromoFaux merged commit 69a264a into development-v6 Sep 29, 2023
15 checks passed
@PromoFaux PromoFaux deleted the new/antigravity branch September 29, 2023 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Request: Discourse Implements a Feature Request from Discourse Pi-hole v6.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants