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

Revert "fix: Use new ResolveDuplicates when approver is resolving duplicates" #49953

Merged
merged 1 commit into from
Sep 30, 2024
Merged

Revert "fix: Use new ResolveDuplicates when approver is resolving duplicates" #49953

merged 1 commit into from
Sep 30, 2024
+77 −201

Conversation

neil-marcellini
Copy link
Contributor

@neil-marcellini neil-marcellini commented Sep 30, 2024 •
edited
Loading

Straight revert of #48522

Fixed Issues

$ #49900
PROPOSAL: N/A

Tests

Screen.Recording.2024-09-30.at.12.00.10.PM.mov

@neil-marcellini neil-marcellini self-assigned this Sep 30, 2024
@neil-marcellini neil-marcellini marked this pull request as ready for review September 30, 2024 19:02
@neil-marcellini neil-marcellini requested a review from a team as a code owner September 30, 2024 19:02
@melvin-bot melvin-bot bot requested review from dukenv0307 and removed request for a team September 30, 2024 19:02
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Sep 30, 2024

@dukenv0307 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@neil-marcellini neil-marcellini added the CP Staging marks PRs that have been CP'd to staging label Sep 30, 2024
@neil-marcellini neil-marcellini removed the request for review from dukenv0307 September 30, 2024 19:03
@jasperhuangg
Copy link
Contributor

This is a straight revert

@jasperhuangg jasperhuangg merged commit 2733991 into main Sep 30, 2024
13 of 17 checks passed
@jasperhuangg jasperhuangg deleted the revert-48522-fix/48416 branch September 30, 2024 19:11
@melvin-bot melvin-bot bot added the Emergency label Sep 30, 2024
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Sep 30, 2024

@jasperhuangg looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

OSBotify pushed a commit that referenced this pull request Sep 30, 2024
@jasperhuangg @OSBotify
Merge pull request #49953 from Expensify/revert-48522-fix/48416
4d164a6 
Revert "fix: Use new ResolveDuplicates when approver is resolving duplicates"

(cherry picked from commit 2733991)

(CP triggered by jasperhuangg)
@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@github-actions github-actions bot mentioned this pull request Sep 30, 2024
Closed
@github-actions GitHub Actions
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/jasperhuangg in version: 9.0.41-9 🚀

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.

@jasperhuangg jasperhuangg mentioned this pull request Sep 30, 2024
Closed
6 tasks
@github-actions GitHub Actions
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/jasperhuangg in version: 9.0.41-10 🚀

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.

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.41-10 🚀

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

@jasperhuangg jasperhuangg jasperhuangg approved these changes

Assignees

@neil-marcellini neil-marcellini

Labels
CP Staging marks PRs that have been CP'd to staging
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@neil-marcellini @jasperhuangg @OSBotify