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 #4807 to staging 🍒 #4814

Merged
merged 3 commits into from
Aug 25, 2021
Merged

🍒 Cherry pick PR #4807 to staging 🍒 #4814

merged 3 commits into from
Aug 25, 2021

Conversation

OSBotify
Copy link
Contributor

🍒 Cherry pick #4807 to staging 🍒

OSBotify and others added 2 commits August 25, 2021 01:46
@OSBotify
Merge pull request #4813 from Expensify/version-BUILD-4112656054881a9…
0339a83 
…3b935b3d1d3dcc95440d3fedb

(cherry picked from commit 5e883f3)
@aldo-expensify
Merge pull request #4807 from Expensify/aldo_fix-android-input-value-…
60db5fa 
…with-error

Remove unnecessary style causing bug in android

(cherry picked from commit 4112656)
@OSBotify OSBotify requested a review from a team as a code owner August 25, 2021 01:46
@MelvinBot MelvinBot removed the request for review from a team August 25, 2021 01:46
@OSBotify
Copy link
Contributor Author

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.

@aldo-expensify
Copy link
Contributor

aldo-expensify commented Aug 25, 2021 •
edited
Loading

This PR got stuck because there were some changes in main that are not in the staging branch.

Update: Fixed merge conflicts

@aldo-expensify aldo-expensify requested a review from a team August 25, 2021 02:16
@MelvinBot MelvinBot requested review from nickmurray47 and removed request for a team August 25, 2021 02:16
@aldo-expensify aldo-expensify mentioned this pull request Aug 25, 2021
Merged
5 tasks
@roryabraham
Copy link
Contributor

@nickmurray47 I'm going to go ahead and merge this to move the deploys along.

@roryabraham roryabraham merged commit 149a736 into staging Aug 25, 2021
@roryabraham roryabraham deleted the OSBotify-cherry-pick-staging-4807 branch August 25, 2021 17:09
@roryabraham
Copy link
Contributor

@aldo-expensify This is being deployed here

@aldo-expensify
Copy link
Contributor

Thanks @roryabraham !

@OSBotify
Copy link
Contributor Author

🚀 Deployed to production by @roryabraham in version: 1.0.86-11 🚀

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

@OSBotify
Copy link
Contributor Author

🚀 Cherry-picked to staging by @roryabraham in version: 1.0.86-11 🚀

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.

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

@nickmurray47 nickmurray47 Awaiting requested review from nickmurray47

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

Successfully merging this pull request may close these issues.
3 participants
@OSBotify @aldo-expensify @roryabraham