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 block page errors due to gravity DB and changes to queryAds #2831

Merged
merged 4 commits into from
Jul 20, 2019

Conversation

AzureMarker
Copy link
Contributor

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

What does this PR aim to accomplish?:
Fix blockpage errors due to gravity DB and recent queryAds changes.

How does this PR accomplish the above?:
Pull the adlists from the database and fix some blockpage-specific output in queryAds.

What documentation changes (if any) are needed to support this PR?:
None

@AzureMarker AzureMarker added the Bug: fixed Contains a bug resolution label Jul 4, 2019
@AzureMarker AzureMarker added this to the v5.0 milestone Jul 4, 2019
@AzureMarker AzureMarker requested a review from a team July 4, 2019 20:48
advanced/index.php Outdated Show resolved Hide resolved
advanced/index.php Outdated Show resolved Hide resolved
@AzureMarker AzureMarker requested review from DL6ER and a team July 20, 2019 00:39
@AzureMarker AzureMarker merged commit ab3f6df into development Jul 20, 2019
@AzureMarker AzureMarker deleted the fix/block-page-adlists branch July 20, 2019 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug: fixed Contains a bug resolution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants