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
Oleg Nenashev d34c87c3dd Merge pull request #3387 from LinuxSuRen/abstract_project_zh 
Add Chinese translation for abstract project
 2018-04-14 22:59:50 +02:00
Devin Nusbaum 9557da32a3 [JENKINS-50599] Make Nodes#addNode fail atomically (#3383) 
* Reproduce JENKINS-50599

* Make Nodes#addNode fail atomically

* Simplify rollback logic and add some tests

* Fix typo

* Rename lambda parameters to clarify that they are intentionally ignored

* Catch RuntimeException as well
 2018-04-14 22:57:27 +02:00
Oleg Nenashev c6561fac15 Merge pull request #3388 from daniel-beck/JENKINS-50748 
[FIX JENKINS-50748] Handle null arg to jsStringEscape
 2018-04-14 22:56:02 +02:00
Oleg Nenashev 7f1da58c8b Merge pull request #3391 from LinuxSuRen/install-zh 
Add Chinese translation for installer page
 2018-04-14 19:18:52 +02:00
Oleg Nenashev 93d675c4da Merge pull request #3392 from LinuxSuRen/gitignore 
Ignore file war/yarn-error.log
 2018-04-14 19:17:26 +02:00
suren 6c4976fa98 Add Chinese translation for basic entry (#3368) 
* Add Chinese translation for basic entry

* Delete the comment to avoid error.
 2018-04-14 19:16:14 +02:00
Oleg Nenashev c86a448efa Merge pull request #3384 from kohsuke/master 
[INFRA-1502] bake the new UC root CA.
 2018-04-14 19:14:03 +02:00
Oleg Nenashev 1bd19d6e37 Merge pull request #3390 from MarkEWaite/fix-not-responding-log-message 
Expand contraction in message
 2018-04-14 19:13:37 +02:00
Oleg Nenashev 925096ef2b Winstone 4.2: Update Jetty from 9.4.5 to 9.4.8 (#3378) 
* Winstone 4.2: Update Jetty from 9.4.5 to 9.4.8

* Use the released version of Winstone 4.2
 2018-04-14 19:12:41 +02:00
Jesse Glick d25c0b2c39 Merge branch 'master' into VirtualFile-JENKINS-49635 2018-04-13 12:32:38 -04:00
suren 5e9b51ad5c Ignore file war/yarn-error.log 2018-04-13 16:35:42 +08:00
suren 905ab43dbe Typo fixed 2018-04-13 16:27:56 +08:00
suren 4019ff53e7 Add Chinese translation for installer page 2018-04-13 16:24:19 +08:00
Mark Waite 591c7407d6 Expand contraction in message 
Simpler to expand the contraction in the message so that "it's" becomes
"it is" than it is to identify the correct combination of characters to
embed a single quote into a property file.
 2018-04-12 11:38:48 -06:00
Daniel Beck 5e8cd50dcb [JENKINS-50748] Handle null arg to jsStringEscape 
(cherry picked from commit 7c23884c59)
 2018-04-12 12:06:57 +02:00
Daniel Beck 7c23884c59 [FIX JENKINS-50748] Handle null arg to jsStringEscape 2018-04-12 09:45:30 +02:00
surenpi e4f2ed89db Add Chinese translation for abstract project 2018-04-12 15:00:47 +08:00
Kohsuke Kawaguchi f11b585a28 Merge remote-tracking branch 'origin/stable-2.107' into stable-2.107 2018-04-11 03:48:53 -07:00
Kohsuke Kawaguchi 2ab4c4a11c Merge remote-tracking branch 'origin/master' 2018-04-11 03:48:06 -07:00
surenpi eb44e1ff7e Add Chinese translation for Rename action. 2018-04-11 15:08:19 +08:00
Oleg Nenashev 5e143d1c66 Merge pull request #3385 from hummerstudio/fix-translation-error 
fix translation error
 2018-04-10 17:55:40 +02:00
Kohsuke Kawaguchi 1fef68ec3e [maven-release-plugin] prepare for next development iteration 2018-04-09 20:00:28 -07:00
Kohsuke Kawaguchi 2e4b7cdb80 [maven-release-plugin] prepare release jenkins-2.116 jenkins-2.116 2018-04-09 20:00:28 -07:00
唐明 9c4c4627d0 fix translation error 
"连接"应为“链接”
 2018-04-10 10:00:29 +08:00
Kohsuke Kawaguchi 15f901bc4c [maven-release-plugin] prepare for next development iteration 2018-04-09 13:39:14 -07:00
Kohsuke Kawaguchi 711b89d535 [maven-release-plugin] prepare release jenkins-2.107.2 jenkins-2.107.2 2018-04-09 13:39:14 -07:00
Daniel Beck 9a6d2ec2b9 Merge branch 'security-stable-2.107' into security-master 2018-04-09 18:33:37 +02:00
Daniel Beck ed4fc8dd44 Merge commit 'db48500fb8be4c4fd59c1ded088fe48025d4735d' into security-master 2018-04-09 18:31:19 +02:00
Daniel Beck ba4d1f74c0 Merge branch 'stable-2.107' 2018-04-09 18:30:02 +02:00
Daniel Beck 7712bbb557 Merge commit 'db48500fb8be4c4fd59c1ded088fe48025d4735d' of git://github.com/jenkinsci/jenkins 2018-04-09 18:29:54 +02:00
Daniel Beck d98620a59c Merge branch 'stable-2.107' into security-stable-2.107 2018-04-09 18:26:57 +02:00
Daniel Beck bfeb263c44 Merge branch 'stable-2.107' of git://github.com/jenkinsci/jenkins into stable-2.107 2018-04-09 18:26:13 +02:00
Kohsuke Kawaguchi db48500fb8 [maven-release-plugin] prepare for next development iteration 2018-04-09 08:50:27 -07:00
Kohsuke Kawaguchi 0a8f961c29 [maven-release-plugin] prepare release jenkins-2.115 jenkins-2.115 2018-04-09 08:50:27 -07:00
Kohsuke Kawaguchi bcab1f086f [INFRA-1502] bake the new UC root CA. 
The current UC root CA will expire in 2021. Since this key certificate
is baked into jenkins.war, it needs a plenty of time to rotate. I think
two years window would be sufficient, but since I looked, we might as
well start now.

The new key is also now 4096 bits, upgraded from previous 2048 bits.

I've also used the opportunity to remove old hudson-community root CA,
which was used during the transition period from me leaving Sun and the
birth of Jenkins. It's been long since we stopped using this cert, so no
need to honor it anymore.
 2018-04-08 13:03:22 -07:00
Baptiste Mathus d366abc1d7 Merge pull request #3382 from batmat/JENKINS-50291-followup 
Log the message only once in INFO level
 2018-04-08 13:26:24 +02:00
Daniel Beck 70c408cedf [FIXED JENKINS-25910] Sort nodes for label for UI (#1498) 
* [FIXED JENKINS-25910] Sort nodes for label for UI

* [JENKINS-25910] Sort Jenkins master at beginning

* Consistent sort order

* [JENKINS-25910] Instead use dedicated UI support method
 2018-04-07 15:46:43 +02:00
Oleg Nenashev b6dc5038c9 Merge pull request #3381 from olivergondza/JENKINS-50585 
[JENKINS-50585] Explicitly declared core builds against ATH smoke tests only
 2018-04-07 15:40:12 +02:00
Oliver Gondža 2d74276512 Run ATH as a part of tests 2018-04-06 13:02:11 +02:00
Baptiste Mathus 75df729a66 Log the message only once in INFO level 
Without this, we will see this log more and more as plugins
start using this to put their logs at the right place.
 2018-04-06 11:37:19 +02:00
Wadeck Follonier a17422ca3d Change the name of the classes for ignore the confirm popup 2018-04-06 11:06:55 +02:00
Oliver Gondža e2c2e35cc5 [JENKINS-50585] Explicitly declared core builds against ATH smoke tests only 2018-04-06 10:19:46 +02:00
Jesse Glick 4eb3496a9e Merge pull request #3365 from jglick/null-safety-during-shutdown 
Try to prevent NullPointerException’s during Jenkins shutdown
 2018-04-05 12:52:04 -04:00
James Nord 54325b1554 Merge pull request #3361 from agentgonzo/JENKINS-50296-RemotingAsSystem 
[JENKINS-50296] Run ThreadPoolForRemoting as SYSTEM
 2018-04-05 13:28:26 +01:00
Wadeck Follonier 6526181326 Developer API: Add new HttpResponses#errorJSON() methods (#3379) 
Developer API: Add new HttpResponses#errorJSON() methods
 2018-04-04 14:00:34 +02:00
Oliver Gondža fb4d9ed80b Pull in ATH smoke tests at least 2018-04-04 13:03:54 +02:00
Jesse Glick a54d49b634 access-modifier.version=1.14 2018-04-03 11:29:16 -04:00
Jesse Glick 547fd6fe6e Removing VirtualFile.asRemotable in favor of toExternalURL. 2018-04-02 15:55:40 -04:00
Jesse Glick a345051046 Merge branch 'master' into VirtualFile-JENKINS-49635 2018-04-02 14:09:06 -04:00
Baptiste Mathus 434ddbdcf7 Use released version of jenkins-test-harness 2018-04-02 16:37:36 +02:00