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 #10239 to staging 🍒 #10305

Merged
merged 4 commits into from
Aug 8, 2022
Merged

🍒 Cherry pick PR #10239 to staging 🍒 #10305

merged 4 commits into from
Aug 8, 2022

Conversation

OSBotify
Copy link
Contributor

@OSBotify OSBotify commented Aug 8, 2022

🍒 Cherry pick #10239 to staging 🍒

OSBotify and others added 2 commits August 8, 2022 17:18
@OSBotify
Merge pull request #10303 from Expensify/version-BUILD-4DD12499-AE12-…
d7588ee 
…4B3F-8F8D-FE3FFB6953B4

Update version to 1.1.88-6 on main

(cherry picked from commit dd80be7)
@luacmartins @OSBotify
Merge pull request #10239 from Expensify/marcaaron-memoizeGetOptions
fae60b1 
Memoize some functions in `OptionsListUtils`

(cherry picked from commit c15c2e7)
@OSBotify OSBotify requested a review from a team as a code owner August 8, 2022 17:18
@melvin-bot melvin-bot bot removed the request for review from a team August 8, 2022 17:18
@OSBotify
Copy link
Contributor Author

OSBotify commented Aug 8, 2022

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.

roryabraham
roryabraham requested changes Aug 8, 2022
View reviewed changes
@luacmartins luacmartins requested a review from roryabraham August 8, 2022 17:59
@roryabraham roryabraham merged commit 5597cfa into staging Aug 8, 2022
@roryabraham roryabraham deleted the OSBotify-cherry-pick-staging-10239 branch August 8, 2022 18:01
@OSBotify
Copy link
Contributor Author

OSBotify commented Aug 8, 2022

🚀 Cherry-picked to staging by @roryabraham in version: 1.1.88-6 🚀

platform result
🤖 android 🤖 failure ❌
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 web 🕸 success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

1 similar comment
@OSBotify
Copy link
Contributor Author

OSBotify commented Aug 8, 2022

🚀 Cherry-picked to staging by @roryabraham in version: 1.1.88-6 🚀

platform result
🤖 android 🤖 failure ❌
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 web 🕸 success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

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

@roryabraham roryabraham roryabraham approved these changes

Assignees

@luacmartins luacmartins

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

Successfully merging this pull request may close these issues.
3 participants
@OSBotify @roryabraham @luacmartins