Jesse Glick
39f33b9bfd
Merge branch 'security-stable-1.651' into security-master
2016-04-26 15:58:55 -04:00
Jesse Glick
67597a7c91
Merge branch 'stable-1.651'
2016-04-26 15:58:48 -04:00
Jesse Glick
d39ccfac86
Merge branch 'security-stable-1.642' into security-stable-1.651
2016-04-26 15:58:33 -04:00
Jesse Glick
e8d2f41a92
Merge branch 'stable-1.642' into stable-1.651
2016-04-26 15:58:29 -04:00
Jesse Glick
93229dfc24
Merge branch 'security-stable-1.625' into security-stable-1.642
2016-04-26 15:57:52 -04:00
Jesse Glick
97a62a9bcc
Merge branch 'security-stable-1.609' into security-stable-1.625
2016-04-26 15:57:32 -04:00
Jesse Glick
53dd9046c9
Merge pull request #68 from jenkinsci-cert/SECURITY-273
...
[FIX SECURITY-273] Require admin permission to check update sites
2016-04-26 15:57:12 -04:00
Jesse Glick
a92bb2dfbe
Merge pull request #62 from jenkinsci-cert/SECURITY-250
...
[FIX SECURITY-250] Restrict access to admin APIs
2016-04-26 15:56:56 -04:00
Jesse Glick
7c19b83c86
Merge branch 'master' of git://github.com/jenkinsci/jenkins
2016-04-26 15:50:46 -04:00
Jesse Glick
a15df75bd8
Merge (-s ours) stable-1.651 into master
2016-04-26 15:50:08 -04:00
kzantow
f04630845f
Display clicked scrollspy items as active, even if they would not
...
normally be highlighted due to position at the bottom of the page
2016-04-26 13:58:59 -04:00
Kohsuke Kawaguchi
e01256ed24
Merge pull request #2272 from jenkinsci/new-sorcerer
...
Use newer version of sorcerer
2016-04-26 09:19:50 -07:00
Kohsuke Kawaguchi
b816e74a79
Merge pull request #2284 from jenkinsci/signature-timestamp
...
Add timestamp to the signature
2016-04-26 09:19:10 -07:00
Kohsuke Kawaguchi
8356bd4165
Merge pull request #2285 from jenkinsci/jarsigner-and-gpg
...
Force ordering between GPG and jarsigner
2016-04-26 09:18:39 -07:00
tfennelly
b03d69c043
Switch on async-supported for Stapler and all Servlet Filters
2016-04-26 15:19:51 +01:00
James Nord
d1d1ab152b
[SECURITY-243] APIToken auth needs to create the user.
...
In the case the user is valid but not saved the user need to be created.
This catches the case where the user has not saved anything and is using
their default API token.
2016-04-26 12:54:45 +01:00
Daniel Beck
8a19e8ae3d
Merge pull request #2282 from kzantow/JENKINS-34174-plugin-download-timeout
...
[JENKINS-33244] better handling of failed plugins during setup wizard
2016-04-25 22:44:44 +02:00
Tomas
c81efc039b
Lithuanian translation update
2016-04-25 23:30:16 +03:00
Daniel Beck
56be107feb
[FIX SECURITY-273] Require admin permission to check update sites
2016-04-25 21:06:54 +02:00
recena
fc4435c29f
[JENKINS-34438] @kzantow's comments were addressed
2016-04-25 20:20:39 +02:00
recena
33a7658533
[JENKINS-34438] The build will fail if there are JSHint errors
2016-04-25 20:07:26 +02:00
recena
f523a0ee23
[JENKINS-34438] Activate JSHint during the build process
2016-04-25 19:55:06 +02:00
Daniel Beck
2ed0c046df
[FIX SECURITY-276] Don't allow open redirect using scheme-rel. URL
2016-04-25 19:50:53 +02:00
recena
be6caf515e
Wrong javascript invocation
...
(cherry picked from commit f97605552b )
2016-04-25 16:48:45 +02:00
kzantow
766fe85774
JENKINS-33826 build history badges styling issues
...
(cherry picked from commit d9d4f08d2b )
2016-04-25 16:43:41 +02:00
Jesse Glick
28bc2ba67a
[FIXED JENKINS-33971] ReverseBuildTrigger.upstream2Trigger was not being reliably calculated during Jenkins startup.
...
(cherry picked from commit 1618270f6c )
2016-04-25 16:40:58 +02:00
James Nord
89532690e6
[FIXED JENKINS-33693] Do not hardcode .bat extension.
...
As the default maven command is on the path we can not hard code the
command to mvn.bat as since maven 3.something it has been mvn.cmd
As this is on the path we can just use mvn and let Windows do its thing
with PATHEXT which will has both .BAT and .CMD by default.
This fixes ATH failures when the ATH is run on windows.
(cherry picked from commit 490adc9d0f )
2016-04-25 16:39:06 +02:00
Jesse Glick
328be10df6
[FIXED JENKINS-18032] Crumbs must be appended when using post=true requiresConfirmation=true.
...
(cherry picked from commit 57fced9359 )
2016-04-25 16:36:25 +02:00
Jesse Glick
63886be9f7
[JENKINS-33467] Clarifying that CauseAction.getCauses is immutable and you should construct the action with the causes you want.
...
(cherry picked from commit 4adee7597a )
2016-04-25 16:34:30 +02:00
Jesse Glick
916e759f57
[FIXED JENKINS-33467] Do not store redundant copies of Cause in CauseAction.
...
(cherry picked from commit 6ae54add5d )
2016-04-25 16:34:30 +02:00
Daniel Beck
a4b070bd73
Merge pull request #2249 from recena/JSHint
...
Fixed an JSHint error
2016-04-25 13:34:31 +02:00
Daniel Beck
6f0eeabb43
Merge pull request #2266 from recena/JENKINS-31162-2
...
[JENKINS-31162] Wrong spacing in flat mode
2016-04-25 11:46:32 +02:00
Daniel Beck
9f64248ba5
Merge pull request #2283 from recena/task-tag
...
Wrong javascript invocation
2016-04-25 11:38:32 +02:00
Manuel Recena
aaa5f00814
Removed tab characters and 4-spaces indentantion
2016-04-23 12:20:46 +02:00
Tomas
5e57f5aaec
Lithuanian translation updates
2016-04-23 13:14:38 +03:00
Tomas
2c5d791390
Merge remote-tracking branch 'upstream/master'
2016-04-23 10:15:41 +03:00
Kohsuke Kawaguchi
727dea8b65
Force ordering between GPG and jarsigner
...
jarsigner adds signatures by updating the file itself, so we have
to run it before GPG plugin signs the bit, which happens in the 'verify'
phase.
The 'pre-integration-test' phase happens right after the 'package'
phase and before the 'verify' phase, so this is adequate.
See: https://groups.google.com/forum/#!msg/jenkinsci-users/POk8TOcwOM8/i5wn2a0MMwAJ
2016-04-22 15:44:26 -07:00
Daniel Beck
f6e431b80c
Merge pull request #2262 from kuisathaverat/JENKINS-34146
...
[FIX JENKINS-34146] check if build is build able before to ask for parameters
2016-04-23 00:40:54 +02:00
Daniel Beck
ce9de5a19d
Merge pull request #2263 from pjanouse/JENKINS-34228
...
[JENKINS-34228] Fixed IOException in DeleteBuildsCommand class
2016-04-23 00:39:49 +02:00
Daniel Beck
e1dc525fda
Merge pull request #2267 from jpbriend/translation_french_jenkins20_wizard
...
Add French translation for Jenkins 2.0 wizard
2016-04-23 00:36:06 +02:00
Daniel Beck
658a854491
Merge pull request #2270 from daniel-beck/JENKINS-34090
...
[JENKINS-34090] Add 'since 2.0' annotations
2016-04-23 00:33:47 +02:00
Daniel Beck
84698df80b
Merge pull request #2280 from svanoort/fix-shutdown-permissions-issue-JENKINS-34281-mk3
...
[FIX JENKINS-34281] Run shutdown as system user
2016-04-23 00:30:30 +02:00
Kohsuke Kawaguchi
4a4cc4cc2a
Add timestamp to the signature
...
Otherwise jarsigner -verify complains about the lack of timestamp
2016-04-22 15:21:04 -07:00
recena
f97605552b
Wrong javascript invocation
2016-04-22 20:18:35 +02:00
kzantow
6b2a60506c
Pre-commit tweaks
2016-04-22 10:49:53 -04:00
kzantow
2ada9b7046
Merge remote-tracking branch 'primary/master' into JENKINS-33950-multiple-dependency-install-fix
2016-04-22 10:43:43 -04:00
kzantow
e612f4163a
Merge remote-tracking branch 'primary/master' into
...
JENKINS-34174-plugin-download-timeout
# Conflicts:
# core/src/main/resources/jenkins/install/pluginSetupWizard.properties
2016-04-22 10:37:18 -04:00
Daniel Beck
5d90f81656
Merge pull request #2259 from kzantow/JENKINS-34137-smarter-setup-wizard-close
...
[JENKINS-34137] setup wizard: better handling of the close button
2016-04-22 16:04:24 +02:00
Daniel Beck
20d3d8a529
Merge pull request #2260 from kzantow/JENKINS-33936-links-to-wiki
...
[JENKINS-33936] [JENKINS-33937] add links to wiki for plugins during setup
2016-04-22 16:03:26 +02:00
kzantow
1c39655f56
Merge remote-tracking branch 'primary/master' into JENKINS-34137-smarter-setup-wizard-close
2016-04-21 23:11:26 -04:00