Skip to content

Commit

Permalink
Merge branch 'release/6.0.19'
Browse files Browse the repository at this point in the history
  • Loading branch information
andreaskienast committed Jul 8, 2024
2 parents 833e4c4 + 1d6e0d3 commit e6bfe9f
Show file tree
Hide file tree
Showing 4 changed files with 193 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- name: Dependabot metadata
id: dependabot-metadata
uses: dependabot/fetch-metadata@v1.6.0
uses: dependabot/fetch-metadata@v2.2.0

- name: Enable auto-merge for Dependabot PRs
run: gh pr merge --auto --squash "$PR_URL"
Expand Down
24 changes: 22 additions & 2 deletions config/nginx/redirects.conf
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,21 @@ location ~ ^/typo3cms/ViewHelperReference(.*)$ {
return 303 /other/typo3/view-helper-reference/main/en-us$1;
}

# Redirect URLs of old ViewHelper reference to new ViewHelper reference for 12.4 and main
# (11 and below are static)
location ~ ^/other/typo3/view-helper-reference/(main|12.4)/en-us/typo3/backend/latest/(.*) {
return 303 /other/typo3/view-helper-reference/$1/en-us/Backend/$2;
}
location ~ ^/other/typo3/view-helper-reference/(main|12.4)/en-us/typo3/core/latest/(.*) {
return 303 /other/typo3/view-helper-reference/$1/en-us/Core/$2;
}
location ~ ^/other/typo3/view-helper-reference/(main|12.4)/en-us/(?:typo3fluid/fluid|typo3/fluid)/latest/(.*) {
return 303 /other/typo3/view-helper-reference/$1/en-us/Global/$2;
}

# Move exceptions to standard location
location ~ ^/typo3cms/exceptions/main/en-us/(.*)$ {
return 303 /m/typo3/reference-exceptions/main/en-us/$1;
return 301 /m/typo3/reference-exceptions/main/en-us/$1;
}

# Rewrite Surf documentation links to new position
Expand Down Expand Up @@ -901,9 +913,17 @@ location ~ ^/typo3cms/drafts/github/TYPO3Incubator/InfrastructureGuide/Releases(
# typo3cms/extensions/news/Index.html (no version given!) to typo3cms/extensions/news/stable/Index.html
# stable exists in all extensions and links to the latest version
# If there are existing versions in the path (1.2.3 or 1.2 or latest or stable or master), these are not redirected
location ~ ^/typo3cms/extensions/([a-z,0-9,_]+)/((?!([0-9]+\.[0-9]+|[0-9]+\.[0-9]+\.[0-9]+|latest|stable|master)).*) {
location ~ ^/typo3cms/extensions/([^/]+)$ {
return 303 /typo3cms/extensions/$1/stable/;
}
location ~ ^/typo3cms/extensions/([^/]+)/((?!([0-9]+\.[0-9]+|[0-9]+\.[0-9]+\.[0-9]+|latest|stable|master)).*) {
return 303 /typo3cms/extensions/$1/stable/$2;
}
# Last redirect in chain - redirect all extension URLs that didn't match before to TER.
# This is a prefix-based redirect, this is executed after all regex-based redirects in dynamic_redirects.conf.
location /typo3cms/extensions/ {
rewrite ^/typo3cms/extensions/([^/]+)(/stable/?)? https://extensions.typo3.org/extension/$1 redirect;
}

#################################
# Third-party extension redirects
Expand Down
Loading

0 comments on commit e6bfe9f

Please sign in to comment.