OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-14 20:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,590 Commits 56 Branches 1,942 Tags
1e646ff7ee52ecbbca3d7957b65fb4edfd39d653
Commit Graph
32590 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Beck 97af6d991f Merge branch 'stable-2.190' 2019-09-12 14:09:03 +02:00
Daniel Beck 190c431c82 Merge branch 'stable-2.190' into security-stable-2.190 2019-09-12 14:08:14 +02:00
Daniel Beck 2f8741d83b Merge branch 'stable-2.190' of https://github.com/jenkinsci/jenkins into stable-2.190 2019-09-12 14:03:55 +02:00
Oleg Nenashev be7e3fd822 Update Jenkins Acceptance Test Harness to the recent version (#4197) 
https://github.com/jenkinsci/acceptance-test-harness/commit/5606d3bb3a645311711b74833d5d3a4fdc4d713d
 2019-09-12 13:44:48 +02:00
Oleg Nenashev 99ec6b1d32 Merge pull request #4176 from glavoie/JENKINS-58938 
JENKINS-58912/JENKINS-58938: Fix Groovy compilation error that breaks the UI.

(cherry picked from commit e8df387ea3)
 2019-09-12 09:13:54 +02:00
Jeff Thompson f114f920f3 Merge pull request #4188 from Wadeck/JENKINS-59167_rss_rootUrl 
[JENKINS-59167] Correction of rootUrl in RSS/Atom feeds

(cherry picked from commit 26c8523052)
 2019-09-12 09:12:56 +02:00
Daniel Beck 585c0fd3df Merge branch 'security-stable-2.190' into security-master 2019-09-10 23:00:43 +02:00
Daniel Beck b08cf5fdd5 Merge branch 'security-stable-2.176' into security-stable-2.190 2019-09-10 22:51:44 +02:00
Daniel Beck 3073c11e0c Merge branch 'security-stable-2.164' into security-stable-2.176 2019-09-10 22:43:57 +02:00
Daniel Beck b1432e31b8 Merge branch 'security-stable-2.150' into security-stable-2.164 2019-09-10 22:40:02 +02:00
Daniel Beck 0a3efd0816 Merge branch 'security-stable-2.138' into security-stable-2.150 2019-09-10 21:58:49 +02:00
Wadeck Follonier e2c596c049 [SECURITY-1471] 2019-09-10 21:31:40 +02:00
Wadeck Follonier 00064be366 [SECURITY-1525] 2019-09-10 21:27:35 +02:00
Daniel Beck 3484eed824 Merge branch 'security-stable-2.190' into security-master 2019-09-10 20:45:56 +02:00
Daniel Beck a6af29cd1f Merge branch 'security-stable-2.176' into security-stable-2.190 2019-09-10 20:45:27 +02:00
Daniel Beck 941c35559a Merge branch 'security-stable-2.164' into security-stable-2.176 2019-09-10 20:45:00 +02:00
Daniel Beck b4ba5dfc46 Merge branch 'security-stable-2.150' into security-stable-2.164 2019-09-10 20:44:27 +02:00
Daniel Beck 00de43f5b3 Merge branch 'security-stable-2.138' into security-stable-2.150 2019-09-10 20:42:54 +02:00
Wadeck Follonier df600eb7a2 [SECURITY-1498] 2019-09-10 20:31:20 +02:00
Wadeck Follonier 8c8d014330 [SECURITY-1537] 2019-09-10 20:30:30 +02:00
Wadeck Follonier 560ee832b4 [SECURITY-1505] 2019-09-10 20:27:47 +02:00
Daniel Beck 93375d53f1 Merge (-s ours) stable-2.190 into master 2019-09-10 15:53:55 +02:00
Daniel Beck 81b0414329 Merge (-s ours) stable-2.176 into stable-2.190 2019-09-10 15:53:55 +02:00
Daniel Beck 2672a83927 Merge branch 'stable-2.176' 2019-09-10 15:45:04 +02:00
James Nord 3fe6e9d219 Update core/src/main/java/jenkins/model/Jenkins.java 2019-09-09 18:46:49 +01:00
Mark Wynn-Mackenzie 8a7bfb49ad Merge remote-tracking branch 'upstream/master' into bom 2019-09-09 17:34:07 +01:00
Wadeck Follonier da3c704753 [SECURITY-1453] 
(cherry picked from commit fb88530f77)
 2019-09-09 16:34:53 +02:00
Wadeck Follonier 95d2f62ebd [SECURITY-1491] 
Co-Authored-By: Daniel Beck <daniel-beck@users.noreply.github.com>
(cherry picked from commit ace5965b45)
 2019-09-09 16:34:35 +02:00
Kohsuke Kawaguchi e1801d0d13 [maven-release-plugin] prepare for next development iteration 2019-09-08 16:13:44 -07:00
Kohsuke Kawaguchi 0f569f2cca [maven-release-plugin] prepare release jenkins-2.194 jenkins-2.194 2019-09-08 16:13:35 -07:00
Sebastian Rakel d30edab174 Fix Fingerprinter.Recording typo in german translation (#4187) 2019-09-07 22:58:09 +02:00
Jeff Thompson f4abf56970 Upgrade to 3.35 version of Remoting. (#4193) 2019-09-07 22:57:35 +02:00
Raihaan Shouhell 89702627a2 Fix annotations and remove unused imports (#4190) 2019-09-07 22:57:04 +02:00
Jeff Thompson 26c8523052 Merge pull request #4188 from Wadeck/JENKINS-59167_rss_rootUrl 
[JENKINS-59167] Correction of rootUrl in RSS/Atom feeds
 2019-09-06 10:43:41 -06:00
Wadeck Follonier dc1bc27443 Ignore the new tests, they will be corrected in a followup ticket. 2019-09-06 16:32:45 +02:00
Wadeck Follonier eb91265e7e To re-trigger the test 2019-09-06 14:14:41 +02:00
Mark Wynn-MackenzieandJesse Glick 958dd74c33 Apply suggestions from code review 
Co-Authored-By: Jesse Glick <jglick@cloudbees.com>
 2019-09-05 13:51:14 +01:00
Oleg Nenashev b620b7f9b8 Update Windows Service Wrapper to 2.3.0. (#4167) 
This change picks up a new version of Windows Agent Installer modeule and Windows Service Wrapper. The module only includes the wrapper change. I hope to stereamline it via BOM eventually...
 2019-09-05 11:31:51 +02:00
A. Jard e8e75ef8d2 Remove slave from french messages and correct one accent (#4184) 2019-09-04 14:47:04 +02:00
StefanSpieker a26a5db1cf [JENKINS-59164] - Functions#toEmailSafeString() was not really sanitizing the email string (#4185) 2019-09-04 09:30:34 +02:00
Andrey Grigorov 1ff26192c3 Correct a syntax error in the message in Russian (#4183) 2019-09-04 09:28:23 +02:00
Damian Szczepanik 672b443f4d Add Polish translations (#4172) 2019-09-04 09:27:49 +02:00
Raihaan Shouhell a7e804399c Replace Apache Commons Codec Base64 implementations with standard java.util.Base64 (#4169) 
* Replace apache base64 with java

* Swap to regular encoder
 2019-09-04 00:08:15 +02:00
Jeff Thompson f8efb5c1b0 [JENKINS-53322] Remove patched dom4j fork (#4130) 
* [WIP] [JENKINS-58170] Reference an incremental stapler version.

One that uses the standard dom4j library instead of our fork.
We want to run this through CI and testing frameworks.

* Tweak a test assertion to be more precise.

Change the assertion to be more precise about what it is looking for. Make it check for the element's text and exclude the text of any children.

* Use released stapler version

Stapler has now been released with the changes to eliminate the dom4j fork.
 2019-09-03 21:47:07 +02:00
Mark Wynn-Mackenzie 5dbdff55fb Merge remote-tracking branch 'upstream/master' into bom 2019-09-02 17:34:55 +01:00
Mark Wynn-Mackenzie 1738eb2c38 Remove test dependencies from bom. 2019-09-02 17:34:35 +01:00
Wadeck Follonier 4af38ea795 [JENKINS-59167] Correction of rootUrl in RSS/Atom feeds 2019-09-02 18:28:17 +02:00
Oliver Gondža 5c21915501 Towards 2.190.1 2019-09-02 10:27:09 +02:00
Kohsuke Kawaguchi ca1cecc4bb [maven-release-plugin] prepare for next development iteration 2019-09-01 17:45:44 -07:00
Kohsuke Kawaguchi ab0cdd8da3 [maven-release-plugin] prepare release jenkins-2.193 jenkins-2.193 2019-09-01 17:45:34 -07:00