Skip to content

Commit b94b048

Browse files
tbradshamatticbot
authored andcommitted
Backport backup 3.7.1 changes (#46039)
Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/19555081540 Upstream-Ref: Automattic/jetpack@1a68881
1 parent 89608dc commit b94b048

7 files changed

Lines changed: 108 additions & 111 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"automattic/jetpack-autoloader": "^5.0.13",
1111
"automattic/jetpack-composer-plugin": "^4.0.5",
1212
"automattic/jetpack-config": "^3.1.1",
13-
"automattic/jetpack-my-jetpack": "^5.28.6-alpha",
13+
"automattic/jetpack-my-jetpack": "^5.28.6",
1414
"automattic/jetpack-plugins-installer": "^0.5.7",
1515
"automattic/jetpack-sync": "^4.22.5",
1616
"automattic/jetpack-transport-helper": "^0.3.3",

jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [5.28.6-alpha] - unreleased
9-
10-
This is an alpha version! The changes listed here are not final.
11-
8+
## [5.28.6] - 2025-11-20
129
### Changed
13-
- Update package dependencies.
10+
- Update package dependencies. [#46022]
1411

1512
### Fixed
16-
- My Jetpack: Fix expiring renewal prompt to show all products
17-
- Redirect partner coupon redemption requests to Jetpack dashboard to ensure coupon can be redeemed.
13+
- My Jetpack: Fix expiring renewal prompt to show all products. [#45995]
14+
- Redirect partner coupon redemption requests to Jetpack dashboard to ensure coupon can be redeemed. [#45994]
1815

1916
## [5.28.5] - 2025-11-19
2017
### Changed
@@ -2438,7 +2435,7 @@ This is an alpha version! The changes listed here are not final.
24382435
### Added
24392436
- Created package
24402437

2441-
[5.28.6-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.28.5...5.28.6-alpha
2438+
[5.28.6]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.28.5...5.28.6
24422439
[5.28.5]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.28.4...5.28.5
24432440
[5.28.4]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.28.3...5.28.4
24442441
[5.28.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.28.2...5.28.3

jetpack_vendor/automattic/jetpack-my-jetpack/src/class-initializer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Initializer {
3939
*
4040
* @var string
4141
*/
42-
const PACKAGE_VERSION = '5.28.6-alpha';
42+
const PACKAGE_VERSION = '5.28.6';
4343

4444
/**
4545
* HTML container ID for the IDC screen on My Jetpack page.

jetpack_vendor/i18n-map.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
),
5151
'jetpack-my-jetpack' => array(
5252
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
53-
'ver' => '5.28.6-alpha1763658787',
53+
'ver' => '5.28.6',
5454
),
5555
'jetpack-password-checker' => array(
5656
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',

vendor/composer/installed.json

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dist": {
88
"type": "path",
99
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
10-
"reference": "08f5d4a36fd505dab02f3e3087c133d3e8848426"
10+
"reference": "9be7706a3ba6382fcd0cd49a0769e3458443641f"
1111
},
1212
"require": {
1313
"php": ">=7.2"
@@ -64,7 +64,7 @@
6464
"dist": {
6565
"type": "path",
6666
"url": "/tmp/jetpack-build/Automattic/jetpack-account-protection",
67-
"reference": "fff22e41eb7a64d16e4dc9abb9d8704be96c5c27"
67+
"reference": "f87969a992ab3978ae8fea9953b01498b92a287a"
6868
},
6969
"require": {
7070
"automattic/jetpack-connection": "^6.19.8",
@@ -136,7 +136,7 @@
136136
"dist": {
137137
"type": "path",
138138
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
139-
"reference": "b3b1bb5da73883b05c92146e897db939baebe8c1"
139+
"reference": "c10bc762044f119a8e3d53fbda03ec3b57f571cb"
140140
},
141141
"require": {
142142
"php": ">=7.2"
@@ -199,7 +199,7 @@
199199
"dist": {
200200
"type": "path",
201201
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
202-
"reference": "4658e06d6cebd0e9f409de64468b2af57b363efb"
202+
"reference": "845010a59459844ff2d02ebc869394c26e33c2b4"
203203
},
204204
"require": {
205205
"automattic/jetpack-constants": "^3.0.8",
@@ -273,7 +273,7 @@
273273
"dist": {
274274
"type": "path",
275275
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
276-
"reference": "74081884cad238f719d71b408f0ac829311ad4c8"
276+
"reference": "d8aee58608293d7569661fe26bdeda1a248ebb5f"
277277
},
278278
"require": {
279279
"composer-plugin-api": "^2.2",
@@ -345,7 +345,7 @@
345345
"dist": {
346346
"type": "path",
347347
"url": "/tmp/jetpack-build/Automattic/jetpack-backup-helper-script-manager",
348-
"reference": "f149aea7e3fdad3a80aa312c6c68e7b4e865b01d"
348+
"reference": "34aae523e8c67c6958fb9ddf2fa20a3d686fbc58"
349349
},
350350
"require": {
351351
"php": ">=7.2"
@@ -403,7 +403,7 @@
403403
"dist": {
404404
"type": "path",
405405
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
406-
"reference": "f948847ad1245ca49f1b6693606db78982eb974b"
406+
"reference": "d144ea5fd3d109d2689a8c08d37e523335f54832"
407407
},
408408
"require": {
409409
"automattic/jetpack-connection": "^6.19.8",
@@ -462,7 +462,7 @@
462462
"dist": {
463463
"type": "path",
464464
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
465-
"reference": "3fc064929238aa379629af13437c14aec69e98c9"
465+
"reference": "ec7a2c9a5db85f12e56aa8fd69ca9be1f3407d73"
466466
},
467467
"require": {
468468
"automattic/jetpack-boost-core": "^0.4.0",
@@ -530,7 +530,7 @@
530530
"dist": {
531531
"type": "path",
532532
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
533-
"reference": "87601a56f1c44d3c4734b6b3b23ff214d6542b2d"
533+
"reference": "4fbc4b50f83b7594fccbd1ba3cfb5d7c21376f89"
534534
},
535535
"require": {
536536
"composer-plugin-api": "^2.2",
@@ -594,7 +594,7 @@
594594
"dist": {
595595
"type": "path",
596596
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
597-
"reference": "d10a9778a8aba0b9e562950964e09d1f5e98c655"
597+
"reference": "8f1982a37f7d7f58cafaece29720d841c90515bf"
598598
},
599599
"require": {
600600
"php": ">=7.2"
@@ -669,7 +669,7 @@
669669
"dist": {
670670
"type": "path",
671671
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
672-
"reference": "294d3256a324930828850c3ef0fc13cab947bf33"
672+
"reference": "3a465bff53205afcee22b1f9274d2467fce76da9"
673673
},
674674
"require": {
675675
"automattic/jetpack-a8c-mc-stats": "^3.0.5",
@@ -757,7 +757,7 @@
757757
"dist": {
758758
"type": "path",
759759
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
760-
"reference": "8ec0445a8c2d0de8f1233f27e788750d3efed9ee"
760+
"reference": "8142d8404eb135725c683f742959a817f1b6a3fe"
761761
},
762762
"require": {
763763
"php": ">=7.2"
@@ -815,7 +815,7 @@
815815
"dist": {
816816
"type": "path",
817817
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
818-
"reference": "b526176804bf7e6f03c0ce9e7e7c553061f2c9c9"
818+
"reference": "238c1755386c79a41965dbc610561a4a7d043984"
819819
},
820820
"require": {
821821
"php": ">=7.2"
@@ -872,7 +872,7 @@
872872
"dist": {
873873
"type": "path",
874874
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
875-
"reference": "40a8b358977a67129b8ad2ccec70f3ec772099cc"
875+
"reference": "c9099b9ff4e820892775f14185816f3820bef6ff"
876876
},
877877
"require": {
878878
"automattic/jetpack-connection": "^6.19.8",
@@ -951,7 +951,7 @@
951951
"dist": {
952952
"type": "path",
953953
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
954-
"reference": "a93488f8a31626840e850bea4bfe2beb08c929b1"
954+
"reference": "79cda65ec7e7d83676113b4919acf9242e00671d"
955955
},
956956
"require": {
957957
"php": ">=7.2"
@@ -1013,7 +1013,7 @@
10131013
"dist": {
10141014
"type": "path",
10151015
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
1016-
"reference": "cfb8c5212291dbff3868727dfceff56c524bc9b2"
1016+
"reference": "9c33e2ba3b2b42f6a4170f9ad4929f25bba0b753"
10171017
},
10181018
"require": {
10191019
"automattic/jetpack-a8c-mc-stats": "^3.0.5",
@@ -1092,7 +1092,7 @@
10921092
"dist": {
10931093
"type": "path",
10941094
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
1095-
"reference": "8b7ea4d2821c72a1d27aa4e0c2b9b03b5a2371eb"
1095+
"reference": "face13f5d0ef26f9c25e6260428bacd57313a6ec"
10961096
},
10971097
"require": {
10981098
"automattic/jetpack-connection": "^6.19.8",
@@ -1152,7 +1152,7 @@
11521152
"dist": {
11531153
"type": "path",
11541154
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
1155-
"reference": "cd2edf33d489c610c76547905f27a5753ed79c0f"
1155+
"reference": "39b35b1093484b634229ab86329b58a74e6b039f"
11561156
},
11571157
"require": {
11581158
"php": ">=7.2"
@@ -1204,12 +1204,12 @@
12041204
},
12051205
{
12061206
"name": "automattic/jetpack-my-jetpack",
1207-
"version": "5.28.6-alpha.1763658787",
1208-
"version_normalized": "5.28.6.0-alpha1763658787",
1207+
"version": "5.28.6",
1208+
"version_normalized": "5.28.6.0",
12091209
"dist": {
12101210
"type": "path",
12111211
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
1212-
"reference": "0d1d3b2af69f890b5664e19896fea88c24685c6c"
1212+
"reference": "aeadcea53a1f427568695750765c9ad3697c1059"
12131213
},
12141214
"require": {
12151215
"automattic/jetpack-admin-ui": "^0.5.11",
@@ -1309,7 +1309,7 @@
13091309
"dist": {
13101310
"type": "path",
13111311
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
1312-
"reference": "eb05661a3c0816354fe9a210a6621d410b8db5a7"
1312+
"reference": "6c363bd4ee2018effecb8d2863c84dbc6939eece"
13131313
},
13141314
"require": {
13151315
"php": ">=7.2"
@@ -1368,7 +1368,7 @@
13681368
"dist": {
13691369
"type": "path",
13701370
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
1371-
"reference": "7572a3e08756b77a352fea13c99699f92384831f"
1371+
"reference": "9e06b66a308b850cd98bf2e5cfe133cdbb32cf94"
13721372
},
13731373
"require": {
13741374
"automattic/jetpack-connection": "^6.19.8",
@@ -1434,7 +1434,7 @@
14341434
"dist": {
14351435
"type": "path",
14361436
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
1437-
"reference": "cbc5e59ab477b523c483c4f08da0ecef19d18bf9"
1437+
"reference": "3ed7a170438bcc9e8f4587c6045f328eb8360a0d"
14381438
},
14391439
"require": {
14401440
"automattic/jetpack-a8c-mc-stats": "^3.0.5",
@@ -1494,7 +1494,7 @@
14941494
"dist": {
14951495
"type": "path",
14961496
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
1497-
"reference": "76e34b1a3bc87f6a1a981fda4a9cd5ee31dc2df9"
1497+
"reference": "c07910c1a9750b01e175e06e9b178297da3934a3"
14981498
},
14991499
"require": {
15001500
"automattic/jetpack-redirect": "^3.0.9",
@@ -1563,7 +1563,7 @@
15631563
"dist": {
15641564
"type": "path",
15651565
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
1566-
"reference": "720792e2a9643e4f607a7f5df8d0291e38f71714"
1566+
"reference": "fdcbfc38b985d426fbed7fc0028b8f06252350f4"
15671567
},
15681568
"require": {
15691569
"automattic/jetpack-connection": "^6.19.8",
@@ -1636,7 +1636,7 @@
16361636
"dist": {
16371637
"type": "path",
16381638
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
1639-
"reference": "1c30947592483480cc3814771dc587a6284bdeea"
1639+
"reference": "ff9efb1767594b7280ae4fe391af698dc3504b00"
16401640
},
16411641
"require": {
16421642
"automattic/jetpack-status": "^6.1.1",
@@ -1695,7 +1695,7 @@
16951695
"dist": {
16961696
"type": "path",
16971697
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
1698-
"reference": "5d5eff622ad903b402617e07102f98864a2d6097"
1698+
"reference": "75f99daa52c0a973d48ac9bed798b059932683a0"
16991699
},
17001700
"require": {
17011701
"php": ">=7.2"
@@ -1753,7 +1753,7 @@
17531753
"dist": {
17541754
"type": "path",
17551755
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
1756-
"reference": "f40d63f23f67834a2c3108057874f2a013190a5e"
1756+
"reference": "152da8d5037e9694917f84950812282c1894425c"
17571757
},
17581758
"require": {
17591759
"automattic/jetpack-constants": "^3.0.8",
@@ -1821,7 +1821,7 @@
18211821
"dist": {
18221822
"type": "path",
18231823
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
1824-
"reference": "b15528cdab94d2d76b9745261493123e45f09bef"
1824+
"reference": "4e358ef7ce64bee2e2b41d9186a71d2ea8334e6e"
18251825
},
18261826
"require": {
18271827
"automattic/jetpack-connection": "^6.19.8",
@@ -1897,7 +1897,7 @@
18971897
"dist": {
18981898
"type": "path",
18991899
"url": "/tmp/jetpack-build/Automattic/jetpack-transport-helper",
1900-
"reference": "a96a6dcc2c7d384f81404df2683742679eab43fb"
1900+
"reference": "bbd14c0bcf9e093c71605f40e870c579221e9f86"
19011901
},
19021902
"require": {
19031903
"automattic/jetpack-backup-helper-script-manager": "^0.3.8",
@@ -1970,7 +1970,7 @@
19701970
"dist": {
19711971
"type": "path",
19721972
"url": "/tmp/jetpack-build/Automattic/jetpack-waf",
1973-
"reference": "44a51c1ca8303d4d2f8e1043bd6ba6b0ca082a13"
1973+
"reference": "a68a65c0aa538951dfe0f4459e9e5ef7ab21a924"
19741974
},
19751975
"require": {
19761976
"automattic/jetpack-connection": "^6.19.8",

0 commit comments

Comments
 (0)