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 regex_id field of the query table #928

Merged
merged 1 commit into from
Oct 21, 2023
Merged

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Sep 8, 2023

What does this implement/fix?

Documentation change accompanying pi-hole/FTL#1607

Related issue or feature (if applicable): This is the docs change

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 September 8, 2023 21:02
@DL6ER DL6ER mentioned this pull request Sep 8, 2023
5 tasks
@netlify
Copy link

netlify bot commented Sep 8, 2023

Deploy Preview for pihole-docs ready!

Name Link
🔨 Latest commit 65f945e
🔍 Latest deploy log https://app.netlify.com/sites/pihole-docs/deploys/64fb8cfcab12380008e36a0f
😎 Deploy Preview https://deploy-preview-928--pihole-docs.netlify.app/database/ftl
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

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

github-actions bot commented Sep 8, 2023

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

@DL6ER DL6ER changed the base branch from master to release/v6.0 September 8, 2023 21:07
@DL6ER
Copy link
Member Author

DL6ER commented Sep 8, 2023

Rebased to target release/v6.0

@github-actions
Copy link
Contributor

github-actions bot commented Sep 9, 2023

Conflicts have been resolved.

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.

There are multiple sections about the additional_info column on this page. Maybe we should add a note that some of the data is now in regex_id.

@DL6ER
Copy link
Member Author

DL6ER commented Sep 15, 2023

It is in both, there is no change to the existing additional_info column.

@DL6ER DL6ER merged commit a70d37f into release/v6.0 Oct 21, 2023
9 checks passed
@DL6ER DL6ER deleted the new/ftl_regex_id branch October 21, 2023 10:47
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