Commit Graph
32590 Commits
Author SHA1 Message Date
Christopher Simons ba41d967d7 TaskAction.getIconFileName: fix @inheritDoc 2015-11-05 14:42:30 -05:00
Christopher Simons d486b25c2e AnnotatedLargeText.writeLogTo: fix @inheritDoc 2015-11-05 14:42:00 -05:00
Daniel Beck 3450b52a8a [FIX JENKINS-31015] Prevent InvalidPathException in FileVF 2015-11-05 18:51:57 +01:00
Daniel Beck a2d9b797ec Merge pull request #1896 from Wilfred/jenkins-31217
JENKINS-31217 Treat null as a default JDK name.
2015-11-05 17:22:10 +01:00
Jesse Glick 58347e09aa Merge pull request #42 from varmenise/security-186-testFailures
[security-186] getElementByTagName does not work
2015-11-05 09:33:34 -05:00
Jesse Glick 16638e8992 Merge pull request #43 from jenkinsci-cert/SECURITY-200-to-security-stable
Integrate Security 200 to security stable
2015-11-05 09:33:15 -05:00
Kohsuke Kawaguchi 505fde0012 Partially rolling back 1fc76398c8
The intended change was just the POM change, and my other experiment
crept in.
builds/369 changes/369
2015-11-05 06:22:28 -08:00
Jesse Glick 52c7ca45da Adding a warning to Javadoc. 2015-11-05 09:13:14 -05:00
Oleg Nenashev fe914132a4 Merge pull request #1898 from csimons/add-missing-Overrides
add missing @Override annotations
2015-11-05 14:59:55 +01:00
Oleg Nenashev a1b0c3a484 Merge branch 'security-stable-1.625' into security-master
Conflicts:
	test/src/test/java/jenkins/security/ApiTokenPropertyTest.java
2015-11-05 14:45:14 +01:00
Jesse Glick e77aa43b70 Strengthening test case slightly to verify that the security exception is the expected one. 2015-11-05 07:47:23 -05:00
Jesse Glick 1449f45284 For some reason secrets/master.key is not present during a CI build, though it is locally. 2015-11-05 07:13:30 -05:00
Valentina Armenise 4a72e938d5 [security-186] getElementByTagName does not work 2015-11-05 11:44:01 +01:00
Jesse Glick b2139cc8d3 Merge branch 'master' into security-master 2015-11-04 18:23:56 -05:00
Jesse Glick 161b0ac69c Merge branch 'stable-1.625' 2015-11-04 18:23:42 -05:00
Jesse Glick d0d728981a Merge branch 'security-stable-1.609' into security-stable-1.625 2015-11-04 18:20:43 -05:00
Jesse Glick 555f12a95c Merge pull request #40 from jenkinsci-cert/SECURITY-200-integration
[SECURITY-200] integration of security-stable-1.625 and stable-1.625
2015-11-04 18:08:54 -05:00
Jesse Glick 054a329c59 [SECURITY-206] Need to call ChannelConfigurator on JNLP slave channels. 2015-11-04 17:40:20 -05:00
Oleg Nenashev 6f1982982b [SECURITY-192] - Migrate the unit tests to the new HtmlUnit version 2015-11-04 23:18:05 +01:00
Oleg Nenashev 0cc7d3f580 Merge branch 'stable-1.625' into security-stable-1.625
Conflicts:
	test/src/test/java/jenkins/security/ApiTokenPropertyTest.java
