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

🍒 Cherry pick PR #14730 to staging 🍒 #14733

Closed
wants to merge 2 commits into from
Closed

🍒 Cherry pick PR #14730 to staging 🍒 #14733

wants to merge 2 commits into from

Conversation

OSBotify
Copy link
Contributor

@OSBotify OSBotify commented Feb 1, 2023

🍒 Cherry pick #14730 to staging 🍒

OSBotify and others added 2 commits February 1, 2023 16:14
@OSBotify
Merge pull request #14732 from Expensify/version-BUILD-3A0CA0E5-235D-…
d1611e6 
…40EE-BABB-5CC7055CB6F4

Update version to 1.2.63-1 on main

(cherry picked from commit 79d6c13)
@Beamanator @OSBotify
Merge pull request #14730 from Expensify/beaman-onlyAllowPasswordless…
cea6c07 
…ForThatBeta

Only show `passwordless` flow if user is on `passwordless` or `all` betas

(cherry picked from commit dbc1764)
@OSBotify OSBotify requested a review from a team as a code owner February 1, 2023 16:14
@melvin-bot melvin-bot bot removed the request for review from a team February 1, 2023 16:14
@OSBotify
Copy link
Contributor Author

OSBotify commented Feb 1, 2023

This pull request has merge conflicts and can not be automatically merged. 😞
Please manually resolve the conflicts, push your changes, and then request another reviewer to review and merge.
Important: There may be conflicts that GitHub is not able to detect, so please carefully review this pull request before approving.

@Beamanator
Copy link
Contributor

Ummmm @roryabraham @AndrewGable I'm not sure what to do here? There's one merge conflict due to canUsePasswordlessLogins, but none of the code that uses that new function is in this PR? Soooooo Idk how to resolve :O

@mountiny
Copy link
Contributor

mountiny commented Feb 1, 2023

We have mistakenly thought the relevant code made it to staging but it did not, code is on main and CP is not required then

@mountiny mountiny closed this Feb 1, 2023
@mountiny mountiny deleted the OSBotify-cherry-pick-staging-14730 branch February 1, 2023 16:37
@Beamanator
Copy link
Contributor

ohhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh that's def my bad 🙃

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

@Beamanator Beamanator

Labels
automerge Engineering Hourly KSv2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@OSBotify @Beamanator @mountiny