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

Search against filtered post content by default #160

Merged
merged 2 commits into from
Mar 16, 2021

Conversation

roborourke
Copy link
Contributor

Fixes #152

@roborourke roborourke requested a review from jazzsequence March 15, 2021 19:04
Copy link

@hm-linter hm-linter bot left a comment

Choose a reason for hiding this comment

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

Linting failed (25 errors).

25 notices occurred in your codebase, but none on files/lines included in this PR.

@roborourke roborourke merged commit a1f620a into master Mar 16, 2021
@roborourke roborourke deleted the fix-filtered-content branch March 16, 2021 10:40
@hm-backport
Copy link

hm-backport bot commented Mar 16, 2021

The backport to v6-branch failed:

Commits ["82c4556bb5ff653d116af05f5e20210eaf6a94dc","c3832debd9eaae9047b9b4599205685ae2ebc7c0"] could not be cherry-picked on top of v6-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v6-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 82c4556bb5ff653d116af05f5e20210eaf6a94dc c3832debd9eaae9047b9b4599205685ae2ebc7c0
# Create a new branch with these backported commits.
git checkout -b backport-160-to-v6-branch
# Push it to GitHub.
git push --set-upstream origin backport-160-to-v6-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v6-branch and the compare/head branch is backport-160-to-v6-branch.

@hm-backport
Copy link

hm-backport bot commented Mar 16, 2021

The backport to v5-branch failed:

Commits ["82c4556bb5ff653d116af05f5e20210eaf6a94dc","c3832debd9eaae9047b9b4599205685ae2ebc7c0"] could not be cherry-picked on top of v5-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v5-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 82c4556bb5ff653d116af05f5e20210eaf6a94dc c3832debd9eaae9047b9b4599205685ae2ebc7c0
# Create a new branch with these backported commits.
git checkout -b backport-160-to-v5-branch
# Push it to GitHub.
git push --set-upstream origin backport-160-to-v5-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v5-branch and the compare/head branch is backport-160-to-v5-branch.

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.

Content in reusable blocks is not searched
2 participants