Skip to content

🍒 Cherry pick PR #13010 to staging 🍒#13016

Merged
luacmartins merged 3 commits intostagingfrom
OSBotify-cherry-pick-staging-13010
Nov 24, 2022
Merged

🍒 Cherry pick PR #13010 to staging 🍒#13016
luacmartins merged 3 commits intostagingfrom
OSBotify-cherry-pick-staging-13010

Conversation

@OSBotify
Copy link
Contributor

@OSBotify OSBotify commented Nov 24, 2022

🍒 Cherry pick #13010 to staging 🍒

OSBotify and others added 2 commits November 24, 2022 19:49
@OSBotify
Merge pull request #13015 from Expensify/version-BUILD-A4DA131A-D07F-…
5fca6fa 
…4008-B53C-DE418DFD042A

Update version to 1.2.31-6 on main

(cherry picked from commit dadb821)
@luacmartins @OSBotify
Merge pull request #13010 from margelo/@thomas/revert-fast-image
22b0b6f 
Revert "Merge pull request #12648 from margelo/@thomas/fast-image-cac…

(cherry picked from commit 01abc6f)
@OSBotify OSBotify requested a review from a team as a code owner November 24, 2022 19:49
@melvin-bot melvin-bot bot removed the request for review from a team November 24, 2022 19:49
@OSBotify
Copy link
Contributor Author

OSBotify commented Nov 24, 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.

@luacmartins
Copy link
Contributor

luacmartins commented Nov 24, 2022

Conflict resolved. Asking for a review here

@aldo-expensify aldo-expensify self-requested a review November 24, 2022 20:38
@luacmartins
Copy link
Contributor

luacmartins commented Nov 24, 2022

Gonna merge without a checklist since this is a small conflict resolution on the revert PR

@luacmartins luacmartins merged commit 0d1deaa into staging Nov 24, 2022
@luacmartins luacmartins deleted the OSBotify-cherry-pick-staging-13010 branch November 24, 2022 20:48
@OSBotify
Copy link
Contributor Author

OSBotify commented Nov 24, 2022

🚀 Cherry-picked to staging by @luacmartins in version: 1.2.31-6 🚀

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.

@OSBotify
Copy link
Contributor Author

OSBotify commented Jun 15, 2023

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

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.

@OSBotify
Copy link
Contributor Author

OSBotify commented Jun 16, 2023

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

@aldo-expensify aldo-expensify aldo-expensify 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 @luacmartins @aldo-expensify