OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-14 04:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,473 Commits 58 Branches 1,942 Tags
changes/282
Commit Graph
1646 Commits
Author SHA1 Message Date
Kenneth Garland e168f4d4c9 Changed wording for command line message. 2014-10-15 14:26:05 -04:00
Daniel Beck d5d47edae4 Merge branch 'master' of https://github.com/jenkinsci/jenkins into JENKINS-3539 
Conflicts:
	test/src/test/java/hudson/model/ParametersTest.java
 2014-10-15 01:13:45 +02:00
Daniel Beck 190f0b6faf [FIXED JENKINS-3539] Prevent empty file creation if left empty 2014-10-15 00:33:49 +02:00
Oliver Gondža 75f5d2180f [JENKINS-11543] Unit test 2014-10-13 22:03:13 +02:00
Harald Albers aeec1394f1 Merge pull request #1417 from bkmeneguello/portuguese-translation 
Lots of translations and some typo fixes
 2014-10-10 22:13:23 +02:00
Jesse Glick ef6c042447 Merge branch 'JENKINS-24763' of github.com:recampbell/jenkins 2014-10-10 15:28:58 -04:00
Jesse Glick c8b6f12784 Merge pull request #1414 from mattmoor/master 
Convert AbstractProject to better utilize structure form submission.
 2014-10-08 00:32:57 -04:00
Jesse Glick 0adf979c4a [FIXED JENKINS-10450] Use 404 status code for noWorkspace.jelly. 2014-10-07 23:33:30 -04:00
Bruno Kühnen Meneguello d6b4a69b81 Lots of translations and some typo fixes 2014-10-07 09:51:19 -03:00
Jesse Glick 383b90eaf5 waitUntilNoActivityUpTo should list OneOffExecutable.executor if that is the problem. 2014-10-03 16:31:03 -04:00
Jesse Glick c4c55d1c03 waitUntilNoActivityUpTo should also produce a thread dump (despite 80da8f2). 2014-10-03 16:00:56 -04:00
Kohsuke Kawaguchi 926e5f10bc merged back the RC branch 2014-10-01 12:54:13 -07:00
Matt Moore eec43983a3 This change converts several optionalBlock's wrapping a single field to inline="true". 
By converting several optionalBlock entries to use inline="true", we convert the submitted JSON from:
   "hasPropertyFoo": {
     "propertyFoo": "value"
   },

which is a somewhat unnatural naming scheme, to:
   "hasPropertyFoo": true,
   "propertyFoo": "value",

This enables us to use the pattern:
   if(json.optBoolean("hasPropertyFoo", json.has("propertyFoo"))) {
     ...
   }

To permit either of the following as JSON blobs, for specifying a value for "propertyFoo":
1) "hasPropertyFoo": true,            # What comes through from jelly
   "propertyFoo": "value",

2) "propertyFoo": "value",

It also allows any of the following as JSON blobs, for NOT specifying a value for "propertyFoo":
3) "hasPropertyFoo": false,           # What comes through from jelly
   "propertyFoo": "value",

4) "hasPropertyFoo": false,

5) (nothing specified)

NOTE: The main interest in flexibility in what JSON comes through is in support of: https://wiki.jenkins-ci.org/display/JENKINS/YAML+Project+Plugin, this is also the purpose of the couple renames that are mixed in with this.
 2014-09-29 09:36:19 -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
Ryan Campbell 43c4a86a3d Improve naming of test 2014-09-20 13:13:34 -05:00
Ryan Campbell 2e446fd936 Cleanup test file 2014-09-20 13:13:27 -05:00
Ryan Campbell 423b51a43a [JENKINS-24763] Prevent thread starvation in OldDataMonitor by reducing scope of synchronization 2014-09-20 12:13:59 -05: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
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
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
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
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
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