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.

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

Merge 18.2.0.1 beta into develop #17136

Merged
merged 11 commits into from
Sep 9, 2021
Merged

Merge 18.2.0.1 beta into develop #17136

merged 11 commits into from
Sep 9, 2021

Conversation

mokagio
Copy link
Contributor

@mokagio mokagio commented Sep 9, 2021

Includes:

  • Correctly distinguish between a theme that is "active" and one the user needs to "activate" (#17107) by @illusaen
  • [Internal] A fix for how the editor_session_start is logged (#17130) by @dcalhoun

Wendy Chen and others added 11 commits September 1, 2021 12:35
Checking if theme is current theme in order to determine activate/act…
d4dbef5 
…ive wording instead of always using active.
Updating release notes.
3be239b
@dcalhoun
Fix editor_session_start event customer property key
b5f230f 
Prior to this change, `wpios_editor_session_start` events were not sent
to Tracks, as they were marked as invalid with the following error.

```
Custom properties dictionary keys must contain alpha characters and underscores only.
```
@mokagio
Fix editor_session_start event custom property key (#17130)
0c3331e
@mokagio
Merge remote-tracking branch 'origin/release/18.2' into theme-active-…
d9112e0 
…vs-activate

GitHub couldn't automatically resolve a conflict on the
`RELEASE-NOTES.txt` file, but my local Git auto-merged it without
trouble...

```
Auto-merging RELEASE-NOTES.txt
Merge made by the 'recursive' strategy.
```
@mokagio
Remove redundant entry from RELEASE-NOTES.txt
78058a0 
In d9112e0, I boasted about how my
local Git was able to automatically resolve merge conflicts on
`RELEASE-NOTES.txt`. Too bad it did it in a way that was not appropriate 🤦‍♂️

I should have checked that before pushing the commit... This addresses
that little issue.
@mokagio
Use "active" or "activate" correctly in theme customization (#17107)
f9f8f1c
@mokagio
Update translations
c415295
@mokagio
Update metadata translations
5314905
@mokagio
Bump version number
97247a4
@mokagio
Manually track the deleted Jetpack older release notes localizations
a088c78
@peril-wordpress-mobile
Copy link

You can trigger an installable build for these changes by visiting CircleCI here.

@mokagio mokagio added this to the 18.2 ❄️ milestone Sep 9, 2021
@mokagio mokagio marked this pull request as ready for review September 9, 2021 11:12
@mokagio mokagio enabled auto-merge September 9, 2021 11:13
This was referenced Sep 9, 2021
Merged
Merged
@mokagio mokagio requested a review from a team September 9, 2021 11:16
oguzkocer
oguzkocer approved these changes Sep 9, 2021
View reviewed changes
Copy link
Contributor

@oguzkocer oguzkocer left a comment

Choose a reason for hiding this comment

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

Not entirely sure why a088c78 was necessary, but this seems reasonable enough, so :shipit:

@mokagio mokagio merged commit b733df1 into develop Sep 9, 2021
@mokagio
Copy link
Contributor Author

mokagio commented Sep 10, 2021

@oguzkocer

Not entirely sure why a088c78 was necessary, but this seems reasonable enough, so :shipit:

Good point. I didn't add enough any detail in the commit message. See 859f7fe for more info.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oguzkocer oguzkocer oguzkocer approved these changes

Assignees
No one assigned
Labels
Releases
Projects
None yet
Milestone
18.2
Development

Successfully merging this pull request may close these issues.
3 participants
@mokagio @oguzkocer @dcalhoun