OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 13:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,590 Commits 55 Branches 1,942 Tags
1e646ff7ee52ecbbca3d7957b65fb4edfd39d653
Commit Graph
32590 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kohsuke Kawaguchi 7f311c113b [maven-release-plugin] prepare for next development iteration 2018-04-01 16:15:39 -07:00
Kohsuke Kawaguchi 7983ec1309 [maven-release-plugin] prepare release jenkins-2.114 jenkins-2.114 2018-04-01 16:15:39 -07:00
Oleg Nenashev 3f8a843a86 Merge pull request #1111 from ikedam/feature/JENKINS-21613_onsubmit_for_combobox 
[JENKINS-21613] f:combobox may break form.onsubmit
 2018-03-31 20:09:57 +02:00
Daniel Beck c82620dca9 Minimize readResolve visibility (#2567) 
* Minimize readResolve visibility

* Relax visibility from private to protected
 2018-03-31 19:06:21 +02:00
Oleg Nenashev d534d5dc9d Merge pull request #3376 from dwnusbaum/JENKINS-44402 
[JENKINS-44402] Make cancel shutdown link work when loaded via AJAX
 2018-03-31 19:04:37 +02:00
Wadeck Follonier 22629729b3 Fix the CLI tests for logout of user without READ permission 2018-03-29 14:28:06 +02:00
Baptiste Mathus 8521b8bf19 Check buildsDir value and fail Jenkins startup if wrong 2018-03-29 12:16:30 +02:00
Daniel Beck bbe96187ab Merge branch 'security-stable-2.107' into security-master 2018-03-29 02:01:34 +02:00
Daniel Beck d7e9ebd26c Merge commit 'a0c080f55233a1273282a720b5246954e203197a' into security-master 2018-03-29 01:35:36 +02:00
Daniel Beck 06de1a8bfc Merge branch 'stable-2.107' 2018-03-29 01:34:33 +02:00
Daniel Beck 2c027302de Merge commit 'a0c080f55233a1273282a720b5246954e203197a' of git://github.com/jenkinsci/jenkins 2018-03-29 01:34:12 +02:00
Daniel Beck 0a11f4e51d Merge branch 'security-stable-2.89' into security-stable-2.107 2018-03-29 01:32:28 +02:00
Daniel Beck 50b2dbdd56 Merge branch 'stable-2.107' of git://github.com/jenkinsci/jenkins into stable-2.107 2018-03-29 01:31:10 +02:00
Daniel Beck f6a6f0c364 Merge branch 'security-stable-2.73' into security-stable-2.89 2018-03-29 01:30:35 +02:00
Daniel Beck 7abc71338b Merge branch 'security-stable-2.60' into security-stable-2.73 2018-03-29 01:29:48 +02:00
Daniel Beck dcbf9c18bf Merge branch 'security-stable-2.46' into security-stable-2.60 2018-03-29 01:28:51 +02:00
Devin Nusbaum 69a784bb8d [SECURITY-754] 2018-03-28 22:57:18 +02:00
Wadeck Follonier 07d18cfd6d [SECURITY-759] 2018-03-28 22:56:07 +02:00
Oliver Gondža 5a12b25078 Merge branch 'stable-2.107' of github.com:jenkinsci/jenkins into stable-2.107 2018-03-28 16:08:57 +02:00
Oleg Nenashev f513419c76 [JENKINS-49737 ] - Update Extras Executable WAR to 1.38 (#3336) 
* [JENKINS-49737] - Update Extras Executable WAR to 1.38

* Use the released version of Extras Executable War 1.38

(cherry picked from commit fa54b49f32)
 2018-03-28 16:06:01 +02:00
Devin Nusbaum b2cdcf0218 [JENKINS-44402] Workaround to make cancel shutdown work when loaded by AJAX 2018-03-28 09:36:52 -04:00
Baptiste Mathus 2c1fdd2699 Name sysprops more consistently with others 
https://wiki.jenkins.io/display/JENKINS/Features+controlled+by+system+properties
 2018-03-28 14:31:40 +02:00
Baptiste Mathus be2dbec1cd Merge pull request #3374 from batmat/JENKINS-50439 
[JENKINS-50439] Pick-up executable-war 1.39
 2018-03-28 12:52:58 +02:00
Baptiste Mathus 54c35c6e4b Merge pull request #3367 from batmat/JENKINS-50291 
[JENKINS-50291] Customize where Async[A]PeriodicWork tasks are logged
 2018-03-28 11:08:33 +02:00
Baptiste Mathus 8a25280992 [JENKINS-50439] Pick-up executable-war 1.39 2018-03-28 10:31:09 +02:00
Baptiste Mathus 58b875359e Disable fromPreviousCustomSetup on Windows 
Because I use restart and it's not supported there.
 2018-03-27 16:32:30 +02:00
Baptiste Mathus c50d808de1 Use a property name that does not imply it is only about tasks logging 
When indeed it is not only about those.
 2018-03-27 14:42:59 +02:00
Oliver Gondža 834fa97e7a Merge pull request #3372 from oleg-nenashev/stable-2.107-JENKINS-50237-port 
[JENKINS-50237] - Backport: Whitelist org.apache.tools.ant.Location for serialization
 2018-03-27 13:14:23 +02:00
Baptiste Mathus 774388598e Add to check removing sysprop keeps the previous value 
Addressing @jtnord's concern/following use case:

* Custom build/workspace are set in existing Jenkins config (from version
  without this change)
* Jenkins is upgraded
* Jenkins config is saved
* configuration should not be reset - existing custom values should be
  retained until they set the system property
 2018-03-27 12:05:20 +02:00
Wadeck Follonier 3a6a05e518 ApiTokenStore is now saved / loaded from a file aside config.xml in user folder 
- this allows the stats to be incremented without changing the config.xml of the user
 2018-03-27 11:46:17 +02:00
Jesse Glick 2090468d82 Using new beta annotation. 2018-03-26 18:37:45 -04:00
Jesse Glick 8e60538afe Merge branch 'master' into VirtualFile-JENKINS-49635 2018-03-26 18:31:04 -04:00
R. Tyler Croy 0ca03d89c7 Merge pull request #3371 from raul-arabaolaza/JENKINS-50405-Quick_fix 
[JENKINS-50405] Run the entire thing in docker && highmem node
 2018-03-26 10:20:06 -07:00
Oleg Nenashev a277b58adc [JENKINS-50237] - Whitelist org.apache.tools.ant.Location for serialization 
(cherry picked from commit 300fbc3715)
 2018-03-26 18:00:27 +02:00
Raul Arabaolaza 9f8b5d691e [JENKINS-50405] Run the entire thing in docker && highmem node 2018-03-26 17:42:19 +02:00
Wadeck Follonier f3a1c41c12 - add unit test for the monitoring page (include filter work) 
- correct placement of stapler:adjunct to avoid putting <link> before the html tag
- decrease the javascript version required to run resources.js (for unit test)
- re-move the zip file due the package migration that was done on it but was not required
 2018-03-26 16:16:30 +02:00
Jesse Glick 5d4a76d284 [JENKINS-49573] Fix bad serialization of ParametersAction.parameterDefinitionNames. 
(cherry picked part of commit fcae9bb598)
 2018-03-26 13:24:20 +02:00
Vincent Latombe 9f599911f6 [JENKINS-49401] Move Setup Wizard initialization logic to the init reactor. (#3282) 
This way, it is guaranteed Jenkins.save() has never been called before
the SetupWizard is executed, and computation of the initial Setup Wizard
state will be correct.

Since the SetupWizard is now executed before reaching the COMPLETED
milestone, a Jenkins.save() call has been added in order to persist any
configuration change done in prior phases.
 2018-03-26 09:38:33 +02:00
Kohsuke Kawaguchi a0c080f552 [maven-release-plugin] prepare for next development iteration 2018-03-25 18:29:00 -07:00
Kohsuke Kawaguchi 52e2f4ee84 [maven-release-plugin] prepare release jenkins-2.113 jenkins-2.113 2018-03-25 18:29:00 -07:00
Daniel Trebbien aa799e39ad [JENKINS-49971] Fix a race condition in Util.loadFile() (#3225) 
* Fix a race condition in Util.loadFile()

If the file is deleted in between when its existence is checked and the
file is opened for reading, then the method will fail to return an empty
string.

* Switch to using FileUtils.readFileToString()

(cherry picked from commit aaae71af4b)
 2018-03-25 20:17:21 +02:00
James Nord 99592e0a84 [JENKINS-50124] restore AbstractTaskListeners serialVersionUID. 
If a subclass was serialized (default java serialization) then the
changes do push down the method to the interface would break
deserialisation when in reality the classes are still compatable.

Restoring the compatability by hard coding the serialVersionUID to what
it was before the change.

(cherry picked from commit dcf22ca809)
 2018-03-25 20:11:12 +02:00
ikedam d0ff4135e9 [FIXED JENKINS-21613] combobox now recovers form.onsubmit to the one just before override. 2018-03-25 12:37:44 +09:00
Sorin Sbarnea a30ada7907 [JENKINS-47020] - Improve job search experience (#3324) 
* Increase search results limit from 20 to 100

Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>

* Enlarge search box size

Increase the max number of results from 10 to 25.
Increase width of results from 25em to 35em
in order to suit longer job names.

This still fits even small 13" screens and improves
user experience.

Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
 2018-03-24 12:09:34 +01:00
Jesse Glick 9b75cd28f6 Making Run.getArtifactsUpTo call VirtualFile.run. 2018-03-23 18:09:42 -04:00
Baptiste Mathus 34f9586f5e [JENKINS-50291] Customize where Async[A]PeriodicWork tasks are logged 2018-03-23 22:40:35 +01:00
Jesse Glick 90fd89ff67 Use run(Callable) from the default list(String, String, boolean) so it can run efficiently without an override. 2018-03-23 16:47:53 -04:00
Jesse Glick 2e1af785ea Merge branch 'master' into VirtualFile-JENKINS-49635 2018-03-23 13:34:52 -04:00
Steve Arch 7d13e179c9 [JENKINS-50296] Had used wrong issue number 2018-03-23 15:49:40 +00:00
Baptiste Mathus 3d9b6f3ffd Move and refactor test as now the UI is not anymore 2018-03-23 16:29:17 +01:00