Codex/merge master into next 20260416#7489
Merged
ar2rsawseen merged 125 commits intonextfrom Apr 17, 2026
Merged
Conversation
Bumps [cypress](https://github.com/cypress-io/cypress) from 15.12.0 to 15.13.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](cypress-io/cypress@v15.12.0...v15.13.0) --- updated-dependencies: - dependency-name: cypress dependency-version: 15.13.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Removed installation of ipa-gothic-fonts package for RHEL.
Removed installation of ipa-gothic-fonts from Dockerfile.
Raven release fix 2
…s/cypress-15.13.0 Bump cypress from 15.12.0 to 15.13.0 in /ui-tests
Add new message for user property update [SER-2847]
…og-for-new-content-builder-image-handling
A script to fix the missing custom user properties in drill meta
…og-for-new-content-builder-image-handling
…ontent-builder-image-handling [Feat] Content Blocks image fill types
Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 2.0.2 to 2.0.3. - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](juliangruber/brace-expansion@v2.0.2...v2.0.3) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 2.0.3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…/hooks/brace-expansion-2.0.3 Bump brace-expansion from 2.0.2 to 2.0.3 in /plugins/hooks
Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 1.1.12 to 1.1.13. - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](juliangruber/brace-expansion@v1.1.12...v1.1.13) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 1.1.13 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…xpansion-1.1.13 Bump brace-expansion from 1.1.12 to 1.1.13
Bumps [path-to-regexp](https://github.com/pillarjs/path-to-regexp) from 0.1.12 to 0.1.13. - [Release notes](https://github.com/pillarjs/path-to-regexp/releases) - [Changelog](https://github.com/pillarjs/path-to-regexp/blob/v.0.1.13/History.md) - [Commits](pillarjs/path-to-regexp@v0.1.12...v.0.1.13) --- updated-dependencies: - dependency-name: path-to-regexp dependency-version: 0.1.13 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…-regexp-0.1.13 Bump path-to-regexp from 0.1.12 to 0.1.13
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.23...4.18.1) --- updated-dependencies: - dependency-name: lodash dependency-version: 4.18.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…ipts/device_list/lodash-4.18.1 Bump lodash from 4.17.23 to 4.18.1 in /bin/scripts/device_list
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.23...4.18.1) --- updated-dependencies: - dependency-name: lodash dependency-version: 4.18.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
…4.18.1 Bump lodash from 4.17.23 to 4.18.1
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.23...4.18.1) --- updated-dependencies: - dependency-name: lodash dependency-version: 4.18.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…/hooks/lodash-4.18.1 Bump lodash from 4.17.23 to 4.18.1 in /plugins/hooks
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.23...4.18.1) --- updated-dependencies: - dependency-name: lodash dependency-version: 4.18.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…s/lodash-4.18.1 Bump lodash from 4.17.23 to 4.18.1 in /ui-tests
…into-next-20260416 # Conflicts: # Dockerfile-centos-api # package-lock.json
Contributor
There was a problem hiding this comment.
Pull request overview
Merge-forward changes from master into next, primarily updating dependencies and adjusting alerts scheduling to respect application timezones, plus a new maintenance script and small documentation/workflow updates.
Changes:
- Update alerts job scheduling/execution to pass app context and compute schedules using timezone offsets.
- Bump multiple dependencies across root, plugins, and UI test tooling lockfiles.
- Add a new data-fix script and minor docs/localization/workflow adjustments.
Reviewed changes
Copilot reviewed 20 out of 28 changed files in this pull request and generated 12 comments.
Show a summary per file
| File | Description |
|---|---|
| ui-tests/package-lock.json | Updates UI test dependencies (faker, cypress, lodash, pdfjs-dist, canvas bindings). |
| ui-tests/README.md | Fixes markdown code fence formatting. |
| plugins/push/package.json | Bumps node-forge version. |
| plugins/push/package-lock.json | Locks updated node-forge version. |
| plugins/hooks/package-lock.json | Updates axios and related transitive deps. |
| plugins/data-manager/frontend/public/localization/data-manager.properties | Adds new success/failure localization strings for user-property edits. |
| plugins/alerts/api/parts/common-lib.js | Adds timezone offset to app shape and introduces helper to load apps with offsets. |
| plugins/alerts/api/jobs/monitor.js | Refactors monitor job to async/await and passes {alert, app} into modules. |
| plugins/alerts/api/api.js | Reworks alert scheduling logic to create jobs per app (including “all” apps) using timezone offsets. |
| plugins/alerts/api/alertModules/views.js | Updates module API to accept app argument and adds debug logging. |
| plugins/alerts/api/alertModules/users.js | Updates module API to accept app argument and adds debug logging. |
| plugins/alerts/api/alertModules/survey.js | Updates module API to accept app argument and adds debug logging. |
| plugins/alerts/api/alertModules/sessions.js | Updates module API to accept app argument and adds debug logging. |
| plugins/alerts/api/alertModules/revenue.js | Updates module API to accept app argument and adds debug logging. |
| plugins/alerts/api/alertModules/rating.js | Updates module API to accept app argument and adds debug logging. |
| plugins/alerts/api/alertModules/nps.js | Updates module API to accept app argument and adds debug logging. |
| plugins/alerts/api/alertModules/events.js | Updates module API to accept app argument and adds debug logging. |
| plugins/alerts/api/alertModules/dataPoints.js | Shifts “all apps” handling to scheduler by accepting single app per job run. |
| plugins/alerts/api/alertModules/crashes.js | Updates module API to accept app argument and adds debug logging. |
| plugins/alerts/api/alertModules/cohorts.js | Updates module API to accept app argument and adds debug logging. |
| package.json | Bumps multiple root dependencies/devDependencies. |
| package-lock.json | Locks updated root dependency graph. |
| bin/scripts/fix-data/fix_missing_custom_user_props.js | Adds a Node.js script to backfill/extend drill_meta custom user property metadata. |
| bin/scripts/device_list/package-lock.json | Updates lodash version for the device_list script package. |
| bin/countly.install_rhel.sh | Removes installation of ipa-gothic-fonts on non-CentOS9 path. |
| CHANGELOG.md | Adds changelog entries for fixes and dependency bumps. |
| .github/workflows/docker-image.yml | Updates pinned SHAs for Docker login/build actions. |
| .github/workflows/deploy.yml | Updates pinned SHAs for Docker login/build action. |
Files not reviewed (3)
- plugins/hooks/package-lock.json: Language not supported
- plugins/push/package-lock.json: Language not supported
- ui-tests/package-lock.json: Language not supported
6a7b205 to
680b426
Compare
…raversal Fix data migration path traversal
Rearranged useradd command and ensured HTTPS for APT sources.
Modify Dockerfile to use HTTPS for ubuntu repo
Bumps [cypress](https://github.com/cypress-io/cypress) from 15.13.1 to 15.14.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](cypress-io/cypress@v15.13.1...v15.14.0) --- updated-dependencies: - dependency-name: cypress dependency-version: 15.14.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…s/cypress-15.14.0 Bump cypress from 15.13.1 to 15.14.0 in /ui-tests
Bumps [protocol-buffers-schema](https://github.com/mafintosh/protocol-buffers-schema) from 3.6.0 to 3.6.1. - [Commits](mafintosh/protocol-buffers-schema@v3.6.0...v3.6.1) --- updated-dependencies: - dependency-name: protocol-buffers-schema dependency-version: 3.6.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…l-buffers-schema-3.6.1 Bump protocol-buffers-schema from 3.6.0 to 3.6.1
Bumps [typescript](https://github.com/microsoft/TypeScript) from 6.0.2 to 6.0.3. - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Commits](microsoft/TypeScript@v6.0.2...v6.0.3) --- updated-dependencies: - dependency-name: typescript dependency-version: 6.0.3 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ipt-6.0.3 Bump typescript from 6.0.2 to 6.0.3
Bump package-lock
…into-next-20260416 # Conflicts: # package-lock.json
Cookiezaurs
approved these changes
Apr 17, 2026
This file contains hidden or 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
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.