Commit Graph
2216 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 926e5f10bc merged back the RC branch 2014-10-01 12:54:13 -07:00
Kohsuke Kawaguchi 357af23467 [maven-release-plugin] prepare for next development iteration 2014-10-01 10:39:00 -07:00
Kohsuke Kawaguchi 4ea483f233 [maven-release-plugin] prepare release jenkins-1.583 2014-10-01 10:39:00 -07:00
Kohsuke Kawaguchi 481f28b73f Merge remote-tracking branch 'security/security-rc' into rc 2014-10-01 10:06:37 -07:00
Kohsuke Kawaguchi 4a8f12b3f2 [maven-release-plugin] prepare for next development iteration 2014-09-28 14:01:28 -07:00
Kohsuke Kawaguchi 3c99828edf [maven-release-plugin] prepare release jenkins-1.582 2014-09-28 14:01:28 -07:00
Nicolas De Loof d54bc061b1 Merge branch 'JENKINS-24825' 2014-09-24 23:21:04 +02:00
Jesse Glick c04cdcd9f7 [FIXED JENKINS-22769] ItemListener callbacks should run as SYSTEM since they sometimes do ACL-checked calls. 2014-09-24 11:06:00 -04:00
Nicolas De Loof 8975b0e0b5 test case for JENKINS-24825 2014-09-24 16:59:37 +02:00
Jesse Glick 53958b8a33 Merge branch 'rc' into security-rc 2014-09-22 11:56:08 -04:00
Kohsuke Kawaguchi 9d4d0a0bce the trunk is toward 1.583-SNAPSHOT 2014-09-22 07:52:50 -07:00
Jesse Glick 8aafca039d Merge branch 'security' into security-rc
Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/java/hudson/security/ACL.java
	test/src/test/groovy/hudson/model/AbstractProjectTest.groovy
2014-09-18 10:32:00 -04:00
Jesse Glick 747238d898 Merge branch 'rc' into security-rc 2014-09-18 10:29:09 -04:00
Daniel Beck 3d25f57aa1 Merge pull request #1370 from DavidRuhmann/JENKINS-7478
[FIXED JENKINS-7478] Correct Line Endings for Batch Files
2014-09-17 16:22:40 +02:00
Daniel Beck f715fc7598 Merge pull request #620 from laurence-h/master
[FIXED JENKINS-15576] Label's Load Statistics queue length based on label assigned to job rather than to item in build queue.
2014-09-17 16:18:14 +02:00
Kohsuke Kawaguchi fb547c127e the trunk is toward 1.582-SNAPSHOT 2014-09-14 17:56:14 -07:00
Daniel Beck 852ba85c96 Merge pull request #1391 from daniel-beck/JENKINS-21881
[FIXED JENKINS-21881] System property for disabling X-Frame-Options
2014-09-13 14:14:37 +02:00
Daniel Beck 3b5564a4ab [JENKINS-21881] Add test 2014-09-07 19:23:26 +02:00
Kohsuke Kawaguchi 2e39af250a the trunk is toward 1.581-SNAPSHOT 2014-09-06 09:04:49 -07:00
Daniel Beck 9bc2f1d057 Merge pull request #1377 from daniel-beck/JENKINS-19764
[FIXED JENKINS-19764] Ensure parent dir of new builds dir exists.
2014-09-06 00:31:47 +02:00
Kohsuke Kawaguchi 54d44502bd [FIXED SECURITY-127]
CONFIGURE permission shouldn't allow the type of the job to be changed.
That's more of CREATE+DELETE.

In any case, the code doesn't correctly handling submitting config.xml
for a different type.
2014-09-02 16:12:47 -07:00
Kohsuke Kawaguchi db757116f1 [FIXED SECURITY-128]
It may be that the 'newName' exists and just not visible to the user trying to do a rename
2014-09-02 14:05:42 -07:00
Kohsuke Kawaguchi 1a4aef1172 the trunk is toward 1.580-SNAPSHOT 2014-09-01 08:21:17 -07:00
Jesse Glick c7cf218076 Merge branch 'security' into security-rc 2014-08-31 11:45:07 -04:00
Jesse Glick 9dec86501b Merge branch 'rc' into security-rc 2014-08-31 11:45:05 -04:00
Kohsuke Kawaguchi b1803a9539 [FIXED SECURITY-110]
Don't let UsernameNotFoundException vs BadCredentialsException
difference to be seen by the caller, for that tells whether the user
exists or not.

