Commit Graph
32590 Commits
Author SHA1 Message Date
Daniel Beck 511ccf0c83 Merge pull request #2230 from pjanouse/JENKINS-33942
[FIX JENKINS-33942] Fixed NPE when non-exists run requested
2016-04-06 18:28:51 +02:00
Daniel Beck 0846358bf6 Merge pull request #2228 from Vlatombe/JENKINS-21486-follow-up
[JENKINS-21486] Follow-up
2016-04-06 17:48:37 +02:00
Felix Belzunce Arcos a5961521e4 Address comments 2016-04-06 15:58:01 +02:00
Ing. Pavel Janousek 575c1af489 [JENKINS-33942] Fixed NPE when non-exists run requested 2016-04-06 15:46:10 +02:00
Baptiste Mathus 2c9adc9965 Merge pull request #2221 from rodrigc/java8_fix1
Do not use '_' as an identifier
2016-04-06 15:39:40 +02:00
Felix Belzunce Arcos 28335690e0 [JENKINS-32340] Enable disabled dependencies 2016-04-06 15:36:29 +02:00
Vincent Latombe 754fcf9906 Display the required version back. 2016-04-06 14:18:29 +02:00
Vincent Latombe 5ebf6b8bde [JENKINS-21486] Follow-up
Display of shortName of disabled plugin is enough. Fix copy-paste error
in the message for disabled dependencies
2016-04-06 14:12:33 +02:00
Daniel Beck c403e88f44 Merge pull request #2227 from jenkinsci/FIX-JENKINS-33930]
JENKINS-33930 focus color for delete
2016-04-06 10:39:11 +02:00
gusreiber 99e482b2a9 JENKINS-33930 focus color for delete
style only.
2016-04-05 14:52:52 -07:00
James Nord 4515625ab2 Merge pull request #2224 from rodrigc/java8_fix3
Fix href tags
2016-04-05 21:14:37 +01:00
kzantow 82c9e03d5c JENKINS-34035 - honor jenkins.install.runSetupWizard=false 2016-04-05 15:50:44 -04:00
Craig Rodrigues 552d8a6b95 Fix href tags
Eliminates errors with Java 8 and "mvn javadoc:test-javadoc" such as:

    [ERROR] jenkins/core/src/test/java/hudson/model/ItemsTest.java:12: error: unknown attribute: hef
    [ERROR] * @author: <a hef="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
2016-04-05 12:35:30 -07:00
Daniel Beck e6df9f55bb Merge pull request #2215 from kzantow/JENKINS-33805-rename-updated-file
[FIX JENKINS-33805] rename install/upgrade files to be more clear & consistent
2016-04-05 21:32:57 +02:00
Daniel Beck a9cc8406c5 Merge pull request #2217 from recena/JENKINS-31162
[JENKINS-31162] Provide a new Item Category
2016-04-05 21:20:19 +02:00
Daniel Beck 964e967ad9 Merge pull request #2203 from jenkinsci/jtnord-patch-1
[FIX JENKINS-33978] Set file permissions on the file before writing the secret
2016-04-05 21:18:37 +02:00
Daniel Beck 37c00cf2af Merge pull request #2185 from kzantow/JENKINS-33800-initial-password-file-not-found
[JENKINS-33800] - fileNotFound exception / more accurately determine if this is an upgrade
2016-04-05 21:04:35 +02:00
Craig Rodrigues 84fa59a87c Do not use '_' as an identifier
Eliminates Java 8 warnings:
  (use of '_' as an identifier might not be supported in releases after Java SE 8)
2016-04-05 11:03:08 -07:00
Daniel Beck 29f197069a Update changelog.html 2016-04-05 19:19:02 +02:00
recena 8d717fe528 [JENKINS-31162] Invalid package name 2016-04-05 18:19:17 +02:00
recena 770a8b256c [JENKINS-31162] Polish before RC 2016-04-05 17:56:03 +02:00
recena 9920b9c298 [JENKINS-31162] New descriptions in javadoc about categories 2016-04-05 17:15:27 +02:00
recena 00e507dc17 [JENKINS-31162] ItemCategory ID format changed 2016-04-05 16:29:54 +02:00
Daniel Beck e3ae36860d Merge branch '2.0' of github.com:jenkinsci/jenkins into 2.0 2016-04-05 15:36:31 +02:00
James Nord 20ccefcc74 Show the milestone order in the javadoc.
The javadoc lists the enum in alphabetical order, so you don't really know
the order in which the milestones are acheived.
2016-04-05 14:35:59 +01:00
Daniel Beck f2ba3b9642 Merge pull request #2213 from kzantow/JENKINS-33601-rename-skip
[FIXED ENKINS-33601] Change 'Skip' text in setup wizard
2016-04-05 15:33:07 +02:00
Oliver Gondža 3728b04581 Merge pull request #2212 from waldyr/master
Add pt-BR translation in usage statistics
2016-04-05 15:20:51 +02:00
recena cfba404f75 [JENKINS-31162] @daniel-beck's comment was addressed 2016-04-05 14:51:12 +02:00
recena 4734c981bb [JENKINS-31162] @jtnord's comment was addressed 2016-04-05 13:10:53 +02:00
recena 011a0a5319 [JENKINS-31162] Added license headers 2016-04-05 12:08:34 +02:00
recena 51ceacfb11 [JENKINS-31162] Added NestedProjectsCategory 2016-04-05 11:18:25 +02:00
Waldyr 68aed4cb09 Add pt-BR translation in usage statistics 2016-04-04 20:24:22 -03:00
Daniel Beck 425b727eac Merge branch 'master' of github.com:jenkinsci/jenkins into 2.0
Conflicts:
	cli/pom.xml
	core/pom.xml
	pom.xml
	test/pom.xml
	test/src/test/java/hudson/PluginManagerTest.java
	war/pom.xml
2016-04-04 23:00:39 +02:00
kzantow 9c25e1a6b5 Use class name convention for file names 2016-04-04 15:05:55 -04:00
Daniel Beck dc94c2dcd2 Merge pull request #2214 from abayer/build-with-jdk8
Switch to building/testing with JDK8.
2016-04-04 20:57:14 +02:00
kzantow 04a34a353d JENKINS-33805 - rename install/upgrade files to be more clear &
consistent
2016-04-04 11:50:13 -04:00
Andrew Bayer 8fecbaabaa Switch to building/testing with JDK8.
Memory issues (suspected) are causing hanging test execution when
building/testing with JDK7u80, so at Daniel Beck's suggestion, let's
move to JDK8.
2016-04-04 08:18:16 -07:00
Jesse Glick fa39668b81 [FIXED JENKINS-21486] Merged #2172: enforce plugin dependencies. 2016-04-04 11:06:43 -04:00
kzantow 6fc7c82c33 Change 'Skip' text in setup wizard 2016-04-04 10:40:58 -04:00
Daniel Beck be9bc0dba5 Fix typo 2016-04-04 13:28:12 +02:00
Baptiste Mathus 260eb75fd5 Merge pull request #2211 from batmat/fix-typo
Fix some typos in Usage Statistics Help pages (en & fr)
2016-04-04 13:24:14 +02:00
Baptiste Mathus 3131147550 Fix fr usage statistics help page typos 2016-04-04 13:22:29 +02:00
Daniel Beck 059fce9c8c Noting #2189, #2176, #2188, #2180, #2207 2016-04-04 12:38:17 +02:00
James Nord 0dce38abba Merge remote-tracking branch 'origin/2.0' into jtnord-patch-1 2016-04-04 10:03:21 +01:00
Kohsuke Kawaguchi bc316d02b4 updated changelog for release 2016-04-03 19:49:41 -07:00
Kohsuke Kawaguchi 5e084e9edd [maven-release-plugin] prepare for next development iteration 2016-04-03 19:45:00 -07:00
Kohsuke Kawaguchi c0f49d3b06 [maven-release-plugin] prepare release jenkins-1.656 jenkins-1.656 2016-04-03 19:44:59 -07:00
Baptiste Mathus fd3dce3fa3 Fix typos in en usage statistics help page 2016-04-03 23:37:20 +02:00
Jesse Glick 14d36c7dcd Merge pull request #2207 from jglick/ReverseBuildTrigger-JENKINS-33971
[JENKINS-33971] ReverseBuildTrigger.upstream2Trigger cache fix
2016-04-03 10:37:16 -04:00
Christopher Orr 953897e028 Update and expand documentation for SCM retries. 2016-04-03 03:52:15 +02:00