merge 3.x to 4.x #15821
Merged
merge 3.x to 4.x #15821
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
* make sure to always set JSON_PIWIK to native JSON when possible * rebuilt piwik.js
…or bulk requests (#15784) * Force POST for bulk requests, fix alwaysUseSendBeacon not respected for bulk requests * rebuilt piwik.js
…tion (#15798) Feedback from a customer... Eg the daily `cleanupTrackingFailures()` action might be only executed after the weekly `notifyTrackingFailures` therefore we should try to clean up failures first and then check if any are left. Avoids the case where a user opens hours later the email they receive and then there are no tracking failures reported. This could still happen but it's a bit less likely.
…15786) * Faster segmented suggested values when browser archiving is disabled * make sure no segment is set * remove wrong var type * fix/add tests * add more segment values * detect if we should flatten or not * add docs
* purge all old archives regardless of done value, we only care about the newest usable one * Fix test and start on new one. * Add coverage for change in tests. * there is no longer an inner join so should not need the idsite check
* One click update in two parts so new code is loaded for second. * remove no longer needed code
diosmosis
added
the
not-in-changelog
|
@diosmosis it might be better to push merges from 3.x-dev to 4.x-dev directly to the 4.x-dev branch, without using a PR. The problem with the PR is, that with our merge strategy all commits are squashed into one. That means, the next time some tries to merge 3.x-dev to 4.x-dev all commits in this PR will be tried to merge again, as they are not included in 4.x-dev. That doesn't happen when pushing the merge directly or if we would allow another merge strategy. |
|
@sgiehl 👍 didn't think of that. Think it would be better to revert this and merge on the CLI manually? |
|
not needed. Another merge from 3.x-dev to 4.x-dev should be enough as all commits should be tried to merge again, even if the changes have already been merged... |
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.
No description provided.