Commit Graph
17830 Commits
Author SHA1 Message Date
Jesse Glick f360ce3ee0 Javadoc for Queue.Task claimed they were compared using .equals(), but in critical cases this was not actually true.
Does not matter for the common case of Job, but when implementing custom tasks this could cause duplicate queue items (and executables).
builds/44 changes/44
2014-02-20 11:05:32 -05:00
Olivier Lamy a72188213e really a pain to have those files in the scm, I always have those to commit 2014-02-20 22:59:35 +11:00
Jesse Glick b09f828706 [JENKINS-21159] Noting #663 merge. builds/42 builds/43 changes/42 changes/43 2014-02-18 18:25:16 -05:00
Jesse Glick 20c4b06f8c Merge branch 'master_g' of github.com:ialbors/jenkins
[FIXED JENKINS-21159] Merged #663.
2014-02-18 18:10:17 -05:00
Jesse Glick 2ae83f6ab0 Corrected a (now-)misleading comment.
JENKINS-20618 diagnostics (also in 1.532.2) are on top of jzlib 1.1.3.
builds/41 changes/41
2014-02-18 09:32:31 -05:00
Harald Albers 3d5baf60c4 improved description of EscapedMarkupFormatter
also made its display name localizable
2014-02-18 11:37:56 +01:00
Jesse Glick cf3c157d74 Unused imports. builds/40 changes/40 2014-02-17 15:12:05 -05:00
Jesse Glick 6a205a9495 Senseless for the state field to be protected when the enum used for its type is private: no subtype could use it anyway. 2014-02-17 14:34:57 -05:00
Jesse Glick a22d914a0e Javadoc improvements. 2014-02-17 14:33:42 -05:00
Jesse Glick f268d3ba3d Merge branch 'master' of git://github.com/jenkinsci/jenkins 2014-02-17 13:58:13 -05:00
Daniel Beck 1b17335645 Update Javadoc for PR #1124 2014-02-17 19:24:09 +01:00
Daniel Beck 9856477ffe Update Javadoc for PR #1124 2014-02-17 19:23:37 +01:00
Jesse Glick b2c69b4a35 Split RawHtmlMarkupFormatter into a bundled plugin (antisamy-markup-formatter).
https://trello.com/c/NvZt4WXu/15-rawhtmlmarkupformatter
builds/39 changes/39
2014-02-17 12:22:53 -05:00
Daniel Beck 389a3bcf6a Merge pull request #1124 from daniel-beck/fix-autocompletion-for-folders
Fix autocompletion for items in folders
2014-02-16 21:00:47 +01:00
Daniel Beck 9454f92989 Merge pull request #1123 from daniel-beck/fix-build-deletion
Revert 33db54459a
2014-02-16 20:58:52 +01:00
Kohsuke Kawaguchi 279a46c66a Merge remote-tracking branch 'origin/rc' 2014-02-14 19:34:18 -08:00
Kohsuke Kawaguchi f99d62cdb9 Record security fixes 2014-02-14 19:31:31 -08:00
Kohsuke Kawaguchi 536f6a10c5 Merge branch 'master' of github.com:jenkinsci/jenkins 2014-02-14 19:29:53 -08:00
Kohsuke Kawaguchi 2e1d9f28fe the trunk is toward 1.553-SNAPSHOT 2014-02-14 18:31:51 -08:00
Kohsuke Kawaguchi fa12eed9c4 creating an RC branch 2014-02-14 18:31:46 -08:00
Kohsuke Kawaguchi 8901dbe49c Exposing it outside 2014-02-14 18:29:21 -08:00
Kohsuke Kawaguchi 411c3cfecb [JENKINS-21261]
plugin might erranously put null into the collection, so filter them out
2014-02-14 18:29:21 -08:00
Kohsuke Kawaguchi b87b1f1799 made the content type customizable 2014-02-14 18:29:21 -08:00
Kohsuke Kawaguchi c88698c0af [JENKINS-21261] while I originally misdiagnosed the problem, the test is still marginally useful. 2014-02-14 18:29:21 -08:00
Kohsuke Kawaguchi bc806ccc27 typo 2014-02-14 18:29:21 -08:00
Kohsuke Kawaguchi bdd8ca3fe4 merged back the RC branch 2014-02-14 16:34:44 -08:00
Kohsuke Kawaguchi ab36f4b898 updated changelog as a part of the release 2014-02-14 16:34:38 -08:00
Kohsuke Kawaguchi bddaf85a57 updated changelog for release 2014-02-14 15:50:47 -08:00
Kohsuke Kawaguchi 659aa543b0 [maven-release-plugin] prepare for next development iteration 2014-02-14 15:42:27 -08:00
Kohsuke Kawaguchi 2ba3eb60d6 [maven-release-plugin] prepare release jenkins-1.551 jenkins-1.551 2014-02-14 15:42:26 -08:00
Jesse Glick 724f9e0dfc Strengthening the reverse proxy admin monitor to detect nontransparent slash encoding (/ vs. %2F).
Apache in its default configuration botches this: http://stackoverflow.com/a/9933890/12916
builds/37 changes/37
2014-02-13 15:04:32 -05:00
Jesse Glick 408e2acace Merge branch 'security' into security-rc 2014-02-12 09:59:34 -05:00
Jesse Glick d030fbbaee [FIXED SECURITY-105] Disabling DynamicProxyConverter. 2014-02-12 09:56:21 -05:00
Vojtech Juranek c528b95c51 Add changelog record for PR #1127 2014-02-12 09:22:15 +01:00
Daniel Beck 237dda40e0 [FIXED JENKINS-21772] Only cache CLI credentials in ~/.hudson if it exists. 2014-02-12 09:18:19 +01:00
Vojtech Juranek 6e8278bb64 Add changelog recoed for PR #1128 2014-02-12 09:17:25 +01:00
Daniel Beck 917ea81636 [FIXED JENKINS-21778] Fix sidepanel links so they don't break from Actions 2014-02-12 09:15:16 +01:00
Daniel Beck 08a96df6b6 [FIXED JENKINS-21777] Actions contributing to Labels' index page 2014-02-12 09:13:42 +01:00
Jesse Glick abc77438d2 Merge branch 'security' into security-rc
Conflicts:
	core/src/main/java/hudson/Functions.java
	core/src/main/java/hudson/markup/MyspacePolicy.java
	core/src/main/java/hudson/util/RobustReflectionConverter.java
	core/src/main/resources/lib/layout/layout.jelly
	war/pom.xml
