Daniel Beck
9241bc28ed
Merge branch 'stable-2.107' of git://github.com/jenkinsci/jenkins into stable-2.107
2018-04-26 12:06:54 +02:00
Oliver Gondža
3485779ec2
Merge pull request #3406 from Wadeck/FIX_CLI_LOGOUT_TEST_FAILURE
...
Fix the CLI test failure
2018-04-26 10:51:21 +02:00
Jochen Fürbacher
aaa068a305
Fixed encoding in German translation (log recorder levels)
2018-04-26 10:45:01 +02:00
Wadeck Follonier
df137f099e
Fix the CLI test failure
2018-04-26 10:39:53 +02:00
Daniel Beck
c5497c9a57
Merge branch 'security-stable-2.107' into security-master
2018-04-26 01:49:42 +02:00
Daniel Beck
7e6c0637b1
Merge branch 'security-stable-2.89' into security-stable-2.107
2018-04-26 01:20:01 +02:00
Oleg Nenashev
5be4ddec16
Merge pull request #3401 from LinuxSuRen/slave-zh
...
Add Chinese translation for slave
2018-04-26 00:45:04 +02:00
Daniel Beck
f73b827973
Merge branch 'security-stable-2.73' into security-stable-2.89
2018-04-26 00:37:06 +02:00
Wadeck Follonier
5cf0a77d44
[SECURITY-788]
2018-04-25 23:42:19 +02:00
Wadeck Follonier
7c5b41bfd5
[SECURITY-771]
2018-04-25 23:40:56 +02:00
Wadeck Follonier
809916b59b
[SECURITY-771]
2018-04-25 23:40:33 +02:00
Wadeck Follonier
de7aaab441
[SECURITY-786]
2018-04-25 23:39:43 +02:00
Wadeck Follonier
6eea1e9784
[SECURITY-794]
2018-04-25 23:37:50 +02:00
Daniel Beck
bc3a5f3f70
Merge branch 'security-stable-2.107' into security-master
2018-04-25 23:28:46 +02:00
Daniel Beck
3712762ae1
Merge branch 'stable-2.107'
2018-04-25 23:13:25 +02:00
Daniel Beck
556d6f7036
Merge commit 'b92db0f04e64cdd7a815bd78a5dd3dd4cd7ead7c' of git://github.com/jenkinsci/jenkins
2018-04-25 23:11:13 +02:00
Daniel Beck
2ba3cc186f
Merge branch 'stable-2.107' into security-stable-2.107
2018-04-25 15:05:42 +02:00
Daniel Beck
68eea0af4a
Merge branch 'stable-2.107' of git://github.com/jenkinsci/jenkins into stable-2.107
2018-04-25 15:03:09 +02:00
Oleg Nenashev
a16779e4e2
[JENKINS-50616] - Add org.jruby.RubyNil to the whitelist ( #3404 )
...
* [JENKINS-50616] - Add org.jruby.RubyNil to the whitelist
* [JENKINS-50616] - Fix the typo in the comment
(cherry picked from commit fc61378739
2018-04-25 12:38:28 +02:00
Jesse Glick
97a76e6344
Simplify Jenkins.installState serial form to avoid relying on readResolve.
2018-04-24 10:19:47 -04:00
Oleg Nenashev
fc61378739
[JENKINS-50616] - Add org.jruby.RubyNil to the whitelist ( #3404 )
...
* [JENKINS-50616] - Add org.jruby.RubyNil to the whitelist
* [JENKINS-50616] - Fix the typo in the comment
2018-04-24 14:39:57 +02:00
Oleg Nenashev
e10e98f854
Merge pull request #3403 from marcosbento/whitelist_enumset
...
[JENKINS-50939] - Whitelist java.util.EnumSet
(cherry picked from commit e511ff832a
2018-04-24 14:29:49 +02:00
Devin Nusbaum
6876eaa7f8
[JENKINS-44402] Workaround to make cancel shutdown work when loaded by AJAX
...
(cherry picked from commit b2cdcf0218
2018-04-24 14:07:14 +02:00
Baptiste Mathus
a363f2e33c
Merge pull request #3364 from batmat/JENKINS-50164
...
[JENKINS-50164] Remove UI option to modify WS and builds locations
2018-04-24 11:42:59 +02:00
Oleg Nenashev
e511ff832a
Merge pull request #3403 from marcosbento/whitelist_enumset
...
[JENKINS-50939] - Whitelist java.util.EnumSet
2018-04-24 11:02:20 +02:00
Vincent Latombe
909f55b77d
[JENKINS-50767] Control crumb issuer proxy compatibility through system property ( #3389 )
...
-Djenkins.model.Jenkins.crumbIssuerProxyCompatibility=true enables proxy compatibility on startup
2018-04-23 15:23:41 +02:00
Marcos Bento
e2abc734da
Whitelist java.util.EnumMap
2018-04-23 09:44:53 +01:00
Kohsuke Kawaguchi
b92db0f04e
[maven-release-plugin] prepare for next development iteration
2018-04-22 17:15:41 -07:00
Kohsuke Kawaguchi
f2606c2544
[maven-release-plugin] prepare release jenkins-2.118
2018-04-22 17:15:40 -07:00
surenpi
d6800ac9eb
Add Chinese translation for slave
2018-04-22 19:32:37 +08:00
Oleg Nenashev
534bb120f4
Merge pull request #3399 from oleg-nenashev/winp/1.26
...
[JENKINS-48347] - Update WinP from 1.25 to 1.26 to pick the Weblogic classloader fix for WinP DLLs
2018-04-22 09:02:54 +02:00
Daniel Beck
398e032fa0
Merge pull request #3355 from suren-jenkins/suren-configure-zh
...
Add Chinese translation for global configuration
2018-04-22 00:00:37 +02:00
Wadeck Follonier
c4fc9098bf
Taglib docs: Add the checkMethod attribute to textbox ( #3396 )
...
* Add the checkMethod attribute to textbox
- better discovery capability for the plugin maintainers and core developers
* Address Daniel's comment about the possible values
* Address Devin's comment about the documentation content
2018-04-21 10:31:38 +02:00
Oleg Nenashev
67c87acd87
Merge pull request #3398 from oleg-nenashev/remoting/3.20
...
Update Remoting to 3.20 in order to refresh the code signing certificate
2018-04-21 10:30:24 +02:00
Jesse Glick
51cac7de2c
Merge pull request #3302 from jglick/VirtualFile-JENKINS-49635
...
[JEP-202] Extending VirtualFile
2018-04-20 18:08:48 -04:00
Baptiste Mathus
84e423d77a
Make the potential skip reason bubble up
2018-04-20 14:28:19 +02:00
Baptiste Mathus
d8ef16e422
Update javadoc & clarify parameter name
2018-04-20 14:26:22 +02:00
Kohsuke Kawaguchi
2d3cbeca9b
[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.
(cherry picked from commit bcab1f086f
2018-04-19 06:47:23 +02:00
Jesse Glick
615c3b1f61
[JENKINS-46386] Make SystemProperties safe to call from agent JVMs.
...
(cherry picked from commit 7948315142
2018-04-19 06:44:45 +02:00
Vincent Latombe
f5a2401c8a
[JENKINS-49401] Move Setup Wizard initialization logic to the init reactor. ( #3282 )
...
This way, it is guaranteed Jenkins.save() has never been called before
the SetupWizard is executed, and computation of the initial Setup Wizard
state will be correct.
Since the SetupWizard is now executed before reaching the COMPLETED
milestone, a Jenkins.save() call has been added in order to persist any
configuration change done in prior phases.
(cherry picked from commit 9f599911f6
2018-04-19 06:38:12 +02:00
Wadeck Follonier
8a2f9865e8
[JENKINS-50324] User without READ cannot logout - or even ask who they are
...
(cherry picked from commit b5ed977bbc
2018-04-19 06:35:55 +02:00
Oleg Nenashev
20bf0055b5
Fix Remoting version comments in pom.xml
2018-04-18 19:20:35 +02:00
Oleg Nenashev
a5e9cbd731
[JENKINS-48347] - Update WinP from 1.25 to 1.26 to pick the weblogic fix
2018-04-18 18:30:49 +02:00
Oleg Nenashev
d132b6d812
Update Remoting to 3.20 in order to refresh the code signing certificate
2018-04-18 16:12:40 +02:00
Oleg Nenashev
2ed806017b
Merge pull request #3395 from sylvestre/master
...
Improve the french translation: 'pas bonne' isn't a great wording
2018-04-18 11:24:19 +02:00
Sylvestre Ledru
c248489288
Improve the french translation: 'pas bonne' isn't a great wording
2018-04-17 11:27:13 +02:00
Jesse Glick
8f5d1d3493
Merge branch 'master' into VirtualFile-JENKINS-49635
2018-04-16 16:52:19 -04:00
Kohsuke Kawaguchi
dc4ab1196e
[maven-release-plugin] prepare for next development iteration
2018-04-15 03:07:48 -07:00
Kohsuke Kawaguchi
9316cee9e0
[maven-release-plugin] prepare release jenkins-2.117
2018-04-15 03:07:48 -07:00
Oleg Nenashev
fb274faa23
Merge pull request #3386 from LinuxSuRen/rename_zh
...
Add Chinese translation for Rename action
2018-04-14 23:02:11 +02:00
Daniel Beck