Jesse Glick
9abf36612a
Merge branch 'security' into security-stable-1.596
...
Conflicts:
core/src/test/java/hudson/util/FormValidationTest.java
test/src/test/java/hudson/model/UserTest.java
2015-03-16 18:13:06 -04:00
Jesse Glick
1780041009
Merge branch 'security' into security-stable-1.580
...
Conflicts:
test/src/test/java/hudson/model/UserTest.java
2015-03-16 18:10:27 -04:00
Kohsuke Kawaguchi
f58ba6e72f
Merge pull request #15 from jenkinsci-cert/SECURITY-171
...
[SECURITY-171] XSS in FormValidation._error(..., Throwable, ...)
2015-03-16 22:03:51 +00:00
Kohsuke Kawaguchi
57e78880cc
Merge pull request #13 from jenkinsci-cert/SECURITY-180
...
[SECURITY-180] arbitrary API Token change/leak via changeToken
2015-03-16 22:02:41 +00:00
Daniel Beck
f6fa3c79c6
Noting JENKINS-27256 more user friendly
2015-03-16 21:44:35 +01:00
Daniel Beck
0de40da8bf
Fix 'Upcoming changes' JavaScript
2015-03-16 19:38:34 +01:00
tfennelly
73c3021b70
Noting JENKINS-27256
2015-03-16 18:32:02 +00:00
Tom Fennelly
6bdd321228
Merge pull request #1603 from tfennelly/JENKINS-27256
...
[FIXED JENKINS-27256] Added functional test for stapler fix
2015-03-16 18:18:21 +00:00
tfennelly
7e5063937c
Merge branch 'master' into JENKINS-27256
...
* master:
Updated changelog
updated changelog as a part of the release
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release jenkins-1.604
Noting #1597
Noting #1593 , #1579 , move JENKINS-22346, #1558
Remove two fixes that were backported to RC
JENKINS-27183 Avoid deadlock when using build-monitor-plugin
2015-03-16 17:30:50 +00:00
tfennelly
3f3bc348da
Updated stapler dep to 1.236
2015-03-16 17:30:17 +00:00
Matt Legrand
81bf54520d
add missing edit to selfcheck
2015-03-16 10:13:24 -07:00
Stephen Connolly
e6fdc19cf9
[JENKINS-27058] Clarify that remoteFS can be relative if you know what you are doing
...
- Get the absolute path on connect and use that while the connection is on-line (which is ok as when the connection is not online a null was returned from getRootPath() anyway)
2015-03-16 12:36:04 +00:00
tfennelly
9d52e5772d
Updated stapler dep to 1.235
2015-03-16 09:05:23 +00:00
Kohsuke Kawaguchi
11786d8858
Updated changelog
2015-03-15 14:58:19 -07:00
Kohsuke Kawaguchi
074f35adf1
updated changelog as a part of the release
2015-03-15 13:02:47 -07:00
Kohsuke Kawaguchi
2657689081
[maven-release-plugin] prepare for next development iteration
2015-03-15 10:32:26 -07:00
Kohsuke Kawaguchi
0ed1fb97ba
[maven-release-plugin] prepare release jenkins-1.604
jenkins-1.604
2015-03-15 10:32:26 -07:00
Matt Legrand
37534fa359
alternative and more general solution suggested by D. Beck
2015-03-13 17:09:23 -07:00
Matt Legrand
9a69d6191a
JENKINS-23197: add datestamp to node-offline message
2015-03-13 12:07:41 -07:00
Daniel Beck
12e55e4645
[JENKINS-27414] Don't offer to restart if unsupported
2015-03-13 14:57:45 +01:00
Oliver Gondža
1b75b38d4c
Noting #1597
2015-03-13 12:43:37 +01:00
Oliver Gondža
4edbb2565b
Merge pull request #1597 from fbelzunc/JENKINS-27183
...
[FIXED JENKINS-27183] Avoid deadlock when using build-monitor-plugin
2015-03-13 12:13:03 +01:00
Grogdunn
94af3a4a8a
Fix: bump stapler version
...
Bump stapler to lastest.
2015-03-13 10:41:46 +01:00
tfennelly
2e13ebdf38
Fixed snapshot dep in effort to help CI build pass.
2015-03-12 23:02:43 +00:00
Daniel Beck
84800166b0
Noting #1593 , #1579 , move JENKINS-22346, #1558
2015-03-12 23:44:34 +01:00
Daniel Beck
50a83a1f66
Remove two fixes that were backported to RC
2015-03-12 20:46:51 +01:00
tfennelly
ad9d191cbc
[FIXED JENKINS-27256] Added functional test for stapler fix to handle dispatcher methods for getX(long) model methods
2015-03-12 19:15:48 +00:00
Kohsuke Kawaguchi
80e9f3f50c
[FIXED JENKINS-22346]
...
The original motivation for the fix (to prevent users from logging in
once he's removed from the backend identity database) is legitimate,
but it affected too many users.
So as an escape hatch / non-promoted feature switch, I'm adding this
option to bring back the old behaviour.
2015-03-12 09:39:13 +00:00
Felix Belzunce Arcos
fb5540e38c
JENKINS-27183 Avoid deadlock when using build-monitor-plugin
2015-03-09 15:11:44 +01:00
liorha
7db618e64a
JENKINS-27289
2015-03-09 14:54:22 +02:00
Felix Belzunce Arcos
44db6aef3f
JENKINS-24433 Searchbox doesn't work properly inside a folder
2015-03-09 10:26:09 +01:00
Kohsuke Kawaguchi
e9bf4b71cd
the trunk is toward 1.604-SNAPSHOT
2015-03-08 12:42:02 -07:00
Kohsuke Kawaguchi
501b61fa14
creating an RC branch
2015-03-08 12:41:58 -07:00
Kohsuke Kawaguchi
871c1f11c9
merged back the RC branch
2015-03-08 12:27:51 -07:00
Kohsuke Kawaguchi
57ff82c7d8
updated changelog as a part of the release
2015-03-08 12:27:49 -07:00
Kohsuke Kawaguchi
87f97f4b07
updated changelog for release
2015-03-08 11:11:32 -07:00
Kohsuke Kawaguchi
ec514be3a1
[maven-release-plugin] prepare for next development iteration
2015-03-08 11:05:35 -07:00
Kohsuke Kawaguchi
42c082885c
[maven-release-plugin] prepare release jenkins-1.602
jenkins-1.602
2015-03-08 11:05:35 -07:00
Oliver Gondža
f880d8d2cd
[SECURITY-171] test
2015-03-07 20:32:17 +01:00
Oliver Gondža
25bf232c0d
[SECURITY-180] Test
2015-03-07 20:02:02 +01:00
Kohsuke Kawaguchi
feb2703adb
[FIXED SECURITY-171]
2015-03-07 10:28:40 -08:00
Kohsuke Kawaguchi
1699e2c1f3
[FIXED SECURITY-177]
...
Add nosniff header liberally to every request we serve.
2015-03-07 10:22:24 -08:00
Kohsuke Kawaguchi
b400d1507a
[FIXED JENKINS-27277]
2015-03-07 09:59:19 -08:00
Kohsuke Kawaguchi
c826a1b827
[FIXED SECURITY-180]
2015-03-07 09:35:28 -08:00
Oliver Gondža
2ba1f8faa5
Noting merge of #1558
2015-03-06 23:21:33 +01:00
Oliver Gondža
20171e4d86
Merge pull request #1558 from patbos/JENKINS-26723
...
[JENKINS-26723] Expose displayName in Remote API
2015-03-06 23:19:18 +01:00
Oliver Gondža
ba81a15f2a
Merge pull request #1584 from bmillemathias/patch-1
...
Spotted a HUDSON variable in debian default file
2015-03-05 22:52:53 +01:00
Grogdunn
3344c23a0e
Fix mime tipe with JSONP
...
Using https://github.com/stapler/stapler/pull/45 if the request contain jsonp parameter send the correct MIME type to avoid the error:
Refused to execute script from 'JENKINS_URL' because its MIME type ('application/json') is not executable, and strict MIME type checking is enabled.
2015-03-05 09:55:13 +01:00
Kohsuke Kawaguchi
2983905e45
the trunk is toward 1.603-SNAPSHOT
2015-03-04 06:30:25 -08:00
Kohsuke Kawaguchi
08211c26cc
creating an RC branch
2015-03-04 06:30:17 -08:00