Skip to content

Merge release/23.5 into trunk #16266

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 17 commits into from
Oct 22, 2025
Merged

Merge release/23.5 into trunk #16266

merged 17 commits into from
Oct 22, 2025
+1,302 −19,473

Conversation

@wpmobilebot
Copy link
Collaborator

@wpmobilebot wpmobilebot commented Oct 22, 2025

Merging release/23.5 into trunk.

Via intermediate branch merge/release-23.5-into-trunk, to help fix conflicts if any:

                            release/23.5  ----o-- - - -
                                               \
           merge/release-23.5-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

itsmeichigo and others added 17 commits October 17, 2025 16:14
@itsmeichigo
Move userDefault update to a separate serial queue
a062a6f
@itsmeichigo
Remove unnecessary wait for the deadlock tests
e89461e
@itsmeichigo
Ensure auth token access is thread safe
2de8743
@itsmeichigo
Avoid deadlock by moving updating of watchDependenciesSynchronizer ou…
91a7435 
…tside of the sync queue
@itsmeichigo
Fix crash due to race condition when initiating `AuthenticatedDotcomR…
5e22f37 
…equest` (#16259)
@itsmeichigo
Make user defaults update sync to avoid race condition and remove unn…
fc11138 
…ecessary wait in tests
@itsmeichigo
Fix deadlock crash when updating UserDefaults (#16256)
7696da4
@itsmeichigo
Prevent redirect callback twice
f88cc46
@itsmeichigo
Simplify logic for site credential login
12269c0 
Remove the manual redirect as cancelling the initial redirect doesn't work properly
@itsmeichigo
Check response of nonce retrieval request
31a11ed
@itsmeichigo
Check nonce regex
113fd66
@itsmeichigo
Update the conditional checks for better readability
b701e6c
@itsmeichigo
Add comment to clarify the check for nonce URL
a175e86
@itsmeichigo
Site credential login: Prevent redirect callback twice (#16262)
f74c1ae
@wpmobilebot
Update app translations – Localizable.strings
bc29e97
@wpmobilebot
Update metadata translations
dfb5eb6
@wpmobilebot
Bump version number
705ac49
@wpmobilebot wpmobilebot added the Releases Used in release management. Using this label will skip some bot checks. label Oct 22, 2025
@wpmobilebot wpmobilebot added this to the 23.6 milestone Oct 22, 2025
@dangermattic
Copy link
Collaborator

dangermattic commented Oct 22, 2025

1 Message
📖 This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

@wpmobilebot
Copy link
Collaborator Author

wpmobilebot commented Oct 22, 2025

App Icon📲 You can test the changes from this Pull Request in WooCommerce iOS Prototype by scanning the QR code below to install the corresponding build.

App NameWooCommerce iOS Prototype
Build Numberpr16266-705ac49
Version23.5
Bundle IDcom.automattic.alpha.woocommerce
Commit705ac49
Installation URL3kqice9hk3k90
 Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

@iamgabrielma iamgabrielma merged commit 9507472 into trunk Oct 22, 2025
19 of 20 checks passed
@iamgabrielma iamgabrielma deleted the merge/release-23.5-into-trunk branch October 22, 2025 02:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iamgabrielma iamgabrielma iamgabrielma approved these changes

Assignees

No one assigned

Labels

Releases Used in release management. Using this label will skip some bot checks.

Projects

None yet

Milestone

23.6

Development

Successfully merging this pull request may close these issues.

5 participants

@wpmobilebot @dangermattic @iamgabrielma @itsmeichigo