But to assist trouble-shooting, do report that error to the server. UUID
helps the user finds the information in the log file
2014-08-29 18:02:02 -07:00
Jesse Glick 52c28ae38d NPE diagnosis from ProjectTest.testCheckout.
java.lang.NullPointerException: null
	at hudson.model.AbstractBuild.setWorkspace(AbstractBuild.java:296)
	at hudson.model.ProjectTest.testCheckout(ProjectTest.java:423)
2014-08-29 20:01:13 -04:00
Jesse Glick bdc91654f6 [JENKINS-24317] Amending 80f78d5732.
If we are running on a case-insensitive FS, the test makes no sense because migration would never even be attempted to begin with.
2014-08-28 15:45:47 -04:00
tfennelly 80f78d5732 Fixing dir listing in test to not be case sensitive (related to JENKINS-24317) 2014-08-27 22:08:16 +01:00
Jesse Glick b3e57f8848 Better advertising createCrumbedUrl. 2014-08-25 12:06:19 -04:00
Kohsuke Kawaguchi 862cb04ca1 the trunk is toward 1.579-SNAPSHOT 2014-08-25 06:19:24 -07:00
David Ruhmann 67ac47af07 [FIXED JENKINS-7478]
Create Line Ending Conversion utility to convert scripts to proper OS
line ending type.  Tests included.
2014-08-24 21:48:35 -05:00
Jesse Glick 3f4eb3bfe2 Merge branch 'rc' into security-rc 2014-08-22 16:50:28 -04:00
Jesse Glick 2852afa96e comment 2014-08-22 16:49:23 -04:00
Jesse Glick fda6c2e387 Merge branch 'security' into security-rc 2014-08-22 16:48:04 -04:00
Jesse Glick f0a29b562e [FIXED SECURITY-155] Do not allow plugin code to be downloaded via doDynamic, only static resources. 2014-08-22 16:41:19 -04:00
Jesse Glick 31e5d10be0 Do not redirectTestOutputToFile when we are running an individual test (suite or case).
In this case we are probably interested in looking at the output as it arrives in real time.
Can always be overridden on the command line if desired.
(cherry picked from commit 44a8ec1104)
2014-08-22 16:21:20 -04:00
Daniel Beck 7f4014c740 [FIXED JENKINS-19764] Ensure parent dir of new builds dir exists. 2014-08-21 19:18:00 +02:00
tfennelly 830a5e7f61 [FIXED JENKINS-24316] Fixed unknown task icon src path construction
(cherry picked from commit 286337ea39)
2014-08-21 09:39:56 -04:00
Jesse Glick bce92ec53d [FIXED JENKINS-24317] Corrected user dir migration code from JENKINS-23872.
Adapted from #1375 by @daniel-beck: omitting change to User construction, and adding test.
(cherry picked from commit 088edabb31)

Conflicts:
	changelog.html
2014-08-21 08:44:18 -04:00
Jesse Glick 088edabb31 [FIXED JENKINS-24317] Corrected user dir migration code from JENKINS-23872.
Adapted from #1375 by @daniel-beck: omitting change to User construction, and adding test.
2014-08-21 08:00:59 -04:00
Jesse Glick 151e155338 Deleting empty test case. 2014-08-21 07:31:12 -04:00
Jesse Glick a623c8e30d Using proper @Issue annotation. 2014-08-20 19:18:20 -04:00
Jesse Glick 46ec7d8fa2 Merge branch 'security' into security-rc
Conflicts:
	core/src/main/java/hudson/Functions.java
	pom.xml
2014-08-20 19:14:23 -04:00
Jesse Glick 71a28615e3 [FIXED SECURITY-131] Recode restOfPath before constructing URLs from it, so it cannot be used for directory traversal. 2014-08-20 19:08:20 -04:00
tfennelly 286337ea39 [FIXED JENKINS-24316] Fixed unknown task icon src path construction 2014-08-20 23:19:13 +01:00
Kohsuke Kawaguchi 8a5d5d752b the trunk is toward 1.578-SNAPSHOT 2014-08-18 22:17:46 -07:00
Daniel Beck c869cfdc0e Merge pull request #1340 from daniel-beck/JENKINS-23988
[FIXED JENKINS-23988] Consider CLIAuthenticator for CLIMethods
2014-08-14 14:52:13 +02:00
Stephen Connolly debc588b30 when using a case sensitive strategy encoded users can appear 2014-08-12 15:36:38 +01:00
Jesse Glick 0cc333faf2 Adjusting test to match different input names (now form-bound). 2014-08-11 17:03:24 -04:00