2015-11-04 22:41:18 +01:00
CloudBees DEV@Cloud 76eac3b3e2 Merge commit '1fc76398c804f72600a534edc5ebe7899f61a7f2' builds/368 2015-11-04 18:26:10 +00:00
Kohsuke Kawaguchi 1fc76398c8 Using the latest version changes/368 2015-11-04 10:22:48 -08:00
Jesse Glick 99dc53d3bb Merge pull request #1899 from jglick/PropertiesTestSuite
Verify that *.properties do not have duplicated keys
2015-11-04 11:28:34 -05:00
Jesse Glick e5fe193b96 Merge branch 'security-stable-1.596' into security-stable-1.609 2015-11-04 11:22:31 -05:00
Jesse Glick b17077b098 Merge branch 'security-stable-1.580' into security-stable-1.596 2015-11-04 11:22:07 -05:00
Jesse Glick 574a0e7a06 Merge pull request #39 from varmenise/followup-security-186
[security-186]fix relative path
2015-11-04 11:15:44 -05:00
Valentina Armenise 33b55588a6 [security-186]fix relative path 2015-11-04 16:25:33 +01:00
Vincent Latombe 5a67c74ce5 Merge pull request #1902 from Vlatombe/jenkinsrule_compare_null_field_list
Fix a NPE while trying to compare two data bound beans with null Iterable field.
2015-11-04 14:04:40 +01:00
Vincent Latombe 3909f5acc4 Fix a NPE while trying to compare two data bound beans with null
Iterable field.
2015-11-04 10:56:32 +01:00
Kohsuke Kawaguchi 2d01be2e3c Merge branch 'security-stable-1.596' into security-stable-1.609 2015-11-03 21:08:23 -08:00
Kohsuke Kawaguchi ca2b4ad0be Merge branch 'security-stable-1.580' into security-stable-1.596 2015-11-03 20:41:51 -08:00
Kohsuke Kawaguchi 1addc5d0fe Merge pull request #37 from jenkinsci-cert/SECURITY-214
[SECURITY-214] OfflineCause.toString() is a string, not necessarily HTML
2015-11-03 20:38:50 -08:00
Kohsuke Kawaguchi abe561499b [SECURITY-214] OfflineCause.toString() is a string, not necessarily HTML 2015-11-03 19:46:28 -08:00
Jesse Glick 2349c512e9 Merge pull request #36 from varmenise/security-184-solveTestIssue
[security-184] solve NPE in test
2015-11-03 19:18:47 -05:00
Christopher Simons 831064c64d IdStrategy: add missing @Override annotations 2015-11-03 18:18:47 -05:00
Christopher Simons 1286544885 BuildStepCompatibilityLayer: add @Override 2015-11-03 18:18:47 -05:00
Christopher Simons 457c74888c ComputerRetentionWork: add missing @Override 2015-11-03 18:18:47 -05:00
Christopher Simons 0179b31909 CrumbFilter: add missing @Override annotation 2015-11-03 18:18:47 -05:00
Christopher Simons 481dfb42fb SecurityRealm: add missing @Override annotation 2015-11-03 18:18:47 -05:00
Christopher Simons f2845ba7df ParameterDefinition: add missing @Override 2015-11-03 18:18:47 -05:00
Christopher Simons caa57ae72b ManagementLink: add missing @Override annotation 2015-11-03 18:18:47 -05:00
Christopher Simons 7afa398800 JobProperty: add missing @Override annotations 2015-11-03 18:18:46 -05:00
Christopher Simons bbf5c957b9 HealthReport: add missing @Override annotation 2015-11-03 18:18:46 -05:00
Christopher Simons 67a42ea4b6 Computer: add missing @Override annotations 2015-11-03 18:18:39 -05:00
Christopher Simons 4da65f52ac AbstractProject: add missing @Override 2015-11-03 16:51:59 -05:00
Christopher Simons 6bc26d1e90 AbstractDescribableImpl: add missing @Override 2015-11-03 16:51:59 -05:00
Christopher Simons a8789db91f AnnotatedLargeText: remove invalid @inheritDoc 2015-11-03 16:50:38 -05:00
Jesse Glick 83ac817b50 Merge pull request #1900 from jglick/CommandLauncherTest-RandomlyFails
Another random failure
2015-11-03 14:47:49 -05:00
Valentina Armenise 6d15072f04 [security-184] solve NPE in testHandleTakeover 2015-11-03 20:08:14 +01:00
Jesse Glick b0003b196c Another random failure. 2015-11-03 11:27:49 -05:00