summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set version to 3.0.6v3.0.6David Pursehouse2019-12-145-5/+5
| | | | Change-Id: Ib1a8c5c18e958eca00320e5109413b8d47cfbc90
* Merge branch 'stable-2.16' into stable-3.0David Pursehouse2019-12-1417-28/+285
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.16: Set version to 2.16.16-SNAPSHOT Set version to 2.16.15 Revert "Revert "Fix handling of interactive/batch users in the QoS filter"" Separate request context filter from cleanup Assert RequestCleanup ran only once Test Git/HTTP Servlet when SSH is enabled Fix linter errors under eslint 6.x Add example command for how to display note of an external ID Add example command for how to find SHA1 of an external ID Link global eslint packages to local project Revert "Fix handling of interactive/batch users in the QoS filter" Log also thread name in the sshd_log Log also thread name in the httpd_log Change-Id: I4618f563b27581d109d03d98e0f4e32a18c2a1bb
| * Merge "Add example command for how to display note of an external ID" into ↵David Pursehouse2019-12-141-0/+14
| |\ | | | | | | | | | stable-2.16
| | * Add example command for how to display note of an external IDSaša Živkov2019-12-131-0/+14
| | | | | | | | | | | | | | | Change-Id: I78564b353aacf557ae22cc3ee8b61dfae1fc4eba (cherry picked from commit 3c6b3c8ab9dc6c3d29534cd935fb9d6bf98d8462)
| * | Merge "Add example command for how to find SHA1 of an external ID" into ↵David Pursehouse2019-12-141-0/+10
| |\| | | | | | | | | | stable-2.16
| | * Add example command for how to find SHA1 of an external IDSaša Živkov2019-12-131-0/+10
| | | | | | | | | | | | | | | Change-Id: Iab96ab10c65cd3b1935cd5ff6f4fa671b89b3095 (cherry picked from commit 7bc254269476269ec020cb10d72829656352ee94)
| * | Set version to 2.16.16-SNAPSHOTLuca Milanesio2019-12-136-6/+6
| | | | | | | | | | | | Change-Id: I385b48a9ceb9ba2ef9f7e6a8c9e215f6a6665c50
| * | Set version to 2.16.15v2.16.15Luca Milanesio2019-12-136-6/+6
| | | | | | | | | | | | Change-Id: I294b95860ebae4e313c460adaeee68b6aa891f0c
| * | Revert "Revert "Fix handling of interactive/batch users in the QoS filter""Luca Milanesio2019-12-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b2d6e5f77f951eb0b692233777d5af2a225bc18e because two major problems have been resolved by now: 1. The lack of Git/HTTP with SSHD test coverage has been resolved and there is one more assertion against double run of request cleanups. 2. The request context and cleanup have been decoupled, allowing the QoS filter to access the current user without causing a double cleanup of the request context. Change-Id: I2df49f7a21369a37ab21f75909da4f2871185ba8
| * | Separate request context filter from cleanupLuca Milanesio2019-12-134-11/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preparation work to allow the allocation of the HTTP request context for use in the ProjectQoSFilter. Having separate filters for setting the current context and cleaning it up, allows other filters, like ProjectQoSFilter, to access the current user without having necessarily to have its context cleaned up. The first attempt to have ProjectQoSFilter with a context has failed because the cleanup was done on the upstream filter, causing a double invocation and thus an exception. By having the context set *before* the ProjectQoSFilter and then cleaned up *after* the filter, allows to have the current user injected and still doing the cleanup only once the filter has correctly finished its processing. Bug: Issue 12070 Change-Id: I7fbda3d787f54ef6af6d6ae75c28d4d73ba197fb
| * | Assert RequestCleanup ran only onceLuca Milanesio2019-12-131-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent the RequestCleanup.run() to be called more than once. Helps preventing bugs in the request context cleanup process and allow making changes to the Git/HTTP and Git/SSH protocols validating the correct request context management. Change-Id: I432d36f591ee9015856ac18ad27e98dcdca8e465
| * | Test Git/HTTP Servlet when SSH is enabledLuca Milanesio2019-12-134-53/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way Git/HTTP threads are managed is different when the SSH daemon is enabled. Make sure that all the Git/HTTP operations are working as expected by enabling also SSHD. In order to reuse the GitOverHttpServletIT logic, introduce a new abstract class and add it to the common library used by all git tests in Bazel BUILD file. Change-Id: I879881b6db5f4295c1c889a764e0c31d369463f7
| * | Merge "Fix linter errors under eslint 6.x" into stable-2.16Ben Rohlfs2019-12-133-11/+27
| |\ \
| | * | Fix linter errors under eslint 6.xTao Zhou2019-12-133-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | Also changed the lint_test to only run within ui folder to speed it up. Change-Id: Ib65ae53176d7a6eece12bd85bcae3bb402d5ade8
| * | | Merge "Link global eslint packages to local project" into stable-2.16Tao Zhou2019-12-131-1/+5
| |\| | | | |/ | |/|
| | * Link global eslint packages to local projectThomas Draebing2019-12-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the update to eslint 6.0.0 eslint does not support a global installation anymore. Since a local installation is not feasible on the gerrit-ci and will also cause issues with bazel, since the packages will not be available locally in the sandbox, the lint_test.sh script now links a global eslint (and eslint-plugins) installation to the local project. This allows to use eslint 6.0.0 without having to reinstall it in every instance of the project, which would be the case for every build on the CI. Change-Id: I6c41a0450a6d23860356f0e2615a45c46e9d8a89
| * | Merge "Revert "Fix handling of interactive/batch users in the QoS filter"" ↵Saša Živkov2019-12-131-3/+3
| |\ \ | | |/ | |/| | | | into stable-2.16
| | * Revert "Fix handling of interactive/batch users in the QoS filter"Luca Milanesio2019-12-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | It has broken the Git/HTTP protocol. This reverts commit 850b1c312ce8c283b2bfd503d7a142f7ca599e84. Bug: Issue 12070 Change-Id: Ia61cd0eb713e6de758a1534799bc992eea3ec2f6
| * | Log also thread name in the sshd_logSaša Živkov2019-12-122-1/+7
| | | | | | | | | | | | Change-Id: I0b583cd4adf9afb16e09d903e8641ed885536489
| * | Log also thread name in the httpd_logSaša Živkov2019-12-122-1/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Having thread name in the httpd_log makes it easier to match entries from the error_log and httpd_log (note that error_log entries already contain the thread name). With the thread name included in each log entry in the httpd_log we have more data to match an error to a request than just the timestamp. Even with the request trace feature [1] this is still useful as we can do more analysis before we ask the user to reproduce an error using the request trace. [1] https://gerrit-review.googlesource.com/Documentation/user-request-tracing.html Change-Id: I60f0fde1c2708bdc56e6ab458d66abee1b9c59aa
* | Only add the gr-app.js script at the end of the domTao Zhou2019-12-131-0/+1
| | | | | | | | | | | | | | https://github.com/PolymerLabs/crisper Bug: Issue 12067 Change-Id: Ic01bee6ed87219dc5b9a9d86246b260baeb661da
* | Remove preload on gr-app.jsTao Zhou2019-12-131-1/+0
| | | | | | | | | | | | | | Also refer to https://gerrit-review.googlesource.com/c/gerrit/+/230464 for more. Bug: Issue 12067 Change-Id: I0f3b10fdc1fa7dd31699a16337d5edb5bcaee0e9
* | Merge branch 'stable-2.16' into stable-3.0David Pursehouse2019-12-121-4/+4
|\| | | | | | | | | | | | | * stable-2.16: InitSshd: Use correct flag to set empty passphrase for all key types Change-Id: I68d59874fd34a26083fbc13a542cd3db76b2a374
| * InitSshd: Use correct flag to set empty passphrase for all key typesPaladox none2019-12-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | From https://www.ssh.com/ssh/keygen/: -N "New" Provides a new passphrase for the key. -P "Passphrase" Provides the (old) passphrase when reading a key. Change Iba3a674f8 did this for RSA keys, but not for other key types. Also do it for the other types. Change-Id: Ied6d8d97d2333a313a0abf215bbdba5e1bba51bc
* | Set version to 3.0.6-SNAPSHOTDavid Pursehouse2019-12-115-5/+5
| | | | | | | | Change-Id: Ibc69f7f3f27afcc4d7c86ad8dc7a4bdfa73a8345
* | Merge branch 'stable-2.16' into stable-3.0David Pursehouse2019-12-110-0/+0
|\| | | | | | | | | | | | | | | * stable-2.16: Set version to 2.16.15-SNAPSHOT Set version to 2.16.14 Change-Id: I988017987c24c7300df6223945ef00d4844534b8
| * Set version to 2.16.15-SNAPSHOTLuca Milanesio2019-12-106-6/+6
| | | | | | | | Change-Id: I70ab4223cbc0ff43187e4895e439efb2f9ba0fcc
| * Set version to 2.16.14v2.16.14Luca Milanesio2019-12-106-6/+6
| | | | | | | | Change-Id: I9fef21fa14d2e273657dab894529e07e5bf03e92
* | Set version to 3.0.5v3.0.5David Pursehouse2019-12-115-5/+5
| | | | | | | | Change-Id: Ib83bb1933723255685f3276d2e169944183f9b0f
* | Merge branch 'stable-2.16' into stable-3.0David Pursehouse2019-12-115-0/+327
|\| | | | | | | | | | | | | * stable-2.16: Add event interface to Gerrit Change-Id: I3d65950598cc04922c19188ce020d504d109e817
| * Merge "Add event interface to Gerrit" into stable-2.16Ben Rohlfs2019-12-105-0/+327
| |\
| | * Add event interface to GerritTao Zhou2019-12-105-0/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to solve problems like communicating among Gerrit components, plugins and Gerrit, and plugins themselves. Original discussion and one classic problem to solve: https://gerrit-review.googlesource.com/c/gerrit/+/242732 ``` // pluginA Gerrit.install(plugin => { // do something Gerrit.emit("event-name", {plugin: plugin}); }); // Gerrit Gerrit.on("event-name", event => { // event.plugin should be pluginA }); ``` Change-Id: I8b9703f5fafd5fc00054d6d4bce4628d4aba6624
* | | Merge branch 'stable-2.16' into stable-3.0David Pursehouse2019-12-101-3/+3
|\| | | | | | | | | | | | | | | | | | | | * stable-2.16: Fix handling of interactive/batch users in the QoS filter Change-Id: Id0854d16ab44c92a5a4a400475e2ab3887586cfd
| * | Fix handling of interactive/batch users in the QoS filterSaša Živkov2019-12-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the git-over-http requests this filter didn't work properly because the basic authentication happened later in the filter chain and at the moment when the ProjectQoSFilter was invoked the current user was not yet set. Therefore, the current user was always AnonymousUser in this filter and, by default, it always used the interactive queue type. The sshd.batchThreads [1] setting didn't work as documented i.e. to define the max number of Git requests for batch users over SSH and HTTP together. Bind ProjectQoSFilter after the ProjectBasicAuthFilter which is bound from the GitOverHttpModule so that the current user is authenticated when the ProjectQoSFilter is reached. [1] https://gerrit-review.googlesource.com/Documentation/config-gerrit.html#sshd.batchThreads Change-Id: I0a5a70a5ee2d6416b69aa3ab4e4c55640bca8670
* | | Merge branch 'stable-2.16' into stable-3.0David Pursehouse2019-12-081-8/+12
|\| | | | | | | | | | | | | | | | | | | | | | | * stable-2.16: Use reliable check for empty env.GERRIT_CHANGE_NUMBER Do not build on stable-2.14 branch Change-Id: If60fc67b15f4b5090cbee6dd9c65f4dbe4b5fcba
| * | Use reliable check for empty env.GERRIT_CHANGE_NUMBERLuca Milanesio2019-12-081-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | Check for either null or empty variable when looking for the current Gerrit change number under build in Jenkinsfile. Change-Id: Ia274647bb135dda61111845c970f5f4762093dcd
| * | Merge branch 'stable-2.15' into stable-2.16David Pursehouse2019-12-080-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.15: Do not build on stable-2.14 branch Keep Jenkinsfile on stable-2.16, which is a supported branch. Change-Id: I9fe3a73146dfee4e5d87acf722cff3200bdacf38
| | * \ Merge branch 'stable-2.14' into stable-2.15David Pursehouse2019-12-081-317/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.14: Do not build on stable-2.14 branch Change-Id: I5f639ac68ab7853da34e2bf6a698d0e1258e79b1
| | | * | Do not build on stable-2.14 branchLuca Milanesio2019-12-081-317/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gerrit v2.14 is EOL and we should not build this branch anymore on the CI. Change-Id: I3994c1147c6e7e52cfc3efbc3fb7c320b8f3418d
* | | | | Merge branch 'stable-2.16' into stable-3.0David Pursehouse2019-12-073-3/+278
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.16: Use consistent capitalization for term NoteDb in documentation Document how to backup Gerrit Update rules_closure to latest version Change-Id: I4847dcda27466ece557641e9c579fcf70f7f88c1
| * | | | Merge "Update rules_closure to latest version" into stable-2.16Edwin Kempin2019-12-061-3/+3
| |\ \ \ \
| | * | | | Update rules_closure to latest versionDavid Ostrovsky2019-12-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifae9462251bea0b3fd683452f16572572d4a7cea
| * | | | | Merge "Use consistent capitalization for term NoteDb in documentation" into ↵David Pursehouse2019-12-061-7/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | stable-2.16
| | * | | | | Use consistent capitalization for term NoteDb in documentationEdwin Kempin2019-12-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: I556efac6f229dc987f02c5477322694691f30825
| * | | | | | Merge changes I2fb1cd15,I78afe991,Ifdbac1bc,I0f693c63,I378d3845, ... into ↵Edwin Kempin2019-12-066-13/+176
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stable-2.16 * changes: CreateTag: Trim revision that is provided in input CreateTag: Allow revision in input to be empty RefUtil#parseBaseRevision: Do not log an error if baseRevision is invalid InvalidRevisionException: Include invalid revision into message CreateBranch: Trim revision that is provided in input CreateBranch: Allow revision in input to be empty CreateBranchIT: Add tests that set revision in the input Upgrade gitiles blame-cache to 0.2-7.1
| * | | | | | Merge "Document how to backup Gerrit" into stable-2.16Edwin Kempin2019-12-062-0/+275
| |\ \ \ \ \ \
| | * | | | | | Document how to backup GerritMatthias Sohn2019-12-052-0/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: Issue 11440 Change-Id: Ia4514e28c82b97375e0f896d86654c9a9fcbf15d
* | | | | | | | Merge branch 'stable-2.16' into stable-3.0David Pursehouse2019-12-065-11/+174
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.16: CreateTag: Trim revision that is provided in input CreateTag: Allow revision in input to be empty RefUtil#parseBaseRevision: Do not log an error if baseRevision is invalid InvalidRevisionException: Include invalid revision into message CreateBranch: Trim revision that is provided in input CreateBranch: Allow revision in input to be empty CreateBranchIT: Add tests that set revision in the input Upgrade gitiles blame-cache to 0.2-7.1 The change "Upgrade gitiles blame-cache to 0.2-7.1" is omitted from this merge since stable-3.0 already uses 0.2-11. A separate change to upgrade to 0.2-12 will be done later. Change-Id: I3d4e2a91f61a5ed469d4d52878ba464b9664af6e
| * | | | | | | CreateTag: Trim revision that is provided in inputEdwin Kempin2019-12-062-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: I2fb1cd153c6109caa9444a7c39987c0d8ca30db7
| * | | | | | | CreateTag: Allow revision in input to be emptyEdwin Kempin2019-12-062-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a revision in the input is not specified we default to the HEAD revision, but when the revision in the input was empty we failed with 400 Bad Request. Be more tolerant and consistent and default to the HEAD revision too if the specified revision is empty. Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: I78afe991d274d0feba134612382a65c76916cfd5
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 01:58:57 +0000