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.

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

Revert "Merge pull request #75 from meedan/feb2924-revert" #76

Merged
merged 2 commits into from
Mar 4, 2024

Conversation

DGaffney
Copy link
Collaborator

@DGaffney DGaffney commented Mar 4, 2024

This reverts commit 341263b, reversing changes made to 3988bbd.

This reverts commit 341263b, reversing
changes made to 3988bbd.
Copy link
Contributor

@caiosba caiosba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DGaffney I would suggest reverting the code here to a branch cv2-4126-video instead of master, otherwise it's going to break develop and QA, no?

@DGaffney
Copy link
Collaborator Author

DGaffney commented Mar 4, 2024

@caiosba I think we want to just revert the changes we made at the end of the week - the stuff we added between cv2-4126-video and then were all useful and important - we just needed more time to verify it.

@caiosba
Copy link
Contributor

caiosba commented Mar 4, 2024

@caiosba I think we want to just revert the changes we made at the end of the week - the stuff we added between cv2-4126-video and then were all useful and important - we just needed more time to verify it.

Hum... this branch fails against the current develop of Alegre, Check API and Check Web: https://app.travis-ci.com/github/meedan/check-web/jobs/618673728. Should we rename this branch to cv2-4126-video to see if it passes? And then we merge everything at once?

@DGaffney DGaffney requested a review from caiosba March 4, 2024 21:30
Copy link
Contributor

@caiosba caiosba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I executed the integration tests against this branch and they passed: https://app.travis-ci.com/github/meedan/check-web/builds/269255049

:shipit:

@DGaffney DGaffney merged commit 0a149e3 into master Mar 4, 2024
2 checks passed
@DGaffney DGaffney deleted the undo-feb-29-revert branch March 4, 2024 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants