summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set version to 2.16.7v2.16.7Luca Milanesio2019-03-146-6/+6
| | | | Change-Id: Ic87afeea7f081fa7b0fb524c68477a802cfb57b7
* Upgrade JGit to 5.1.6.201903130242-rDavid Pursehouse2019-03-141-6/+6
| | | | | | | | | Includes fixes for packfile list corruption during GC [1]. [1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=544199 Bug: Issue 10562 Change-Id: I097d4a5e1eb32fd3758ff6e648136dd5fab19a49
* Merge changes I633e5db4,I78b50a78 into stable-2.16David Pursehouse2019-03-142-9/+72
|\ | | | | | | | | | | * changes: Do not strip out "-- >8 --" comment in commit-msg hook Handle messages with only comments in the commit-msg hook
| * Do not strip out "-- >8 --" comment in commit-msg hookJonathan Nieder2019-03-132-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When commiting with "git commit --cleanup=scissors" or "git commit --verbose", Git includes the following lines in the commit message template, with additional information that should not go in the commit message after it: # ------------------------ >8 ------------------------ # Do not modify or remove the line above. # Everything below it will be ignored. In I78b50a789860cc11d63d891b0507786890158754 (Handle messages with only comments in the commit-msg hook, 2018-12-18), we started stripping comments from the proposed commit message in order to determine whether it is empty and as an accidental side effect we lost this line. As a result, Git includes the supporting information (e.g., the diff) in the commit message. Fortunately we only needed to strip out comments in order to check for emptiness. Afterward, the hook invokes "git interpret-trailers", which is prepared to cope with comments and scissor lines in front of a diff in recent versions of Git[*]. Fix the hook to work in scissors mode by using the stripped commit message only for the emptiness check and going back to the unstripped message for subsequent steps. This way, users can run "git commit -v" without having the diff end up in the resulting commit message. Users with older versions of Git will not benefit from this fix, but it does not produce a regression there, either: "git commit" in cleanup modes other than scissors continues to work as expected. In other words, in all cases this works as well as before I78b50a78986. [*] v2.13.1~16^2 (interpret-trailers: honor the cut line, 2017-05-15) Bug: Issue 10346 Change-Id: I633e5db4643851376422f839d969094043abb5c5 (cherry picked from commit 731eb42b8aed36cb9b3b584458479484e77c4f48)
| * Handle messages with only comments in the commit-msg hookHan-Wen Nienhuys2019-03-132-9/+40
| | | | | | | | | | | | | | | | | | | | | | | | Commit messages with comments occur when the editor is aborted, and should be treated as empty. We do this using git-stripspace, which was introduced in 2005, so this has no compatibility implications. Bug: Issue 10600 Change-Id: I78b50a789860cc11d63d891b0507786890158754 (cherry picked from commit 627d07c2bfc505eb46b30f9deb80c85b90b4921f)
* | Merge changes from topic "gjf-stable-2.16" into stable-2.16David Pursehouse2019-03-14150-603/+224
|\ \ | |/ |/| | | | | | | * changes: Merge branch 'stable-2.15' into stable-2.16 Update download-commands plugin revision
| * Merge branch 'stable-2.15' into stable-2.16David Pursehouse2019-03-14149-603/+224
| |\ | | | | | | | | | | | | | | | | | | * stable-2.15: Upgrade google-java-format to 1.7 Change-Id: Ia7383822ef59fb60bb5559956a065ae46b2e4f4a
| | * Merge "Merge branch 'stable-2.14' into stable-2.15" into stable-2.15David Pursehouse2019-03-1386-327/+122
| | |\
| | | * Merge branch 'stable-2.14' into stable-2.15David Pursehouse2019-03-1386-327/+122
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.14: Upgrade google-java-format to 1.7 Change-Id: I08bad33a69e8425b699608a06b71ed767f061afd
| | | * Upgrade google-java-format to 1.7Dave Borowitz2019-03-1347-170/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new version has the nice feature of putting multiple chained method calls before a .stream() on a single line. The diff is a bit large but it's removing a lot of newlines which is nice. Change-Id: I260b620aa6a1bc77b06be9672a1f281ab0d0d0f8
| * | | Update download-commands plugin revisionDavid Pursehouse2019-03-141-0/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Format with google-java-format 1.7 The download-commands plugin doesn't have a stable-2.16 branch; we use the master branch on core stable-2.16. This means we have to manually update the revision because it doesn't get automatically updated by the subscription. Change-Id: I03f131c7b868d47430c72f21821a29ad0edc2d0f
* | | Merge "Elasticsearch tests: Remove the flaky tag from BUILD files" into ↵David Pursehouse2019-03-122-3/+2
|\ \ \ | | | | | | | | | | | | stable-2.16
| * | | Elasticsearch tests: Remove the flaky tag from BUILD filesMarco Miller2019-03-122-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As they all pass now after merging a fix for the below linked issue. Bug: Issue 10591 Change-Id: Ib889e57beba8a9a85dab5ff32f1916f8ebe39512
* | | | Merge branch 'stable-2.15' into stable-2.16Paladox2019-03-120-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | * stable-2.15: Fix setting groups visibility Change-Id: Ie165f3c9c3d854f9daa7c1147865f29bd3ad7b1f
| * | Fix setting groups visibilityPaladox none2019-03-121-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change I60c50a6c4 introduced a broken way of setting the visibility. This commit fixes it as setting false in a string equals true in javascript. The check was also unneeded as it will be false by default (if not set). Bug: Issue 10587 Change-Id: Ife40780f162d4eb5e3f75f4a6ed65f01aa7dc0e4 (cherry picked from commit b7b5cf0067ffa6a4c54c7791e4ee67b5146f9214)
* | | AccountsImpl: Fix exception message if account cannot be parsedEdwin Kempin2019-03-121-1/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: Icc23e19e1e7237368b3238690827c4ec8e5f5bfd (cherry picked from commit d5a590379cd15907c857d4b9afd293738beabb10)
* | | Merge "Fix setting groups visibility" into stable-2.16David Pursehouse2019-03-121-7/+4
|\ \ \
| * | | Fix setting groups visibilityPaladox none2019-03-121-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change I60c50a6c4 introduced a broken way of setting the visibility. This commit fixes it as setting false in a string equals true in javascript. The check was also unneeded as it will be false by default (if not set). Bug: Issue 10587 Change-Id: Ife40780f162d4eb5e3f75f4a6ed65f01aa7dc0e4
* | | | Merge "Update syntax highlighting class" into stable-2.16David Pursehouse2019-03-123-0/+14
|\ \ \ \
| * | | | Update syntax highlighting classPaladox none2019-03-113-0/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows more code to be syntax highlighted. Also updates the colours for syntax highlight. Change-Id: Id07e34e33d85033d8d89916ce5a5ccf8d9768ff0 (cherry picked from commit 3c7d47eac8dac1135f1b84d940738c93cee60661)
* | | | Merge "Add "Show Relative Dates In Changes Table" to settings preference" ↵David Pursehouse2019-03-123-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | into stable-2.16
| * | | | Add "Show Relative Dates In Changes Table" to settings preferencePaladox none2019-03-113-0/+20
| |/ / / | | | | | | | | | | | | | | | | Bug: Issue 8081 Change-Id: Ia706c7004ba6ee9c6acfcb7ac8b41c6d3f274d20
* | | | Merge "Fix support for "SystemVerilog"" into stable-2.16David Pursehouse2019-03-121-2/+2
|\ \ \ \
| * | | | Fix support for "SystemVerilog"Paladox none2019-03-111-2/+2
| |/ / / | | | | | | | | | | | | | | | | Bug: Issue 10586 Change-Id: I2b262e61f1ef2b8bec62451ef701d26cc9a225bf
* / / / Fix account and group query with Elasticsearch 6Jacek Centkowski2019-03-122-3/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When querying against Elasticsearch 6, gerrit uses the following URLs: http://elasticsearch:9200/gerrit_accounts_0010/accounts/_search http://elasticsearch:9200/gerrit_groups_0007/groups/_search whereas it should use: http://elasticsearch:9200/gerrit_accounts_0010/_doc/_search http://elasticsearch:9200/gerrit_groups_0007/_doc/_search The type is properly resolved through the index adapter, so use that to build the ElasticQuerySource instead of using hard coded constants for both accounts and groups indexes. Bug: Issue 10591 Change-Id: I90cd74da9246f56bc9b2ef8464587ab04152876b Signed-off-by: Jacek Centkowski <jcentkowski@collab.net>
* | | Fix import for gr-diff-preferencesPaladox none2019-03-101-1/+1
| | | | | | | | | | | | | | | | | | This was broken by Ifd950bd42. Change-Id: Ifa5d44201cd6b99b9df2c089af9d234d715b6eca
* | | Strip trailing slash at the end when creating reposPaladox none2019-03-095-8/+73
| | | | | | | | | | | | | | | Bug: Issue 7192 Change-Id: I1106899b8afb52f1cf04e46b87b6658f4664af09
* | | Add support for cherry-picking even with merge conflictsPaladox none2019-03-097-7/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supported since [1] [1] Iae9eef38ad2a7810a736823c7bd80b8a7a2a214f Bug: Issue 5728 Change-Id: Idb749f77cc7063eb9d93ebbf7a10d81bc5384750 (cherry picked from commit 35c3de368f3a1ad207a7f164247cdfb2e9f8b35a)
* | | Merge "Fix mobile display on gr-create-change-dialog" into stable-2.16Paladox none2019-03-081-70/+63
|\ \ \
| * | | Fix mobile display on gr-create-change-dialogPaladox none2019-03-081-70/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a issue where things did not look correctly on mobile. Bug: Issue 10494 Change-Id: Ia152e17c9b132cb78845a5c1974cefc1e3a733a2
* | | | Merge "Re use gr-diff-preferences inside gr-settings-view" into stable-2.16Paladox none2019-03-0819-680/+554
|\ \ \ \
| * | | | Re use gr-diff-preferences inside gr-settings-viewPaladox none2019-03-0519-680/+554
| |/ / / | | | | | | | | | | | | | | | | Bug: Issue 8678 Change-Id: Ifd950bd4226407252e86610149dd8c6ba94ab967
* | | | Merge "Do not show "Patch file" if change does not have a parent" into ↵Paladox none2019-03-083-2/+39
|\ \ \ \ | | | | | | | | | | | | | | | stable-2.16
| * | | | Do not show "Patch file" if change does not have a parentPaladox none2019-03-053-2/+39
| |/ / / | | | | | | | | | | | | | | | | Bug: Issue 8495 Change-Id: I4047e600994beedf35562ff4c4f9ea9632808920
* | | | Merge "Fix support to use "Default Base For Merges" preference" into stable-2.16Paladox none2019-03-088-19/+77
|\ \ \ \
| * | | | Fix support to use "Default Base For Merges" preferencePaladox none2019-03-058-19/+77
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This implements the setting. * This also uses it for picking rather to show Parent 1 or Auto Merge first. Bug: Issue 8838 Change-Id: I6888b449acb285081db427119990120eb8875e6c
* | | | Merge "Fix avatars not showing correctly" into stable-2.16Paladox none2019-03-082-13/+78
|\ \ \ \
| * | | | Fix avatars not showing correctlyPaladox none2019-03-052-13/+78
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes avatars do not load on the change metadata or the dashboard. I found this is because the this._account check sometimes returns null which then cause it to hit the this.hidden = true. Because there was no setting hidden back to false, gr-avatar stayed permanently hidden even if "account" became defined. Bug: Issue 9851 Change-Id: I2627d7c830fc8825790f15359024496ff9e0e6be
* | | | LogThreshold: Allow the annotation to be inheritedDavid Pursehouse2019-03-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the current implementation the log threshold is only set when the annotation is done on the exact class, which means that in cases where an abstract test class is extended by several derived test classes, it is necessary to add the annotation on each derived class individually. Allow the annotation to be inherited, so that it is possible to only annotate the base class, and it will also be effective for all derived classes. Change-Id: I0501b2a617161a391478313b6f9891108bdf9969
* | | | Merge branch 'stable-2.15' into stable-2.16David Pursehouse2019-03-073-1/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.15: Add 'is:submittable' to search suggestions Fix documentation of hashtag: search predicate Fix case-insensitive searching of hashtags Change-Id: I5a177bb205488aa493d76d76491521105a2b84f8
| * | | Add 'is:submittable' to search suggestionsDavid Pursehouse2019-03-072-0/+2
| | | | | | | | | | | | | | | | | | | | Bug: Issue 10568 Change-Id: I6f65c0c8ab9230a5046aca96a62203c270a13377
| * | | Fix documentation of hashtag: search predicateDavid Pursehouse2019-03-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hashtag: search is case-insensitive, but the documentation said it was an exact match. Bug: Issue 10564 Change-Id: I14882fdc1ed2c45b10387b0f4e80cd195caee37c
| * | | Fix case-insensitive searching of hashtagsDave Borowitz2019-03-062-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The index field has always been stored lowercase, since we intended hashtag searches to be case-insensitive. However, we never converted the input string to lower case, with the unexpected result that searching for [hashtag:ACamelCaseTag] would not return results for changes who contain that exact hashtag. Bug: Issue 10564 Change-Id: I86019d18fd0d183d857d5a91d2af20d3445c6c25 (cherry picked from commit c8d1c47f1fe2b8807850c35af5dcdb1a5ca10862)
* | | | Update .mailmapDavid Pursehouse2019-03-071-0/+1
| | | | | | | | | | | | | | | | Change-Id: I9efb526ad93fd5433f6e0294600bbfc2e5bb2e1b
* | | | Bump rules_go version to 0.17.1 and bazel-gazelle version to 0.17.0David Ostrovsky2019-03-061-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to make Bazel build forward compatible. Old go_rules version is failing to build when this option is used: $ bazel build --incompatible_no_transitive_loads [...] Bug: Issue 10506 Change-Id: Ib0ad34c9d2bc9776d848a74f3cab664da9d9d929
* | | | Fix that an endpoint cannot be used by two plugins anymorebrohlfs2019-03-051-2/+2
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'name' does not exist on the plugin object, so the _initializedPlugins map would store undefined=>true for the first plugin and then don't allow any further plugins. For example the change-view-integration cannot be used by buildbucket and tricium anymore. Change-Id: I5a7adcaf335a0c27453e5eb03e3931d194e001ff (cherry picked from commit f58c8c77ef14d478d26df897fb77cc40e89bf8fc)
* | | Merge branch 'stable-2.15' into stable-2.16David Ostrovsky2019-03-036-51/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.15: js.bzl: Avoid using deprecated depset union gwt.bzl: Avoid using deprecated depset union classpath.bzl: Avoid using deprecated depset union javadoc.bzl: Avoid using deprecated depset union pkg_war.bzl: Avoid using deprecated depset union Update rules_closure to make it forward compatible Change-Id: I1c74b3d65323d0866cc599f7c6bd50cfcf3553ee
| * | Merge branch 'stable-2.14' into stable-2.15David Ostrovsky2019-03-036-51/+53
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.14: js.bzl: Avoid using deprecated depset union gwt.bzl: Avoid using deprecated depset union classpath.bzl: Avoid using deprecated depset union javadoc.bzl: Avoid using deprecated depset union pkg_war.bzl: Avoid using deprecated depset union Update rules_closure to make it forward compatible Change-Id: I97762abb1544ac0b2d77ab6ecb088abc444233fe
| | * js.bzl: Avoid using deprecated depset unionDavid Ostrovsky2019-03-031-22/+23
| | | | | | | | | | | | Change-Id: I3b3d9321fe162597eb6fd8d40fc7340dd4dce74d
| | * gwt.bzl: Avoid using deprecated depset unionDavid Ostrovsky2019-03-031-6/+6
| | | | | | | | | | | | Change-Id: If01f61085c9a9228e58101f941c4952590c8ad28
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 17:38:22 +0000