Merge branch '6' into 7 #856
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
…5/deprecations API Standardise deprecations
skip empty 'where' clauses
Update FluentExtension.php
Also copy translations on duplicate
Implement onAfterDuplicate
feat: add absolute base url for locales
…omMaster copy Bugfix for GridFieldAddExistingSearchButton from master to version 6.0
fixes tractorcow-farm#823 - The magic constant __TRAIT__ was inserting namespaces into localization keys, containing slashes that could not be parsed by the TextCollector task. These have been replaced w/ the Trait name as a string
…lector-warnings FIX allows i18nTextCollector to concatenate keys
fix: don't invoke db for ready check outside of dev urls
# Conflicts: # src/Extension/FluentExtension.php
…dy-check-6 fix: check for request prior to access
New task is based on the original task built for SiteTree but is now extendable for any DataObject enabled with Fluent. To prevent duplicate code, the original task now extends the new task.
…ial-task-for-dataobjects New dev/task to initialise DataObjects for existing datasets
…6/merge-conflict Merge branch '6.0' into 6
|
Retargetted to the If this gets merged, note that the merge-ups action will continue failing until the October minor release, since it will keep trying to merge |
tractorcow
approved these changes
May 29, 2024
|
Approved, any time. |
|
@GuySartorelli merge conflict |
GuySartorelli
force-pushed
the
pulls/7.1/merge-conflict
branch
from
ec7a903 to
a702f41
Compare
|
Merge conflict in |
emteknetnz
approved these changes
May 30, 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 a merge conflict when merging up from the
6branch to the7.1branch: https://github.com/tractorcow-farm/silverstripe-fluent/actions/runs/9218330417/job/25361687967I lack the required level of access to push directly to the 7 branch, so the only way I can resolve it is with a PR.
The conflict on
FluentExtensionis just the same change being made in both branches.For the conflict in
InitialPageLocalisationTask, looking at the difference between https://github.com/tractorcow-farm/silverstripe-fluent/commits/7.1/src/Task/InitialPageLocalisationTask.php and https://github.com/tractorcow-farm/silverstripe-fluent/commits/6/src/Task/InitialPageLocalisationTask.php it's clear the resolution is to keep the changes from6.I'd like @tractorcow to review this one, since there's a lot of functionality here being merged up between majors and I'm not familiar with these features enough to know if they're all okay for
7.x.NOTE: DO NO SQUASH
Issue