-
-
Notifications
You must be signed in to change notification settings - Fork 8.7k
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
[JENKINS-60866][JENKINS-71515] Use JSON#parse
to process codemirror-config
argument
#6867
[JENKINS-60866][JENKINS-71515] Use JSON#parse
to process codemirror-config
argument
#6867
Conversation
I don't really see why I needed jenkinsci/antisamy-markup-formatter-plugin#91 to make the test pass, any ideas? |
Please take a moment and address the merge conflicts of your pull request. Thanks! |
What are the next steps for this PR? As far as I can tell jenkinsci/antisamy-markup-formatter-plugin#91 needs to be merged and released, then this PR needs to be updated to a non-incremental build of |
JSON#parse
to process codemirror-config
argument
Ideally I'd find the time to understand why this needs the plugin update despite the attempt at backwards compatibility. HTMLUnit throws at codemirror.js line 2246, and then
codeMirrorObject isn't set.
Otherwise this is just waiting for the plugin release, yes. |
How do we have a billion different linters and not one did tell me I'm redefining a variable?
With a passing test suite, this is looking close to ready (if not fully ready) from my perspective. Do others feel that the |
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 fine so far, maybe we can get a release of the antisamy-markup plugin soonish, but I wouldn't consider this as blocker, given the antisamy PR is up for review.
|
@NotMyFault I will ask someone (else than Daniel) from security team 👍 |
Thanks, just mentioned you, because Daniel requested your review initially. |
it was because of CSP topic :) but you did right, thanks 👍 |
Just in case, I don't think this should be merged yet. I haven't done the followup work for #6867 (comment) yet. So while I think this change is final and can be reviewed, I recommend we hold off merging. IIRC, this will break CodeMirror use in several plugins, most notably |
JSON#parse
to process codemirror-config
argumentJSON#parse
to process codemirror-config
argument
jenkinsci/cloudbees-feature-management-plugin#86 only has 40 installations, and everything else is merged and released, so are we ready to move forward with this? |
@basil Depends on your threshold for plugin popularity. Based on the notes I took ~2 yrs ago, |
While I appreciate the desire for perfection here, perhaps we are falling into analysis paralysis and letting "perfect" be the enemy of "good enough." The value of shipping code is far higher than the value of non-shipping code, and the cost of old PRs is high (including the cost of retesting), so I think we should take it out of draft and ship it in weekly (especially since we are early in an LTS cycle). Whatever minor issues remain can be dealt with if and when they come up. |
Passing ATH: jenkinsci/acceptance-test-harness#1748 |
Passing PCT: jenkinsci/bom#3651 |
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.
This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback. Please see the merge process documentation for more information about the merge process. Thanks!
See JENKINS-60866.
jenkinsci/antisamy-markup-formatter-plugin#91 would be nice to have, but not necessary.
Strictly speaking, this "just" makes the code behave as documented at
jenkins/core/src/main/resources/lib/form/textarea.jelly
Lines 68 to 71 in d977ee8
mode
).Proposed changelog entries
MarkupFormatter#getCodemirrorConfig
/ provided tocodemirror-config
inf:textarea
.Proposed upgrade guidelines
N/A
Submitter checklist
Proposed changelog entries
section only if there are breaking changes or other changes which may require extra steps from users during the upgrade@Restricted
or have@since TODO
Javadoc, as appropriate.@Deprecated(since = "TODO")
or@Deprecated(forRemoval = true, since = "TODO")
if applicable.Desired reviewers
@mention
Maintainer checklist
Before the changes are marked as
ready-for-merge
:Proposed changelog entries
are accurate, human-readable, and in the imperative moodupgrade-guide-needed
label is set and there is aProposed upgrade guidelines
section in the PR title. (example)lts-candidate
to be considered (see query).