OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 13:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,590 Commits 55 Branches 1,942 Tags
1e646ff7ee52ecbbca3d7957b65fb4edfd39d653
Commit Graph
32590 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Baptiste Mathus ff36adf0d2 [JENKINS-44052] Document & fix intended behaviour (#3043) 
* [JENKINS-44052] Document & fix intended behaviour

The unit was actually ignored...

* Add tests for getTimeInSeconds
 2017-10-01 12:54:22 +03:00
Oleg Nenashev fbaa059cf0 Merge pull request #3028 from daniel-beck/JENKINS-45472 
[JENKINS-45472] Copy the list in case it's reused elsewhere
 2017-10-01 12:16:38 +03:00
Alex 7e6db154c7 Fix the race condtion in QueueTaskDispatcherTest 2017-09-29 22:57:43 +02:00
Jesse Glick 781bc20d56 Try to avoid test hangs. 2017-09-29 14:29:02 -04:00
Jesse Glick f2ac41e975 Merge pull request #3053 from jglick/JTH 
jenkins-test-harness 2.28
 2017-09-29 11:07:59 -04:00
Jesse Glick 359d7db979 Merge branch 'security-stable-2.73' into security-master 2017-09-29 09:43:08 -04:00
Jesse Glick e1dc14b881 Merge branch 'master' of git://github.com/jenkinsci/jenkins 2017-09-29 09:42:55 -04:00
Jesse Glick a14e62539f Merge branch 'security-stable-2.60' into security-stable-2.73 2017-09-29 09:42:45 -04:00
Jesse Glick 74e9aa696d Merge branch 'security-stable-2.46' into security-stable-2.60 2017-09-29 09:42:30 -04:00
Jesse Glick ea981a029c [SECURITY-490] Patch Commons File Upload 1.3.x. 2017-09-29 09:41:00 -04:00
Jesse Glick fe77d1c3db [SECURITY-555] Patch Commons HttpClient 3.x. 2017-09-29 09:39:32 -04:00
Daniel Beck 52342b26e5 Merge pull request #3052 from batmat/JENKINS-47127-revert-to-m-war-p-3.0 
[JENKINS-47127] Downgrade to m-war-p 3.0.0
 2017-09-29 11:08:06 +02:00
Daniel Beck 34b8eb0628 Merge pull request #3054 from LinuxSuRen/suren-zh 
Add Chinese translation
 2017-09-29 09:38:51 +02:00
surenpi 1626554d82 add help-name-zh.html 2017-09-29 09:47:38 +08:00
Jesse Glick b0d0fcee8e Merge branch 'security-stable-2.73' into security-master 2017-09-28 11:38:54 -04:00
Jesse Glick d8039fac2b Merge branch 'master' of git://github.com/jenkinsci/jenkins 2017-09-28 11:38:44 -04:00
Jesse Glick 6509ab3511 Merge branch 'security-stable-2.60' into security-stable-2.73 2017-09-28 11:38:35 -04:00
Jesse Glick 8aac723957 Merge branch 'security-stable-2.46' into security-stable-2.60 2017-09-28 11:38:24 -04:00
Jesse Glick 67f68c1810 [SECURITY-478] Strengthening test. 2017-09-28 11:37:47 -04:00
Jesse Glick 5b390f6701 jenkins-test-harness 2.28 2017-09-28 10:45:27 -04:00
Jesse Glick 6a4d800091 [JENKINS-44657] Noting when #2932 was merged. 2017-09-28 10:44:18 -04:00
Jesse Glick fc4f6affd2 Merge branch 'security-stable-2.73' into security-master 2017-09-28 10:31:22 -04:00
Jesse Glick 04b8f469f1 Merge branch 'master' into security-master 2017-09-28 10:31:20 -04:00
Jesse Glick 91c9dcebf1 Merge branch 'stable-2.73' 2017-09-28 10:27:58 -04:00
Jesse Glick 617597c149 Merge branch 'master' of git://github.com/jenkinsci/jenkins 2017-09-28 10:27:56 -04:00
Jesse Glick be9e5143be Merge branch 'security-stable-2.60' into security-stable-2.73 2017-09-28 10:27:01 -04:00
Jesse Glick 8c8bda0816 Merge branch 'stable-2.73' into security-stable-2.73 2017-09-28 10:25:59 -04:00
Jesse Glick ed67965c09 Merge branch 'stable-2.73' of git://github.com/jenkinsci/jenkins into stable-2.73 2017-09-28 10:25:27 -04:00
Jesse Glick 22da51d5f9 Merge branch 'security-stable-2.46' into security-stable-2.60 2017-09-28 10:24:36 -04:00
Jesse Glick 3ff432ace1 [SECURITY-618] Check READ/DISCOVER permissions on Queue.Item.getApi. 2017-09-28 10:15:59 -04:00
Jesse Glick b2083a387a [SECURITY-617] Do not export information about hidden upstream or downstream projects. 2017-09-28 10:15:40 -04:00
Jesse Glick da06fd471c [SECURITY-611] Do not export hidden projects via Executor.currentExecutable. 2017-09-28 10:15:14 -04:00
Daniel Beck 9c939c4eb4 [JENKINS-45472] Add test 
Without the fix, test fails in line 308 with:

org.junit.ComparisonFailure:
Expected :for p2
Actual   :for p1
 2017-09-28 14:49:23 +02:00
Daniel Beck e044675e15 [JENKINS-45472] Copy the list in case it's reused elsewhere 2017-09-28 14:20:24 +02:00
Daniel Beck 6d7f5a0e94 [JENKINS-40344] Fix check for anonymous authentication 
Same check as User.get(Authentication) uses, so this should work
 2017-09-28 14:01:06 +02:00
Daniel Beck a798750f4a [JENKINS-40344] Log the user whose crumb was invalid 2017-09-28 11:33:44 +02:00
Kohsuke Kawaguchi 6bf676da38 [maven-release-plugin] prepare for next development iteration 2017-09-27 15:45:43 -07:00
Kohsuke Kawaguchi a63bbbefba [maven-release-plugin] prepare release jenkins-2.81 jenkins-2.81 2017-09-27 15:45:43 -07:00
Jesse Glick 77785beddc Merge pull request #3050 from jglick/setup-wizard-version-JENKINS-47139 
[JENKINS-47139] Fix setup wizard
 2017-09-27 17:31:20 -04:00
Baptiste Mathus d7dc9bc324 [JENKINS-47127] Downgrade to m-war-p 3.0.0 
MWAR-404 introduced the regression in maven-war-plugin 3.1.0that makes
every files be filtered, including binaries.

MWAR-407 has been filed to revert MWAR-404, but that will be only in
m-war-p 3.1.1 or 3.2.0 which are not yet released.

So we downgrade to 3.0.0 for now.
 2017-09-27 22:24:07 +02:00
Jesse Glick 07923429f0 [FIXED JENKINS-47139] Do not set Jenkins.version too early in startup, lest InstallUtil.getLastExecVersion get confused. 2017-09-27 14:26:31 -04:00
Daniel Beck 5c98cf41af [JENKINS-40344] Don't log second warning for anon either 2017-09-27 09:34:22 +02:00
Daniel Beck 50c26b945e [JENKINS-40344] Don't log warning for invalid crumb from anon 2017-09-27 09:29:51 +02:00
Oliver Gondža c8b98b0554 Merge pull request #3047 from oleg-nenashev/stable-2.73 
Pick Remoting 3.10.1 version with reverted FindBugs annotations
 2017-09-26 13:48:23 +02:00
Oleg Nenashev 5b9640b852 Pick version with reverted FindBugs annotations 2017-09-26 14:44:37 +03:00
Oliver Gondža 0ae268cdd5 Merge pull request #3044 from oleg-nenashev/stable-2.73 
[JENKINS-45755, JENKINS-45023, JENKINS-46259, JENKINS-45233] - Integrate Remoting 3.10.1
 2017-09-26 13:36:49 +02:00
Daniel Beck 4a524239ef [JENKINS-32623] Fix link to user profile in title 2017-09-26 12:41:27 +02:00
Daniel Beck 08adfb9d12 [JENKINS-32623] Use real URL for user 2017-09-26 08:43:15 +02:00
Oleg Nenashev 4a3978c34e [JENKINS-45755, JENKINS-45023, JENKINS-46259, JENKINS-45233] - Integrate Remoting 3.10.1 snapshot towards 2.73.2 2017-09-26 05:20:11 +03:00
Kohsuke Kawaguchi 34a8778146 [maven-release-plugin] prepare for next development iteration 2017-09-25 08:17:25 -07:00