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 #8827 to staging 🍒 #8904

Merged
merged 3 commits into from
May 9, 2022
Merged

🍒 Cherry pick PR #8827 to staging 🍒 #8904

merged 3 commits into from
May 9, 2022

Conversation

OSBotify
Copy link
Contributor

@OSBotify OSBotify commented May 9, 2022

🍒 Cherry pick #8827 to staging 🍒

OSBotify and others added 2 commits May 9, 2022 16:37
@OSBotify
Merge pull request #8903 from Expensify/version-BUILD-51fb61808d84f4a…
19cd0ff 
…ae4c6cbb3f6875d43d355fbb5

Update version to 1.1.57-8 on main

(cherry picked from commit 919a384)
@marcaaron @OSBotify
Merge pull request #8827 from Expensify/marcaaron-fixSetTimeout
ac42e55 
Remove `setTimeout()`. Fix behavior of create menu.

(cherry picked from commit 334b989)
@OSBotify OSBotify requested a review from a team as a code owner May 9, 2022 16:37
@melvin-bot melvin-bot bot removed the request for review from a team May 9, 2022 16:37
@OSBotify
Copy link
Contributor Author

OSBotify commented May 9, 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.

Beamanator
Beamanator previously approved these changes May 9, 2022
View reviewed changes
@Beamanator Beamanator dismissed their stale review May 9, 2022 18:42

I don't deal with CPs often enough to approve / merge :D

@Beamanator Beamanator merged commit 2fd6d5a into staging May 9, 2022
@Beamanator Beamanator deleted the sketchydroide-cherry-pick-staging-8827 branch May 9, 2022 18:45
@OSBotify
Copy link
Contributor Author

OSBotify commented May 9, 2022

🚀 Cherry-picked to staging by @sketchydroide in version: 1.1.57-8 🚀

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

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

@chiragsalian chiragsalian mentioned this pull request May 10, 2022
Closed
@OSBotify
Copy link
Contributor Author

🚀 Deployed to production by @chiragsalian in version: 1.1.57-17 🚀

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

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

@Beamanator Beamanator Beamanator approved these changes

Assignees

@sketchydroide sketchydroide

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

Successfully merging this pull request may close these issues.
5 participants
@OSBotify @Beamanator @sketchydroide @marcaaron @chiragsalian