summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable-2.9' into stable-2.10upstream/stable-2.10David Pursehouse2019-01-181-1/+1
|\ | | | | | | | | | | | | * stable-2.9: Consume JGit artifacts from Maven Central Change-Id: I373228681fc1c02f48bcc1e2b556d53b2024bb3f
| * Consume JGit artifacts from Maven CentralDavid Pursehouse2019-01-181-1/+1
| | | | | | | | | | | | | | | | | | The recent JGit releases were published to the Eclipse repository due to a security embargo. The embargo has since been lifted, and the releases are available on Maven Central, so switch back to consuming the artifacts from there. Change-Id: I054cc91f410451fe2f3da5b3c8274d8b5890a3bf
* | Add release notes for Gerrit v2.10.8Luca Milanesio2019-01-112-0/+40
| | | | | | | | Change-Id: I083658b124db4891343083a95cfc114437b8ce44
* | Merge branch 'stable-2.9' into stable-2.10Luca Milanesio2019-01-112-0/+68
|\| | | | | | | | | | | | | | | * stable-2.9: Add release notes for Gerrit v2.9.5 Set version to 2.9.5 Change-Id: Ic145222c3ff46d6047a9b9f4f07448ae746ac875
| * Add release notes for Gerrit v2.9.5Luca Milanesio2019-01-112-0/+68
| | | | | | | | Change-Id: I4e16dfec89f25cd40e3ff1e684944c02bc8b574d
| * Set version to 2.9.5v2.9.5Luca Milanesio2019-01-107-7/+7
| | | | | | | | Change-Id: I8bcda5f28cf9d5c6e01ecfbce1196553a8b46763
* | Set version to 2.10.8v2.10.8Luca Milanesio2019-01-117-7/+7
| | | | | | | | Change-Id: I31bb360d26502a46faa74f0ca47e53e227c3b113
* | Merge branch 'stable-2.9' into stable-2.10David Pursehouse2019-01-103-7/+9
|\| | | | | | | | | | | | | * stable-2.9: Upgrade JGit to 4.5.5.201812240535-r Change-Id: Iccd292df6484376463f5955b085d9d18dca271f1
| * Upgrade JGit to 4.5.5.201812240535-rDavid Ostrovsky2019-01-073-7/+13
| | | | | | | | | | | | | | | | | | | | | | This release fixes an issue where AdvertiseRefsHook was not called for git-upload-pack in protocol v0 bidirectional transports, meaning that wants aren't validated and a user can fetch anything that is pointed to by any ref (using fetch-by-sha1), as long as they can guess the object name. Bug: Issue 10262 Change-Id: I5c1af5c7c549e1796fe6347c1ec08797471393a1
* | Merge branch stable-2.9Edwin Kempin2018-12-272-2/+0
|\| | | | | | | | | | | | | | | | | * stable-2.9: Update JGit to latest 4.5.x release Resource exhausted because of unclosed LDAP connection Change-Id: I85cdc1fec9689d34ebbcb19d92484a90baf169e9 Signed-off-by: Edwin Kempin <ekempin@google.com>
| * Update JGit to latest 4.5.x releaseEdwin Kempin2018-12-2745-113/+112
| | | | | | | | | | | | | | | | | | | | | | JGit releases older than 4.5 are known to be prone to issues with MissingObjectExceptions. Since this is a major JGit version upgrade some code needs to be adapted to changed JGit API. Change-Id: Ia9099a5ac8fcbaf873e3354b5a47d2178c97444a Signed-off-by: Edwin Kempin <ekempin@google.com>
| * Resource exhausted because of unclosed LDAP connectionJiang Xin2016-06-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When auth.type is set to LDAP (not LDAP_BIND), there will be two ldap connections. The 1st connection will bind LDAP to find the DN of the login user, and this connection will be closed in the try...finally block. But the 2nd LDAP connection used to validate user password is not closed at all. Too much unclosed TCP connections cause resource exhausted and latter LDAP authentication will fail. Change-Id: Ia5d83cccde8a0e6590d3e2fadc638d67f6e300e8 Reported-by: Wang Yiming <youthdragon.wangyiming@huawei.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> (cherry picked from commit 7ac03844b38b7682b16d6b4ae701d410f84b18fe)
* | Update JGit to latest 4.5.x releaseEdwin Kempin2018-12-221-6/+6
| | | | | | | | | | | | | | | | JGit releases older than 4.5 are known to be prone to issues with MissingObjectExceptions. Change-Id: Ia9099a5ac8fcbaf873e3354b5a47d2178c97444a Signed-off-by: Edwin Kempin <ekempin@google.com>
* | Fix link in 2.10.7 release notesDavid Pursehouse2015-10-131-1/+2
| | | | | | | | | | | | | | The "bug report on JGit" was actually pointing to a change on the Eclipse review server, and not the bug report. Change-Id: I833e37bf775c1f0153a370b239e7acbe3155bec5
* | Release notes for Gerrit 2.10.7v2.10.7David Pursehouse2015-10-092-0/+19
| | | | | | | | Change-Id: I18096e6ed7b86206f4287ba3445d631994571ac9
* | Set version to 2.10.7David Pursehouse2015-10-099-9/+9
| | | | | | | | Change-Id: Ifaa53d31ae88211d069e35d699e6a2ad5cc6c8f6
* | PatchListLoader: Synchronize MyersDiff and HistogramDiff invocationsDavid Ostrovsky2015-10-091-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To overcome MyersDiff endless loop problem, the computation thread can be interrupted and set to cancel with Future.cancel(boolean) method. However it cannot be assumed that after this method returns the thread is terminated. When the system is under heavy load or/and the thread in question is in a tight loop, it won't stop. It can be seen with this instrumentation change in JGit: [1] with the corresponding dump [2]. Synchronize the MyersDiff and alternative HistogramDiff algorithm invocations to prevent pack file corruption, as WindowCursor.inflate() method isn't synchronized. [1] https://git.eclipse.org/r/#/c/57583 [2] http://paste.openstack.org/show/475785 Bug-JGit: https://bugs.eclipse.org/bugs/show_bug.cgi?id=467467 Bug: Issue 3361 Contributed-By: Khai Do <zaro0508@gmail.com> Change-Id: I4516bcc2c41792acdb8174cb9d3cc198ddfaf8ef
* | Update version to 2.10.6v2.10.6Saša Živkov2015-06-299-9/+9
| | | | | | | | Change-Id: I2e41f2b6044563f4f63324fa50ad8ed3145d8c24
* | Release notes for Gerrit 2.10.6David Pursehouse2015-06-292-0/+15
| | | | | | | | Change-Id: I49b5094db78ca28e0ae56732670e9f0f62b310b2
* | Fix license generationShawn Pearce2015-06-261-2/+2
| | | | | | | | | | | | | | | | Broken by d8af092c0a37025d84ced45903af2e52048d387e dropping the license dependency from JARs by accident. Change-Id: I64fcb042ee65dc554353b58bce22f9d1462985e2 (cherry picked from commit c535dd6e231821a940ef692ca36d8182b30ff80c)
* | Update version to 2.10.5v2.10.5Saša Živkov2015-06-118-8/+8
| |
* | Release notes for 2.10.5Saša Živkov2015-06-102-0/+28
| | | | | | | | Change-Id: I3b78cd335a2766cb710c5a2fbfebcad734f391b5
* | Merge "Fixed regression caused by the defaultValue feature" into stable-2.10Saša Živkov2015-06-101-7/+9
|\ \
| * | Fixed regression caused by the defaultValue featureZalan Blenessy2015-06-021-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [1] added support for selecting default values for labels. Unfortunately it also broke the ability to remove labels as described in [2], more precisely by: "To remove a label in a child project, add an empty label with the same name as in the parent." This fix make it possible to push empty labels in project.config to refs/meta/config again. Without it, the following error is returned by gerrit: 'project.config: Invalid defaultValue "0" for label ...' [1] https://gerrit-review.googlesource.com/#/c/55750/ [2] https://gerrit-review.googlesource.com/Documentation/config-labels.html#label_custom Change-Id: Icd727f64cb7a904957a2acc5143fe801653cfabe
* | | Bump JGit to v4.0.0.201506090130-rSaša Živkov2015-06-0946-89/+89
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This JGit version includes the bugfix [1] which is an attempt to fix the "Cannot read project" issue in Gerrit, as discussed in [2] and [3]. This version of JGit also removes the 'release()' method in many interfaces/classes in favor or the implementing the AutoCloseable interface. In stable-2.10 we just replace all usages of the release() method with the close() method. Refactoring the code to make use of the AutoCloseable in stable-2.10 would be a larger change which wouldn't justify itself as we don't expect any major development in stable-2.10 and the usage of AutoCloseable in the master branch is already done. [1] https://git.eclipse.org/r/48288 [2] https://groups.google.com/forum/#!topic/repo-discuss/ZeGWPyyJlrM [3] https://groups.google.com/forum/#!topic/repo-discuss/CYYoHfDxCfA Change-Id: Ie540296238e3bbaf453c9e29426825431e15d423 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix various spelling mistakesDavid Pursehouse2015-05-1911-14/+14
| | | | | | | | Change-Id: I5fb811eab02d48a649990c6418977915c7dd7430
* | Prolog-Cookbook: tidy up rule status descriptionsDavid Pursehouse2015-05-191-9/+8
| | | | | | | | Change-Id: I3fef34f837381b046180c04b726add68c865569a
* | Set VERSION to 2.10.4v2.10.4Saša Živkov2015-05-071-1/+1
| | | | | | | | Change-Id: I5b4b519f09e3d9cfefec27db4429a350af64fa08
* | Release notes for Gerrit 2.10.4David Ostrovsky2015-05-072-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | This is a fix for >10x performance degradation, caused by this JGit change: [1]. In addidtion some minor fixes for base64 patch download and OAuth2 extension point are also included. [1] https://git.eclipse.org/r/31081 Change-Id: Ia9e190b22e1573a3876db2a87198fca9dd7ea01f
* | Update version to 2.10.4David Ostrovsky2015-05-077-7/+7
| | | | | | | | Change-Id: I8557fb050b9bebeab2f5999c86c6e947955d5f52
* | Merge "OAuth: Check for session validity during logout" into stable-2.10Saša Živkov2015-05-061-1/+3
|\ \
| * | OAuth: Check for session validity during logoutDavid Ostrovsky2015-04-251-1/+3
| | | | | | | | | | | | | | | GitHub-Bug: https://github.com/davido/gerrit-oauth-provider/issues/9 Change-Id: Id25792cdf6e28ba8d0f97bcc41d8c6409558314e
* | | Merge changes from topic 'oauth-authentication-provider' into stable-2.10Saša Živkov2015-05-063-61/+84
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: OAuth: Simplify protocol implementation Allow to link user identity to another OAuth provider
| * | | OAuth: Simplify protocol implementationDavid Ostrovsky2015-05-052-30/+6
| | | | | | | | | | | | | | | | Change-Id: Ia713593c57d9f68f6fcac8ff3978428052aee5fb
| * | | Allow to link user identity to another OAuth providerDavid Ostrovsky2015-05-053-37/+84
| | | | | | | | | | | | | | | | | | | | GitHub-Bug: https://github.com/davido/gerrit-oauth-provider/issues/12 Change-Id: I9507d15983cd021ba883afbdf4e526091d55c517
* | | | Merge "Update JGit to the 4.0.0.201505050340-m2 version" into stable-2.10Saša Živkov2015-05-061-6/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Update JGit to the 4.0.0.201505050340-m2 versionSaša Živkov2015-05-051-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18c4ccd2c3 changed JGit version from the 3.7.0.201502260915-r.58-g65c379e to the 3.7.1.201504261725-r. However, except for the one new commit which the 3.7.1.201504261725-r brought, this was effectively a JGit downgrade. We need to upgrade JGit to a version which contains the fix for the [1] and is a successor of the snapshot version 3.7.0.201502260915-r.58-g65c379e which was used in the 2.10.3.1. [1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=465509 Change-Id: I7b5f21700c6cda20b000e1e55266015f081b66bf
* | | | Merge changes from topic 'hybrid-openid-oauth-authentication-provider' into ↵Saša Živkov2015-05-053-29/+40
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | stable-2.10 * changes: Hybrid OpenID/OAuth: Support switching identities Hybrid OpenID/OAuth: Allow to link identity accross protocols
| * | | Hybrid OpenID/OAuth: Support switching identitiesDavid Ostrovsky2015-04-283-26/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Iac0e36c2dd6b8e99a3b99c9594e29cca9bac22ca GutHub-Bug: https://github.com/davido/gerrit-oauth-provider/issues/11
| * | | Hybrid OpenID/OAuth: Allow to link identity accross protocolsDavid Ostrovsky2015-04-283-7/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change support all linking directions: * From OpenID to OAuth * From OAuth to OpenID * From OAuth to OAuth TEST PLAN: 1. Set up vanilla Gerrit site 2. Assign auth scheme to OpenID 3. Install gerrit-oauth-provider plugin 4. Configure GitHub or Google provider (or both) 5. Sign in with source identity 6. Click User => Settings => Identities => Link Another Identity 7. Select target identity from the login form 8. Confirm that the target identity is linked to the source identity GitHub-Bug: https://github.com/davido/gerrit-oauth-provider/issues/12 Change-Id: I06e5cfc2ad1dde81050b951c0b7f602461af7992
* | | | Merge "Fix project creation with plugin config if user is not project owner" ↵Edwin Kempin2015-04-302-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | into stable-2.10
| * | | | Fix project creation with plugin config if user is not project ownerEdwin Kempin2015-04-292-4/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On project creation it is possible to specify plugin configuration values that should be stored in the project.config file. This failed if the calling user was not becoming owner of the created project, because only project owners can edit the project.config file. With this change now it is sufficient to have the 'Create Project' capability to create a project with an initial plugin configuration, even if the creating user is not becoming project owner of the created project. Change-Id: Ifecfeadd425afeff83197b11c97c1c2bbbef8eef
* / / / Add '/.apt_generated' and '/.factorypath' to .gitignoreEdwin Kempin2015-04-291-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | These files are not created with Gerrit 2.10, but only with Gerrit 2.11 and newer where these patterns are already ignored. However switching from a new branch >= stable-2.11 to stable-2.10 leaves these files in the working tree so that it is dirty. Change-Id: I50f4069bb8600ed133fc2e0aade7974c6f721b7d Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
* | | Merge "Hybrid OpenID/OAuth: Check for session validity during logout" into ↵Saša Živkov2015-04-271-1/+3
|\ \ \ | | | | | | | | | | | | stable-2.10
| * | | Hybrid OpenID/OAuth: Check for session validity during logoutDavid Ostrovsky2015-04-251-1/+3
| |/ / | | | | | | | | | | | | GitHub-Bug: https://github.com/davido/gerrit-oauth-provider/issues/9 Change-Id: I17aaed508ef61959a3fc5634d76eb5386305f9a0
* | | Bump JGit version to 3.7.1.201504261725-rDavid Ostrovsky2015-04-271-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version fixed JGit regression, causing severe (>10x) performance degradation on huge repositories (>2GB) on git push and CPU consumption explosion during replication: [1]. [1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=465509 Bug: Issue 3300 Change-Id: I6b1fa985fa3738801d3fa27d690a1c02c1afc1db
* | | RestApiServlet: Leave OutputStream open when flushing base64 paddingStefan Beller2015-04-201-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some Java servlet containers fail if the response's OutputStream is closed twice by the application. This appears to contradict standard behavior in Java where most streams gracefully ignore extra close. Unfortunately the container is required to power gerrit-review and as such Gerrit needs to try to tolerate its behavior. Wrap the supplied OutputStream delegating all calls except for close(). No-op the close() method so the Java 7 try-with-resources block does not automatically close the servlet OutputStream, leaving this for the caller's finally block. Change-Id: I84bd3c8031580f805d5d4ef5d70f09b89e170450
* | | RestApiServlet: Flush pending padding as wellStefan Beller2015-04-201-4/+5
|/ / | | | | | | | | | | | | | | | | | | This issue was found by scan.coverity.com (CID 19911) which is a static code analysis tool, free for open source code. Originally it was classified as a resource leak, but this is a miss classification as the auto closing of the OutputStream will flush any pending padding. Change-Id: I4dc2d1cd9f52740490fda7c37e98b115fa59ec3a
* | Update version to 2.10.3.1v2.10.3.1Saša Živkov2015-04-178-8/+8
| | | | | | | | Change-Id: If6e4ad9ae769d261035566ef3c60763f83c5e054
* | Release notes for 2.10.3.1Saša Živkov2015-04-172-0/+12
| | | | | | | | Change-Id: Ia37d71db50b88f624c59eb1815a73689a1613fb7