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

Ensure UTF8mb4 conversion command always enables tracking again #18444

Merged
merged 3 commits into from Dec 7, 2021

Conversation

sgiehl
Copy link
Member

@sgiehl sgiehl commented Dec 3, 2021

Description:

fixes #18441

Review

@sgiehl sgiehl added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels Dec 3, 2021
@sgiehl sgiehl added this to the 4.6.2 milestone Dec 3, 2021
@sgiehl sgiehl requested a review from tsteur December 3, 2021 08:06
@sgiehl sgiehl linked an issue Dec 3, 2021 that may be closed by this pull request
Copy link
Contributor

@justinvelluppillai justinvelluppillai left a comment

Choose a reason for hiding this comment

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

Made two comments needing fixing, seems fine otherwise.

@sgiehl
Copy link
Member Author

sgiehl commented Dec 6, 2021

@justinvelluppillai I have pushed another small fix. In theory it could have happened that $config might not have been defined in the finally, if $keepTracking is false, and one of the db queries fails.

@sgiehl sgiehl merged commit 18c176b into next_release Dec 7, 2021
@sgiehl sgiehl deleted the m-18441 branch December 7, 2021 11:42
justinvelluppillai added a commit that referenced this pull request Dec 16, 2021
* Fix for misaligned evolution trend icons (#18323)

* Aligned evolution trend icons, text tweak

* Update plugins/MultiSites/angularjs/dashboard/dashboard.directive.less

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Hide feedback banner in zen mode (#18329)

* [Vue] 4.6.0 fixes (#18334)

* feedback plugin may not be loaded

* fix copy paste

* async/await not supported

* built UMDs

* [Vue] use jQuery click for expand on click (#18341)

* use jQuery click for expand on click

* undo submodule change

* 4.6.0-rc2

* [Vue] fix modal notification placement (#18377)

* Use separate div in modals to display notifications otherwise Vue will erase modal content when initializing NotificationGroup component.

* built vue files

* Updating version to 4.6.0

* [Vue] date picker viewDate property is not kept up to date (#18385)

* viewDate ref is not kept up to date

* rebuild corehome

* 4.6.1-rc1

* 4.6.1

* [Vue] emit/broadcast on scope the method was called on not rootScope (#18419)

* emit/broadcast on correct scope in wrapper

* rebuild vue

* remove plugin.json from CoreVue, it is not needed and causes some UI tests to fail (#18421)

* Ensure UTF8mb4 conversion command always enables tracking again (#18444)

* Ensure UTF8mb4 conversion command always enables tracking again

* apply review feedback

* small code improvement

* Ignore segment errors in update script (#18455)

* 4.6.2-rc1

* Ensure update to 4.6.2 removes some files (#18473)

* 4.6.2 release!

* built vue files

Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com>
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Co-authored-by: dizzy <diosmosis@users.noreply.github.com>
Co-authored-by: Matthieu Aubry <mattab@users.noreply.github.com>
Co-authored-by: justinvelluppillai <justinvelluppillai@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

When convert to utf8mb4 command fails, enable tracking again
2 participants