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,651 Commits 58 Branches 1,942 Tags
3cd241eda67c0bcb0c0c00a2f547ecf48e8a2f78
Commit Graph
2269 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi bf736a7407 [maven-release-plugin] prepare for next development iteration 2014-10-29 18:10:06 -07:00
Kohsuke Kawaguchi b3660bf84e [maven-release-plugin] prepare release jenkins-1.587 2014-10-29 18:10:06 -07:00
Jesse Glick 8c10c75d85 Merge branch 'security-rc' into SECURITY-144-rc 2014-10-28 11:20:25 -04:00
Jesse Glick f0658e233d Merge branch 'security-rc' into SECURITY-144-rc 
Conflicts:
	core/src/main/java/hudson/FilePath.java
 2014-10-26 13:55:39 -07:00
Jesse Glick 12f5dec0ed junit 1.2-beta-3 2014-10-25 15:39:08 -07:00
Jesse Glick 97b2f931ae Merge branch 'SECURITY-144' into SECURITY-144-rc 2014-10-20 08:57:11 -04:00
Kohsuke Kawaguchi 0fa32eac4e the trunk is toward 1.587-SNAPSHOT 2014-10-19 21:51:18 -07:00
Kohsuke Kawaguchi b4c2a1392b Now that the default is off, test has to activate this explicitly 2014-10-18 22:42:08 -07:00
Kohsuke Kawaguchi b4ffb2d01b More follow-up renames 2014-10-18 19:47:19 -07:00
Jesse Glick 32376946b8 Merge branch 'SECURITY-144' into SECURITY-144-rc 
Conflicts:
	core/src/main/java/hudson/FilePath.java
 2014-10-16 13:18:39 -04:00
Jesse Glick ccbe96227f Merge branch 'security-rc' into SECURITY-144-rc 
Conflicts:
	core/src/main/java/hudson/FilePath.java
	pom.xml
 2014-10-16 13:18:08 -04:00
Jesse Glick b3bb0b8ae4 FilePath.untar, as called by jenkins-clone-workspace-scm-plugin, was also broken. 
.tar and .zip seem OK.
 2014-10-15 18:24:30 -04:00
Jesse Glick f39c2f1ba2 Renamed to more appropriate package. 2014-10-15 18:05:16 -04:00
Jesse Glick d7abde81d3 Reproduced FilePath.unzip problem from chromedriver-plugin in test. 2014-10-15 16:36:41 -04:00
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
Kohsuke Kawaguchi 0bd2ea1808 the trunk is toward 1.586-SNAPSHOT 2014-10-12 20:00:16 -07: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
Kohsuke Kawaguchi 02302d4857 the trunk is toward 1.585-SNAPSHOT 2014-10-06 07:56:32 -07: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
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
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
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
Jesse Glick 85f356bc5f Forgotten compilability fix. 
(cherry picked from commit 20e5d06280fcce471abfdcc1921bd607c6a1f4df)
 2014-09-26 17:33:36 -04:00
Jesse Glick 89cbfc4639 Merge branch 'SECURITY-144' into SECURITY-144-rc 
Conflicts:
	core/src/main/java/hudson/EnvVars.java
	core/src/main/java/hudson/FilePath.java
	core/src/main/java/hudson/cli/ClientAuthenticationCache.java
	core/src/main/java/hudson/markup/MyspacePolicy.java
	core/src/main/java/hudson/model/Computer.java
	core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
	core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
	core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java
	core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
	core/src/main/java/hudson/slaves/Channels.java
	core/src/main/java/hudson/slaves/SlaveComputer.java
	core/src/main/java/hudson/tasks/Fingerprinter.java
	core/src/main/java/hudson/tasks/Shell.java
	core/src/main/java/hudson/tasks/junit/JUnitParser.java
	core/src/main/java/hudson/tasks/test/DefaultTestResultParserImpl.java
	core/src/main/java/hudson/util/ProcessTree.java
	core/src/main/java/hudson/util/RemotingDiagnostics.java
	core/src/main/java/jenkins/model/Jenkins.java
	core/src/test/java/hudson/LauncherTest.java
	pom.xml
	test/src/test/java/hudson/tasks/junit/CaseResultTest.java
 2014-09-26 15:56:48 -04:00
Jesse Glick 4f736a9334 Merge branch 'security' into SECURITY-144 2014-09-25 13:30:42 -04:00
Jesse Glick 3ba17df3b3 Moving one test case to maven-plugin. 
(cherry picked from commit 261f40533e)
 2014-09-25 13:30:33 -04:00
Jesse Glick 7af7fbb0fc Merge branch 'security' into SECURITY-144 2014-09-25 10:08:34 -04:00
Jesse Glick 5612b235ef Moving hudson.maven tests to maven-plugin. 
(cherry picked from commit facfc178df)
 2014-09-25 10:08:18 -04:00
Nicolas De Loof d54bc061b1 Merge branch 'JENKINS-24825' 2014-09-24 23:21:04 +02:00
Kohsuke Kawaguchi 1e40aa5805 Expand the test to cover diagnostic stack trace 2014-09-24 11:46:22 -07:00
Kohsuke Kawaguchi 201b035cfc Updated to reflect the signature change around role checking in remoting 2014-09-24 09:43:31 -07: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
Kohsuke Kawaguchi ffb5b65093 Switched from annotation based scheme to a function based scheme. 2014-09-23 19:12:43 -07:00
Jesse Glick 14d33d4ba4 Demonstrating that local FilePath operations within a slave callable are unaffected by FilePathFilter. 
This is because we are not installing a filter on the reverse channel.
 2014-09-23 16:05:10 -04:00
Jesse Glick cf36145eed Merge branch 'security' into SECURITY-144 2014-09-23 10:17:23 -04:00
Jesse Glick 1d29041372 [JENKINS-21984] Disabling cert check on updateDirectlyWithJson since the certificate is now expired, and it is no good to have a test which is known to start failing at a particular time in the future! 
(cherry picked from commit 334ce1be69)
 2014-09-23 09:59:01 -04:00
Jesse Glick 1e8076d569 The jenkins_main_trunk job has been retired, so for now just skip these tests when running on any Jenkins server. 
(cherry picked from commit b7d4c6a414)

Conflicts:
	test/src/test/groovy/hudson/cli/BuildCommandTest.groovy
 2014-09-23 09:56:19 -04:00