2014-02-11 21:00:54 -05:00
Jesse Glick 3c2f5046c0 Revert "Warn user when plugin dependencies don't match"
This reverts commit 2d40b7e7e9.
builds/36 changes/36
2014-02-11 19:12:58 -05:00
Jesse Glick 58ff576f0a Revert "Use dedicated exceptions to track incompatible/missing plugin"
This reverts commit b32d0e4f74.
2014-02-11 19:12:57 -05:00
Jesse Glick 3e9c732782 Revert "minor simplification"
This reverts commit 6a31d6ebb4.
2014-02-11 19:12:56 -05:00
Jesse Glick d61965bebc Revert "groovy null-safe operation, I miss you."
This reverts commit 037393c28a.
2014-02-11 19:12:52 -05:00
Jesse Glick d577c0850d [FIXED JENKINS-21780] DirectoryBrowserSupport.FileComparator should cache isDirectory calls. 2014-02-11 19:07:28 -05:00
Jesse Glick 70a197fb56 When printing AbstractBuild.BuildingRemotely message to log, also indicate any (non-self) labels of the node.
This is invaluable when diagnosing problems with a build on a cloud slave after the slave has been deprovisioned.
If the node name by itself does not indicate what type of machine it was, you would have a hard time guessing.
2014-02-11 18:26:07 -05:00
Jesse Glick 7541e83cc9 [SECURITY-76] [SECURITY-88] Adjust test to policy changes. 2014-02-11 17:29:05 -05:00
Jesse Glick b6b2a367a7 [FIXED SECURITY-109] SECURITY-55 fix to BuildTrigger configuration failed if downstream project was not visible. 2014-02-11 14:22:46 -05:00
Vojtech Juranek ad38d8480f [FIXED SECURITY-108] Check job name created via CLI 2014-02-11 14:22:39 -05:00
Jesse Glick 622e39f8b4 [FIXED SECURITY-107] When security-related fields in Jenkins cannot be unmarshaled, it is best to halt startup. 2014-02-11 14:22:26 -05:00
Jesse Glick 29351af4bd [FIXED SECURITY-106] Jenkins on Winstone vulnerable to session hijacking. 2014-02-11 14:20:38 -05:00