Merge finalized release 18.8 into develop - #17667
Merged
Merged
Conversation
This fixes an issue for the site addres login -> wpcom login flow, where tapping on a non-p2 site would not do anything.
…ements-self-hosted-then-wpcom-login Onboarding Improvements: Fix self-hosted login -> wpcom login flow
Conflicts in `WordPress/WordPressShareExtension/` and `WordPress/WordPressTodayWidget/` `*.lproj/Localizable.strings` which were updated in the release branch but removed on `develop`. I solved them by keeping the deletion from `develop` as that's the approach we want going forward. Full list of conflicting files: - `WordPress/WordPressShareExtension/ar.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/bg.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/cs.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/cy.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/da.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/de.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/en-AU.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/en-CA.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/en-GB.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/es.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/fr.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/he.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/hr.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/hu.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/id.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/is.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/it.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/ja.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/ko.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/nb.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/nl.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/pl.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/pt-BR.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/pt.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/ro.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/ru.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/sk.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/sq.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/sv.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/th.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/tr.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/zh-Hans.lproj/Localizable.strings` - `WordPress/WordPressShareExtension/zh-Hant.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/ar.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/bg.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/cs.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/cy.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/da.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/de.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/en-AU.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/en-CA.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/en-GB.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/es.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/fr.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/he.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/hr.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/hu.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/id.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/is.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/it.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/ja.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/ko.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/nb.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/nl.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/pl.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/pt-BR.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/pt.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/ro.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/ru.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/sk.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/sq.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/sv.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/th.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/tr.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/zh-Hans.lproj/Localizable.strings` - `WordPress/WordPressTodayWidget/zh-Hant.lproj/Localizable.strings`
|
You can trigger an installable build for these changes by visiting CircleCI here. |
mokagio
changed the title
develop
|
You can trigger optional UI/connected tests for these changes by visiting CircleCI here. |
mokagio
commented
Dec 10, 2021
mokagio
left a comment
mokagio
left a comment
Contributor
Author
There was a problem hiding this comment.
- Fastlane localized
release_notes.txtupdates LocalizedNo new updates since 18.8.0.4.stringsupdates- Build number bump in version
.xcconfigfile - Plus diffs from the PRs that landed on the release branch since the last beta
mokagio
marked this pull request as ready for review
December 10, 2021 18:56
mokagio
enabled auto-merge
December 10, 2021 18:56
oguzkocer
approved these changes
Dec 13, 2021
Contributor
|
I quickly checked the merge conflicts by resolving them locally and got to the same diff. |
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
3 participants
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.
Similarly to #17652, we got conflicts in
WordPress/WordPressShareExtension/andWordPress/WordPressTodayWidget/*.lproj/Localizable.stringswhich were updated in the release branch but removed ondevelop.I solved them by keeping the deletion from
developas that's the approach we want going forward.