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] Rename and move the page about AjaxRequest #3475

Merged

Conversation

brotkrueml
Copy link
Contributor

Previously, the page was called "Ajax, client-side" but was about TYPO3's AjaxRequest API. The page is renamed to "Ajax request" to make more clear what is the content of the page. Additionally, it is moved into the Backend/JavaScript folder wher other JavaScript APIs reside.

Related: #2331
Releases: main, 12.4

Previously, the page was called "Ajax, client-side" but was about TYPO3's AjaxRequest API. The page is renamed to "Ajax request" to make more clear what is the content of the page. Additionally, it is moved into the Backend/JavaScript folder wher other JavaScript APIs reside.

Related: TYPO3-Documentation#2331
Releases: main, 12.4
@brotkrueml brotkrueml requested a review from linawolf September 26, 2023 16:35
@brotkrueml brotkrueml self-assigned this Sep 26, 2023
Copy link
Member

@linawolf linawolf left a comment

Choose a reason for hiding this comment

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

Will you make the redirects right after merging?

@brotkrueml
Copy link
Contributor Author

brotkrueml commented Sep 29, 2023

Will you make the redirects right after merging?

@linawolf Where can I do that?

@linawolf
Copy link
Member

@brotkrueml you should have the nessecary rights at intercept? https://intercept.typo3.com/redirect/

@brotkrueml brotkrueml merged commit 017c03b into TYPO3-Documentation:main Oct 4, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 4, 2023

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 5e57240e... [TASK] Rename and move the page about AjaxRequest
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".

stdout
Auto-merging Documentation/ApiOverview/Backend/JavaScript/Index.rst
CONFLICT (content): Merge conflict in Documentation/ApiOverview/Backend/JavaScript/Index.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-3475-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5e57240eb26f7d19a6f9ebe742c92af8775e55c8
# Push it to GitHub
git push --set-upstream origin backport-3475-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-3475-to-12.4.

@brotkrueml brotkrueml deleted the move-ajax-request-page branch October 4, 2023 16:54
brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-CoreApi that referenced this pull request Oct 4, 2023
…PO3-Documentation#3475)

Previously, the page was called "Ajax, client-side" but was about TYPO3's AjaxRequest API. The page is renamed to "Ajax request" to make more clear what is the content of the page. Additionally, it is moved into the Backend/JavaScript folder wher other JavaScript APIs reside.

Related: TYPO3-Documentation#2331
Releases: main, 12.4
brotkrueml added a commit that referenced this pull request Oct 4, 2023
) (#3512)

Previously, the page was called "Ajax, client-side" but was about TYPO3's AjaxRequest API. The page is renamed to "Ajax request" to make more clear what is the content of the page. Additionally, it is moved into the Backend/JavaScript folder wher other JavaScript APIs reside.

Related: #2331
Releases: main, 12.4
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.

2 participants