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] Allow site-specific Content-Security-Policy endpoints #5334

Merged
merged 2 commits into from
Feb 13, 2025
Merged

Conversation

linawolf
Copy link
Member

Resolves: TYPO3-Documentation/Changelog-To-Doc#1198
Releases: main, 13.4, 12.4

@linawolf linawolf added backport 12.4 Backport to TYPO3v12 backport 13.4 Backport to TYPO3v13 labels Feb 13, 2025
garvinhicking
garvinhicking previously approved these changes Feb 13, 2025
Copy link
Contributor

@garvinhicking garvinhicking left a comment

Choose a reason for hiding this comment

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

Thank you, that looks very complete to me!

froemken
froemken previously approved these changes Feb 13, 2025
@froemken froemken dismissed stale reviews from garvinhicking and themself via d10e216 February 13, 2025 20:19
@froemken froemken merged commit 22b8432 into main Feb 13, 2025
10 checks passed
@froemken froemken deleted the task/csp branch February 13, 2025 20:21
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0ed88d00d... [TASK] Allow site-specific Content-Security-Policy endpoints
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 set advice.mergeConflict false"

stdout
Auto-merging Documentation/ApiOverview/ContentSecurityPolicy/Index.rst
Auto-merging Documentation/Configuration/Typo3ConfVars/BE.rst
CONFLICT (content): Merge conflict in Documentation/Configuration/Typo3ConfVars/BE.rst
Auto-merging Documentation/Configuration/Typo3ConfVars/FE.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-5334-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0ed88d00db646d1ccac6873c150f082843bddd26,d10e216acff6f2128e9fd329eca08849e4094508
# Push it to GitHub
git push --set-upstream origin backport-5334-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-5334-to-12.4.

froemken added a commit that referenced this pull request Feb 13, 2025
* [TASK] Allow site-specific Content-Security-Policy endpoints

Resolves: TYPO3-Documentation/Changelog-To-Doc#1198
Releases: main, 13.4, 12.4

* Apply suggestions from code review

---------

Co-authored-by: Stefan Frömken <[email protected]>
froemken added a commit that referenced this pull request Feb 13, 2025
…5338)

* [TASK] Allow site-specific Content-Security-Policy endpoints

Resolves: TYPO3-Documentation/Changelog-To-Doc#1198
Releases: main, 13.4, 12.4

* Apply suggestions from code review

---------

Co-authored-by: Lina Wolf <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 Backport to TYPO3v12 backport 13.4 Backport to TYPO3v13 backport-done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUGFIX] Allow site-specific Content-Security-Policy endpoints
3 participants