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

Fix POST \dns\blocking request documentation #1846

Merged
merged 1 commit into from
Jan 5, 2024

Conversation

akordowski
Copy link

What does this PR aim to accomplish?:

This PR fixes the documentation for the POST \dns\blocking request as described in the #1844 issue.


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 and I have tested my changes.
  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)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

@akordowski akordowski changed the base branch from master to development-v6 December 27, 2023 14:53
@akordowski akordowski force-pushed the fix/dns-blocking-docs branch 2 times, most recently from 9b7647e to f549b46 Compare December 27, 2023 15:10
@DL6ER
Copy link
Member

DL6ER commented Dec 27, 2023

Thank you for your PR which is good to be merged in principle but DCO is complaining, see here: https://github.com/pi-hole/FTL/pull/1846/checks?check_run_id=19983617941

Commit sha: 9b7647e, Author: Artur Kordowski, Committer: Artur Kordowski; Expected "Artur Kordowski [email protected]", but got "akordowski [email protected]".

@akordowski
Copy link
Author

@DL6ER Yes, I have seen and fixed it.

@DL6ER DL6ER enabled auto-merge January 4, 2024 22:08
@DL6ER
Copy link
Member

DL6ER commented Jan 4, 2024

@akordowski sorry for the huge delay. The FTL repository requires the commits to be signed for authenticity. Do you want to do this (and be prepared for future PRs also to other open source projects) or would you rather like me to cherry-pick them and sign the commits with my key setup?

It's not a lot of work, you can find info at https://docs.github.com/articles/about-gpg/ or (more strep-by-step like) in other tutorials on the web

@akordowski
Copy link
Author

@DL6ER I have currently little time. So if it can wait till next week I can do it, otherwise feel free to cherry-pick the commit and complete the PR. Thank you!

Signed-off-by: Artur Kordowski <[email protected]>
auto-merge was automatically disabled January 5, 2024 14:45

Head branch was pushed to by a user without write access

@akordowski akordowski force-pushed the fix/dns-blocking-docs branch from f549b46 to 98127f1 Compare January 5, 2024 14:45
@akordowski
Copy link
Author

@DL6ER I managed to set all up and sign the commit. Please approve the PR again. Thank you!

@DL6ER DL6ER merged commit 2fef4e2 into pi-hole:development-v6 Jan 5, 2024
11 checks passed
@akordowski akordowski deleted the fix/dns-blocking-docs branch January 5, 2024 15:35
@PromoFaux PromoFaux mentioned this pull request Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants