Commit Graph
23301 Commits
Author SHA1 Message Date
Manuel Recena cb058a1ff9 [JENKINS-32936] Support for multiple layouts in Jelly Layout tag (#2253)
* [JENKINS-32936] Initial source code modifications

* [JENKINS-32936] Three views are using this approach

* [JENKINS-32936] Conflicts were resolved in a wrong way
2016-05-05 13:23:01 +02:00
Kohsuke Kawaguchi 31ad77005e Merge pull request #2293 from jenkinsci/symbol
Symbol annotations on core
2016-05-04 15:31:36 -07:00
Daniel Beck 5e0b737138 Merge pull request #2154 from olivergondza/move-test-classes
Move remaining test helper classes from core repo
2016-05-04 14:47:37 +02:00
Oliver Gondža a3e2831b47 Merge branch 'master' into move-test-classes 2016-05-04 10:30:07 +02:00
Daniel Beck 240405dfc3 Merge pull request #2026 from pjdarton/fix_jenkins_15331
[FIX JENKINS-15331] Windows file locking workaround
2016-05-04 01:32:27 +02:00
Daniel Beck 49a65c2bbb Merge pull request #2257 from pjanouse/JENKINS-32874
[JENKINS-32874] Improved test coverage of AbstractBuildRangeCommand
2016-05-04 00:53:43 +02:00
Daniel Beck 134abbd6d3 Merge pull request #2289 from recena/JENKINS-34438
[JENKINS-34438] Activate JSHint during the build process
2016-05-03 21:22:32 +02:00
recena ed21605c00 After to merge with master in order to resolve the conflicts, I found some JSHint errors 2016-05-03 16:29:20 +02:00
recena deb47ee11d Resolving conflict from master 2016-05-03 16:08:36 +02:00
Daniel Beck 4927968eb0 Merge pull request #2307 from pjanouse/deprecating-cliOnline
Deprecating Computer.cliOnline()
2016-05-03 14:46:37 +02:00
Daniel Beck 1d4e8b4120 Merge pull request #2178 from oleg-nenashev/JENKINS-33848
[FIXED JENKINS-33848] - Do not try to resolve empty strings in Items:fromNameList()
2016-05-03 14:46:08 +02:00
Daniel Beck eae8cd6fb3 Merge pull request #2250 from recena/JENKINS-33822
[JENKINS-33822] Create a new item using the keyboard
2016-05-03 14:44:34 +02:00
Ing. Pavel Janousek e9edd5c6c7 Deprecating Computer.cliOnline()
Functionality was moved to OnlineNodeCommand class already
2016-05-03 14:01:57 +02:00
Oleg Nenashev d442682699 Merge pull request #2287 from recena/coding-style
Removed tab characters and 4-spaces indentantion
2016-05-03 12:52:21 +02:00
Daniel Beck 09bbfc481f Update changelog.html 2016-05-02 18:16:13 +02:00
Kohsuke Kawaguchi 92c81e6aee Merge remote-tracking branch 'origin/master' into symbol 2016-05-02 08:50:27 -07:00
Kohsuke Kawaguchi 746fdcba38 Merge pull request #2298 from vivek/master
Upgrade to stapler 1.243 and some testcase fix.
2016-05-02 08:49:52 -07:00
Kohsuke Kawaguchi f238ade13e Merge pull request #2177 from jenkinsci/2nd-reactor
Don't go through init sequence twice
2016-05-02 08:49:32 -07:00
Oliver Gondža eb7f9ad0d5 Merge pull request #2305 from daniel-beck/warning2info
Reduce logging level of some warnings to INFO
2016-05-02 15:16:43 +02:00
Daniel Beck 1e87a8fddb Reduce logging level of some warnings to INFO 2016-05-02 11:04:34 +02:00
Daniel Beck 60a3fdf4d7 Add changelog for 2.1 2016-05-01 22:55:28 +02:00
Kohsuke Kawaguchi 24adcb20b4 updated changelog for release 2016-05-01 10:21:35 -07:00
Kohsuke Kawaguchi 16465de28b [maven-release-plugin] prepare for next development iteration 2016-05-01 10:04:48 -07:00
Kohsuke Kawaguchi f9f597816c [maven-release-plugin] prepare release jenkins-2.1 jenkins-2.1 2016-05-01 10:04:48 -07:00
Daniel Beck 54270b3340 Merge pull request #2258 from kzantow/JENKINS-33950-multiple-dependency-install-fix
[JENKINS-33950] dependencies may be installed multiple times
2016-05-01 14:08:20 +02:00
Daniel Beck eee3dba3e6 Merge pull request #2292 from kzantow/JENKINS-33948-scrollspy-clicks
[JENKINS-33948] - Always display clicked scrollspy items as active
2016-05-01 14:06:27 +02:00
Daniel Beck 3ac7ee9307 Merge pull request #2299 from kzantow/JENKINS-34494-enable-required-plugins
[JENKINS-34494] enable required plugins during plugin installs
2016-05-01 14:04:55 +02:00
Daniel Beck 59f066462c Merge pull request #2229 from fbelzunc/JENKINS-32340-v2
[JENKINS-32340] Enable disabled dependencies
2016-05-01 14:03:18 +02:00
Daniel Beck bc1c2cab16 Merge pull request #2273 from waldyr/feature/pt-br-translations
Add pt_BR translations
2016-04-30 02:21:09 +02:00
Vivek Pandey cccfa89c6c Upgrading to Stapler 1.243 2016-04-29 10:22:46 -07:00
kzantow 0c95d25c28 Fix dynamic load for disabled plugins which are enabled as part of
required dependencies; this may still have some issues in unknown cases
such as a plugin disabled, then re-enabled without restarting Jenkins
but it fixes one of the primary cases
2016-04-29 11:58:04 -04:00
Waldyr 5ebab10c8d Use another name for license 2016-04-29 09:42:28 -03:00
Waldyr 9a0250fbc0 Remove job translation and typos 2016-04-29 09:41:37 -03:00
Vivek Pandey 114ae54bb9 Some more test fixes. 2016-04-28 23:46:12 -07:00
kzantow 247abf734d JENKINS-34494 - enable required plugins during plugin installs 2016-04-29 02:39:27 -04:00
Kohsuke Kawaguchi 15c543d2e2 'default' is not a valid identifier, so we need something else.
This is truly unfortunate because 'default' is how we call them in the
UI. My choice is between something like 'default_' vs a synonym, so I
went for 'standard'
2016-04-28 19:16:52 -07:00
Kohsuke Kawaguchi 2a7ed69072 'boolean' is a not a valid Java identifier 2016-04-28 19:14:32 -07:00
Vivek Pandey 9e709faea1 Upgrade to stapler 1.241 and some testcase fix.
Stapler 1.241 adds _class element to generated JSON with the name of ExportedBean class, this
was failing couple tests in ApiTest.json(), where the tests were comparing fixed string json.
2016-04-28 17:02:35 -07:00
Jesse Glick dd3a3d2d4e Merge branch 'stable-1.651' 2016-04-28 17:38:34 -04:00
Tom Fennelly caef648736 Merge pull request #2291 from tfennelly/async-supported
Switch on async-supported for Stapler and all Servlet Filters
2016-04-28 19:33:56 +01:00
Daniel Beck fc2234c3ed Merge pull request #2286 from tomass/master
Lithuanian translation update
2016-04-28 15:06:13 +02:00
Daniel Beck b8f983bceb Merge pull request #2290 from pjanouse/JENKINS-34448
[JENKINS-34448] Fixed offlineCause race condition
2016-04-28 14:21:20 +02:00
James Nord f391f8be2b [FIXED JENKINS-33999] Update remoting to 2.57
This picks up the new remoting with the upstream fix for Jenkins-33999
which allows spring Exceptions past the class blacklist

(cherry picked from commit 08fe459d12)
2016-04-27 15:15:30 +02:00
Ing. Pavel Janousek 822cec62db [JENKINS-34448] Fixed offlineCause race condition 2016-04-27 15:02:40 +02:00
Kohsuke Kawaguchi 808c44c8e3 Treat any interruption during boot as a fatal failure 2016-04-26 17:53:41 -07:00
Kohsuke Kawaguchi 137e8ce46b Clarifying that this is not atomic and that's OK for the use case. 2016-04-26 16:23:15 -07:00
Kohsuke Kawaguchi f94ce3ac44 Added consistent names matching with other ParameterDescriptors
... based on comments in PR #2160
2016-04-26 16:13:03 -07:00
Kohsuke Kawaguchi 6af569c4f0 Merge remote-tracking branch 'origin/master' into symbol
Conflicts:
	core/src/main/java/hudson/model/FreeStyleProject.java
	core/src/main/java/jenkins/model/GlobalConfigurationCategory.java
2016-04-26 16:07:09 -07:00
Jesse Glick 67597a7c91 Merge branch 'stable-1.651' 2016-04-26 15:58:48 -04:00
Jesse Glick e8d2f41a92 Merge branch 'stable-1.642' into stable-1.651 2016-04-26 15:58:29 -04:00