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

sync release-22.x -> release-23.x #3390

Merged
merged 2 commits into from
Jan 23, 2025

Conversation

brian-smith-tcril
Copy link
Contributor

Description

This is just a new branch created off of b2da298

The idea here is to get release-23.x updated to include everything from release-22.x before #3367 landed, so the conflict resolution needed to land those changes in release-23.x can be isolated.

Copy link

netlify bot commented Jan 23, 2025

Deploy Preview for paragon-openedx-v23 ready!

Name Link
🔨 Latest commit b2da298
🔍 Latest deploy log https://app.netlify.com/sites/paragon-openedx-v23/deploys/679255af297b75000854bdc7
😎 Deploy Preview https://deploy-preview-3390--paragon-openedx-v23.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@@ -19,7 +20,7 @@ const resetHandlerMocks = () => {
};

// eslint-disable-next-line react/prop-types
Copy link
Member

Choose a reason for hiding this comment

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

nit: is this eslint disable comment still relevant?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good question! It looks like it's still there on latest release-22.x as of writing

// eslint-disable-next-line react/prop-types

I made an issue to go through and clean up any of these we don't need #3391

@brian-smith-tcril brian-smith-tcril merged commit 2117eb6 into openedx:release-23.x Jan 23, 2025
20 checks passed
@openedx-semantic-release-bot

🎉 This PR is included in version 23.2.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants