-
Notifications
You must be signed in to change notification settings - Fork 121
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
fix: selectively disable TLS #781
base: main
Are you sure you want to change the base?
Conversation
✅ Deploy Preview for endearing-brigadeiros-63f9d0 ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
@YongNotYoung - great PR 👍 Are you able to sign the CLA via EasyCLA and we can get this merged? |
src/config/index.js
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like there has been a bit of a merge conflict on this file. We want to ensure we keep everything plugins
related 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! 🍰 Just need to resolve the merge conflict in src/config/index.js
.
@coopernetes - would be good to get your eyes on this as well.
Hey @JamieSlome, thanks for the review We need to sort out some admin stuff before we'll be able to sign the CLA, but once we get it done, we'll be able to sign it and push the fixes for the merge conflicts |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One small suggested change. Merge conflict needs to be resolved to preserve the plugins
configuration property.
@YongNotYoung can you please resolve the conflicts on package-lock.json? Then this is good to merge 👍 |
Signed-off-by: Thomas Cooper <[email protected]>
closes #658