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 release 7.38-rc-2 into main #934

Merged
merged 15 commits into from
May 5, 2023
Merged

Merge release 7.38-rc-2 into main #934

merged 15 commits into from
May 5, 2023

Conversation

ashiagr
Copy link
Contributor

@ashiagr ashiagr commented May 5, 2023 •
edited
Loading

This brings hotfixes #930, #931 into main.

There was a merge conflict in 1dba064, @mchowning can you check if I've correctly resolved it?

mchowning and others added 13 commits May 4, 2023 15:36
@mchowning
Bump version number
d3c3acf
@mchowning
If adding an already added account, set SignInType manually
836848c
@mchowning
Set SignInType when setting refresh token
11b80c7
@mchowning
Fix error message
6d14399
@mchowning
Add SignInType info to logs
8b86856
@mchowning
Update changelog
ed52969
@mchowning
Only send sign out analytics when user was signed in
8324061
@ashiagr
Merge pull request #930 from Automattic/fix/sign-out-issues
e026e9a 
Make sure app has correct `SignInType` after upgrading
@ashiagr
Merge pull request #931 from Automattic/fix/sign-out-event-firing-on-…
0bb4b76 
…startup

Only send sign out analytics when user was signed in
@ashiagr
Merge branch 'release/7.38' into merge/release-7.37.1-into-7.38
53a547a 
# Conflicts:
#	version.properties
@ashiagr
Merge pull request #933 from Automattic/merge/release-7.37.1-into-7.38
365ec12 
Merge release/7.37.1 into 7.38-rc-1
@ashiagr
Bump version number
f295461
@ashiagr
Merge remote-tracking branch 'origin/main' into merge/release-7.38-in…
1dba064 
…to-main

# Conflicts:
#	modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/sync/SyncManagerImpl.kt
@ashiagr ashiagr requested a review from a team as a code owner May 5, 2023 08:22
mchowning
mchowning approved these changes May 5, 2023
View reviewed changes
Copy link
Contributor

@mchowning mchowning left a comment

Choose a reason for hiding this comment

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

Thanks for wrangling this @ashiagr ! Merge generally looks good, I only noticed a couple of minor issues:

  1. We had an extra log message at one place, so I pushed 5eb5497 to remove the old one.
  2. I think the automatic merge put the changelog entries in the wrong order. Fixed in 12e1f74.

@mchowning mchowning enabled auto-merge May 5, 2023 10:56
@mchowning mchowning merged commit 6b57033 into main May 5, 2023
@mchowning mchowning deleted the merge/release-7.38-into-main branch May 5, 2023 11:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mchowning mchowning mchowning approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ashiagr @mchowning