Merge branch '7' into 8 #855
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ENH Add ability to ignore domains entirely
…dy-check-7 fix: check for request prior to access
…7/update-js-deps DEP Update JS dependencies
…pdate-js-1712004090 DEP Update JS dependencies
…s-links ENH: Localisation manager links available for CMS edit link capable models.
…7/module-standardiser-1715811882 MNT Run module-standardiser
…7/module-standardiser-1715911620 MNT Run module-standardiser
emteknetnz
approved these changes
May 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The gha-merge-up action won't merge up because of changes in the
yarn.lockfile when merging up from the7branch to the8branch: https://github.com/tractorcow-farm/silverstripe-fluent/actions/runs/9217277458/job/25358976247There is also a merge conflict - the
FluentSiteTreeExtension::updateLocalisationTabColumns()method is removed in7but in8the visibility was updated, which caused a conflict. Resolution is to remove that method (see #838)I lack the required level of access to push directly to the 8 branch, so the only way I can resolve it is with a PR.
NOTE: DO NO SQUASH
Issue