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
25,869 Commits 55 Branches 1,942 Tags
bed6ccd71921c9321919f7a042864dbbbf63243a
Commit Graph
4052 Commits
Author SHA1 Message Date
Daniel Beck bed6ccd719 Merge pull request #3187 from daniel-beck/JENKINS-34254-v2 
[JENKINS-34254] Fix RequirePOST form

(cherry picked from commit 76c9f8beac)
 2018-01-25 13:44:08 +01:00
Kohsuke Kawaguchi 2904044e51 [maven-release-plugin] prepare for next development iteration 2018-01-17 14:52:07 -08:00
Kohsuke Kawaguchi 847a2534ce [maven-release-plugin] prepare release jenkins-2.89.3 2018-01-17 14:52:07 -08:00
Daniel Beck e9ecbb326c Merge pull request #3201 from dwnusbaum/JENKINS-48604 
[JENKINS-48604] Do not downgrade plugins that are dependencies of detached plugins when upgrading Jenkins

(cherry picked from commit 1dc2c6d5ff)
 2018-01-03 15:01:35 +01:00
Oleg Nenashev 0319362666 Merge pull request #3193 from dwnusbaum/JENKINS-48365 
[JENKINS-48365] Install detached plugins when upgrading Jenkins past the version the plugins were detached

(cherry picked from commit 968b6adf00)
 2018-01-03 15:01:11 +01:00
