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

[TASK] Document page TSconfig setting mod.web_list.disableSearchBox #1474 #1475

Merged
merged 2 commits into from
Dec 17, 2024

Conversation

minapok
Copy link
Contributor

@minapok minapok commented Dec 17, 2024

Closes #1474
Releases: main, 13.4, 12.4

@garvinhicking garvinhicking merged commit ae87bd1 into TYPO3-Documentation:main Dec 17, 2024
2 checks passed
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 7ebf5b98... [TASK] Document page TSconfig setting `mod.web_list.disableSearchBox`
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging Documentation/PageTsconfig/Mod/WebList.rst
CONFLICT (content): Merge conflict in Documentation/PageTsconfig/Mod/WebList.rst

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-1475-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7ebf5b987d9d63d07599862d299daee506567da4,f92f339c86682c3890d12665f234fcf9dac9356f
# Push it to GitHub
git push --set-upstream origin backport-1475-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

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

@garvinhicking
Copy link
Contributor

Thank you @minapok for your first contribution here, much appreciated. (Obvisouly this mod.web_list.disableSearchBox got accidentally removed when mod.web_layout.disableSearchBox was removed)

garvinhicking pushed a commit that referenced this pull request Dec 17, 2024
…1474 (#1475)

* [TASK] Document page TSconfig setting `mod.web_list.disableSearchBox`

* [BUGFIX] Restore index of `disableSingleTableView`
@garvinhicking garvinhicking added backport-done Changes have been backported to other branches already and removed backport failed labels Dec 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 backport 13.4 backport-done Changes have been backported to other branches already
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The option 'mod.web_list.disableSearchBox' is not documented
2 participants