Oliver Gondža
bd2a4c85d3
Merge pull request #968 from akiellor/JENKINS-18434
2013-10-08 18:50:14 +02:00
Harald Albers
8a55679823
purged some orphaned localized messages
2013-10-08 18:00:29 +02:00
Andrew Kiellor
c4e2e597b3
Merge branch 'master' of github.com:jenkinsci/jenkins into JENKINS-18434
2013-10-08 11:14:23 -04:00
Andrew Kiellor
87f99fa1cb
Revent changes to Jenkins and JenkinsTest.
2013-10-08 11:14:03 -04:00
Oliver Gondža
99dcb4121f
Merge branch 'master' to reflect maven removal
...
Conflicts:
maven-plugin/src/main/java/hudson/maven/MavenBuild.java
test/src/test/java/hudson/maven/MavenBuildTest.java
2013-10-08 16:25:05 +02:00
Andrew Kiellor
3f2d003ba5
Move check into ChoiceParameterDefinition.DescriptorImpl.
2013-10-08 09:33:48 -04:00
Kohsuke Kawaguchi
8c4288ca59
Merge remote-tracking branch 'origin/master' into executor-ondemand
2013-10-07 20:38:34 -07:00
Kohsuke Kawaguchi
428aa7aaee
the trunk is toward 1.536-SNAPSHOT
2013-10-07 19:56:20 -07:00
Kohsuke Kawaguchi
b64296efcc
creating an RC branch
2013-10-07 19:56:15 -07:00
Kohsuke Kawaguchi
3f6672d3a5
Merge branch 'master' of github.com:jenkinsci/jenkins
2013-10-07 19:54:09 -07:00
Jesse Glick
04c8a1efc0
[FIXED JENKINS-18633] Simplified distinction between Jenkins.description and View.description.
...
Both are shown if defined. The edit description link only applies to View.description.
Properly handle a ViewGroup other than Jenkins itself, such as a folder.
2013-10-07 18:40:48 -04:00
Andrew Kiellor
d244b6b69a
FIXES JENKINS-18434 - Added validation error to Parameterized build choice, removed hard error.
2013-10-07 16:29:06 -04:00
Oliver Gondža
ce29cdb339
Merge branch 'master' of github.com:jenkinsci/jenkins
2013-10-07 20:06:08 +02:00
Jesse Glick
7ca4dc47ec
[FIXED JENKINS-19920] Using selfReference to mean “none” from nextBuild/previousBuild was just asking for trouble.
...
JENKINS-16194 and an analogous but opposite bug fixed more simply by introducing a separate NONE constant.
Also numberOnDisk did not get updated properly after a build was deleted, causing double loading of build records in some cases.
2013-10-07 13:30:05 -04:00
Kohsuke Kawaguchi
dd099cf403
merged back the RC branch
...
Conflicts:
maven-plugin/pom.xml
plugins/pom.xml
ui-samples-plugin/pom.xml
2013-10-07 10:28:11 -07:00
Kohsuke Kawaguchi
5e6c33e304
updated changelog as a part of the release
2013-10-07 09:06:22 -07:00
Jesse Glick
571de9c148
JUnit 4; introduced GroovyJenkinsRule.
2013-10-07 11:43:39 -04:00
Jesse Glick
ed03fbbc9d
Revert "[FIXED JENKINS-18629]"
...
This reverts commit d15c15506e .
2013-10-07 11:18:36 -04:00
Kohsuke Kawaguchi
d15c15506e
[FIXED JENKINS-18629]
...
Consult Descriptor.newInstance() even when proccessing is in the middle
of JSON tree.
2013-10-07 08:10:42 -07:00
Kohsuke Kawaguchi
1e1ca08f12
updated changelog for release
2013-10-07 08:01:43 -07:00
Kohsuke Kawaguchi
0fef710c7b
[maven-release-plugin] prepare for next development iteration
2013-10-07 07:52:13 -07:00
Kohsuke Kawaguchi
d7002b0890
[maven-release-plugin] prepare release jenkins-1.534
jenkins-1.534
2013-10-07 07:52:13 -07:00
Oliver Gondža
6f0a471e51
Noting #531
2013-10-07 15:15:31 +02:00
Oliver Gondža
82a10c12ce
Merge pull request #531 from lvotypko:scheduled-jobs-in-view
...
Conflicts:
core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
2013-10-07 15:07:12 +02:00
Oliver Gondža
b533f77065
Amend #616
2013-10-07 11:26:24 +02:00
Oliver Gondža
04359e07a3
Merge pull request #616 from lvotypko/expand-all
2013-10-07 09:27:39 +02:00
Kohsuke Kawaguchi
b19f4650d7
[FIXED JENKINS-18366] Winstone is now powered by Jetty
2013-10-06 11:27:00 -07:00
Harald Albers
982d939f66
German localization for "Disable remember me" option
2013-10-06 12:54:36 +02:00
Jesse Glick
b9437154d8
ClassicPluginStrategy.DETACHED_LIST could confuse ClassicPluginStrategyTest by injecting dependencies on split plugins that have an index.jelly.
2013-10-04 18:19:49 -04:00
Jesse Glick
4613b15cc4
Split out ui-samples-plugin into its own repo.
2013-10-04 17:32:19 -04:00
Jesse Glick
89149277ae
matrix-auth 1.0.2 (couple of fixups)
2013-10-04 17:06:28 -04:00
Jesse Glick
b0ac41c3b1
Split off matrix-auth plugin.
2013-10-04 16:27:15 -04:00
Jesse Glick
c01f2564eb
Removing test dep on ui-samples.
...
Superfluous in that if you *want* to look at UI samples, you can just install that plugin.
And observed to cause a cyclic plugin dependency error when splitting matrix-auth from core.
(Unclear why ui-samples had a dependency on matrix-auth; perhaps related to dependency from test module.)
2013-10-04 16:24:13 -04:00
Jesse Glick
071139f8e5
Merge branch 'master' of github.com:jenkinsci/jenkins
2013-10-04 14:59:01 -04:00
Jesse Glick
7b38b7c5e9
Merge pull request #967 from akiellor/fix-local-build-issues
...
Fix `mvn -Plight-test install` on Ubuntu 13.04 with OpenJDK
2013-10-04 11:48:27 -07:00
Jesse Glick
f1205fa4d6
Copy basic Surefire configuration, esp. forkCount=2, to the plugin POM.
...
Shaves >11min off the test time for maven-plugin on my machine!
2013-10-04 14:37:27 -04:00
Andrew Kiellor
47c90210e3
Remove unused import.
2013-10-04 13:51:44 -04:00
Jesse Glick
261f40533e
Moving one test case to maven-plugin.
2013-10-04 13:43:48 -04:00
Andrew Kiellor
ff71ab755c
Migrated some usages of GNUCLibrary to the jnr PosixAPI, fixed 'mvn -Plight-test install' on ubuntu with OpenJDK.
2013-10-04 13:42:42 -04:00
Jesse Glick
facfc178df
Moving hudson.maven tests to maven-plugin.
2013-10-04 12:50:28 -04:00
Jesse Glick
8deb42bf89
[JENKINS-19473] Removing workaround since root bug should be fixed in jzlib 1.1.3.
2013-10-04 11:16:55 -04:00
Oliver Gondža
0460a04f1c
[FIXED JENKINS-19884] Visualize more information in test failure summary
...
Now lists error details, stack trace, stderr and stdout provided its content is
not empty.
2013-10-04 13:43:30 +02:00
Oliver Gondža
968acad701
[JENKINS-19884] Use +/- icon instead of >>> and <<< to show and hide test failure summary
2013-10-04 13:43:30 +02:00
Oliver Gondža
9b1bcb8674
[JENKINS-19884] Unify test failure presentation
...
- SurefireAggregatedReport lists all aggregated failures now (its maven counterpart MatrixTestResult does it already)
- Failure summary is available wherever applicable
2013-10-04 13:43:30 +02:00
Kohsuke Kawaguchi
f98070d3e6
maven plugin is moved off to a separate repository.
...
See https://github.com/jenkinsci/maven-plugin
2013-10-03 22:35:14 -07:00
Jesse Glick
7ca07b5d4b
[JENKINS-16332] Further diagnostics. Note that you must enable a hudson.model.User logger at FINE or below to use.
2013-10-03 12:32:04 -04:00
Kevin Burke
b544eaabc5
Add more classes for disable project and description
2013-10-03 08:16:27 -07:00
Jesse Glick
1c68183ae8
[FIXED JENKINS-19307] Noting merge of pull #937 .
2013-10-03 10:34:34 -04:00
Jesse Glick
b86d9e94d4
Merge branch 'JENKINS-19486_Polling_with_workspace_gets_incorrect_environment' of https://github.com/Vlatombe/jenkins into Vlatombe-JENKINS-19486_Polling_with_workspace_gets_incorrect_environment
2013-10-03 10:27:07 -04:00
Vojtěch Juránek
5c25cb6a1b
Merge pull request #964 from edenrox/master
...
[FIXED JENKINS-10675] use X-Forwarded-Proto if present
2013-10-02 14:11:33 -07:00