Kohsuke Kawaguchi 0e5db018ca Merge remote-tracking branch 'origin/stable-2.89' into stable-2.89 2017-12-13 16:53:42 -08:00
Kohsuke Kawaguchi 8ae7df076e [maven-release-plugin] prepare for next development iteration 2017-12-13 16:41:56 -08:00
Kohsuke Kawaguchi b6443aacbb [maven-release-plugin] prepare release jenkins-2.89.2 2017-12-13 16:41:56 -08:00
Oleg Nenashev 6be05b8014 [JENKINS-48157] - Risk of NPE when migrating MyViewProperty without PrimaryView (#3156) 
* [JENKINS-48157] - Reproduce the issue in test

* [JENKINS-48157] - Annotate and document nullness conditions in MyViewsProperty and ViewGroupMixIn

* [FIXED JENKINS-48157] - Prevent NPEs when using public API and when using null primaryViewName

* [JENKINS-48157] - Fix typo in Javadoc

(cherry picked from commit 211b57e8b0)
 2017-12-11 10:32:26 +01:00
t-hall 065b874a47 [JENKINS-34138] Fix maven installs from stepping on each other (#3042) 
* [JENKINS-34138] Adding equals/hashCode methods so that installs don't step on each other

* [JENKINS-34138] Added issue reference to unit tests

* [JENKINS-34138] - changed the order of equals / hashcode

(cherry picked from commit d688c15490)
 2017-12-11 10:31:13 +01:00
Kohsuke Kawaguchi 2a1406e4bf [maven-release-plugin] prepare for next development iteration 2017-12-06 11:10:45 -08:00
Kohsuke Kawaguchi 2fa723b1ee [maven-release-plugin] prepare release jenkins-2.89.1 2017-12-06 11:10:45 -08:00
Daniel Beck 8058675317 Merge pull request #3134 from jglick/IdStrategy-NFE-JENKINS-47909 
[JENKINS-47909] Handle false hex escapes

(cherry picked from commit 7c06a9ba94)
 2017-11-30 09:09:26 +01:00
Wadeck Follonier 179ac8df08 [JENKINS-43852] add caching options for captcha (#3126) 
* JENKINS-42852 add caching options for captcha

* - remove whitespace

* - correct unit tests

* - copy/paste is bad

* - second edit...

(cherry picked from commit 80d17f5a68)
 2017-11-22 18:20:53 +01:00
Oliver Gondža d3bb74334b Towards 2.89.1 2017-11-10 10:48:19 +01:00
Kohsuke Kawaguchi 02faf36dc3 [maven-release-plugin] prepare release jenkins-2.89 2017-11-06 10:15:25 -08:00
Jesse Glick 08d50a929a Merge commit '048e313aa95844e2366a0611192415abbcf4b5ee' into security-master 2017-11-06 07:13:57 -05:00
Kohsuke Kawaguchi 048e313aa9 [maven-release-plugin] prepare for next development iteration 2017-11-05 16:30:59 -08:00
Kohsuke Kawaguchi 727b5c48e6 [maven-release-plugin] prepare release jenkins-2.88 2017-11-05 16:30:58 -08:00
Oleg Nenashev 4f6ff15fba Merge pull request #3121 from jglick/missingDescriptor-JENKINS-45977 
[JENKINS-45977] Behave robustly when a UserProperty is missing its descriptor
 2017-11-04 10:04:23 +01:00
Jesse Glick f8f5ffc7e6 [FIXED JENKINS-45977] Behave robustly when a UserProperty is missing its descriptor. 2017-10-31 14:23:03 -04:00
Oleg Nenashev 27f0abd414 [FIXED JENKINS-47181] - Recover the agent protocol handling tests. (#3118) 
* [FIXED JENKINS-47181] - Recover the agent protocol handling tests.

The protocol handling logic does not longer use bogus assumptions anymore.
Instead of that, there are extra `MockAgentProtocol` instances (to be moved to JTH?)

* Extremely important fix to retrigger the PR builder
 2017-10-30 20:53:42 +01:00
Jesse Glick 209a5ad1a5 Merge commit 'c2aca606e3dc45384c38785e1ced4780733bd906' into security-master 2017-10-30 10:18:02 -04:00
Oleg Nenashev c7f68438e8 Fix typo in the SetupWizardTest#shouldProhibitAccessToPluginListWithoutAuth() 2017-10-30 11:54:36 +01:00
Kohsuke Kawaguchi c2aca606e3 [maven-release-plugin] prepare for next development iteration 2017-10-29 20:46:03 -07:00
Kohsuke Kawaguchi 655472efde [maven-release-plugin] prepare release jenkins-2.87 2017-10-29 20:46:03 -07:00
Wadeck Follonier ac3cd3eb21 [JENKINS-47426] getPropertyKey is not consistent over time (#3080) 
* JENKINS-47426: getPropertyKey is not consistent over time
- add passing test for the case the rootUrl is set
- add failing test for the case the rootUrl is not set yet, the propertyKey is not consistent
- add a warning message when the flow passes in the fallback mode

* - fixing the getEncryptedValue using a static memory

* - add issue annotations

* - modifications proposed by Jesse: use legacyId instead of randomId, stable over restart

* - small correction for a test case
 2017-10-28 23:01:50 +02:00
Jesse Glick f266a7f6aa Merge commit '790068c8486cdd4741336f9d61de72a9a6537a30' into security-master 2017-10-23 09:09:19 -04:00
Kohsuke Kawaguchi 790068c848 [maven-release-plugin] prepare for next development iteration 2017-10-22 17:56:23 -07:00
Kohsuke Kawaguchi 8c0ea07d5d [maven-release-plugin] prepare release jenkins-2.86 2017-10-22 17:56:23 -07:00
Oleg Nenashev b3d20446dc Merge pull request #3098 from jglick/QueueTest.taskEquality 
QueueTest.taskEquality was flaky
 2017-10-22 11:16:39 +02:00
Oleg Nenashev 136fe8255e Merge pull request #3093 from dwnusbaum/JENKINS-47448 
[JENKINS-47448] Fix JDKInstaller for downloads requiring an Oracle login
 2017-10-21 09:46:40 +02:00
Jesse Glick 5e6b1050b2 Merge pull request #3099 from jglick/getCauseOfBlockage-JENKINS-47517 
[JENKINS-47517] Revert the change to the default behavior of Queue.Task.getCauseOfBlockage
 2017-10-20 18:02:40 -04:00
Jesse Glick 19714f2018 Deprecate isBuildBlocked & getWhyBlocked in favor of getCauseOfBlockage, which you needed to implement anyway. 2017-10-19 13:06:35 -04:00
Jesse Glick a9246c2887 Merge branch 'security-stable-2.73' into security-master 2017-10-19 12:28:51 -04:00
Jesse Glick a2491e323b Merge branch 'security-stable-2.60' into security-stable-2.73 2017-10-19 12:28:07 -04:00
Jesse Glick 87b7ba7d31 Merge branch 'security-stable-2.46' into security-stable-2.60 2017-10-19 12:19:45 -04:00
Rebecca Ysteboe 566a8ddb88 [SECURITY-499] Sanitize user id <-> filename conversion 2017-10-19 12:14:51 -04:00
Jesse Glick 0e5274b4b5 [JENKINS-47517] Revert the change to the default behavior of Queue.Task.getCauseOfBlockage. 2017-10-18 22:07:59 -04:00
Jesse Glick 3defe0f8aa QueueTest.taskEquality was flaky: the original task could run before we got a chance to even try scheduling a second. 2017-10-18 15:02:22 -04:00
Jesse Glick 815b97a907 Updating JnlpAccessWithSecuredHudsonTest to JenkinsRule. 2017-10-18 12:21:00 -04:00
Jesse Glick 3a781f5a40 jenkins-test-harness 2.31 2017-10-17 13:06:31 -04:00
Jesse Glick 6d2de7d914 Merge branch 'master' into CommandLauncher-JENKINS-47393 2017-10-17 09:06:29 -04:00
Devin Nusbaum 36ef5d51ca Fix JDKInstaller for downloads requiring an Oracle login 2017-10-16 17:16:24 -04:00
Alex Taylor ead38e0d23 [JENKINS-35459] - Prevent Duplicated elements with incorrect URL when using the search on DashBoard View (#2994) 
[JENKINS-35459] - Prevent Duplicated elements with incorrect URL when using the search on DashBoard View
 2017-10-16 10:22:31 +02:00
Kohsuke Kawaguchi 85d96df613 [maven-release-plugin] prepare for next development iteration 2017-10-15 17:41:28 -07:00
Kohsuke Kawaguchi ddaa42aae7 [maven-release-plugin] prepare release jenkins-2.85 2017-10-15 17:41:28 -07:00
Akbashev Alexander be02386449 [JENKINS-20046] - Do not query queue dispatchers from UI (#3038) 
* Do not query queue dispatchers from UI

* Address comments from review

* Restore old constructors and mark them as @deprecated
* Optimise query from UI even more

* Check non-concurrent builds in getCauseOfBlockageForItem
 2017-10-15 09:20:52 +02:00
Oleg Nenashev 0fac49e4ac Merge pull request #3063 from oleg-nenashev/protocols-flakytest 
Disable the flaky AgentProtocolTest test
 2017-10-14 15:40:19 +02:00
Wadeck Follonier 02b8e7f356 [JENKINS-47372] Add a new Administrative monitor for CSRF-protection (#3072) 
* [JENKINS-47372] add administrative monitor when there is no CSRF issuer configured

* - add line breaks

* - add license header
- put link in the properties instead of the previous mix
- remove @author
- simplify isActivated body

* - correct line breaks
 2017-10-14 11:45:26 +02:00