commit | 5b310a8df0f8797652e0fede2ea8b859b4aa2049 | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Tue Nov 13 11:16:56 2018 -0800 |
committer | David Pursehouse <dpursehouse@collab.net> | Tue Nov 13 11:17:55 2018 -0800 |
tree | 8375d8cccff043db83e97c2ddd1647ee545ea70b | |
parent | 2466c229d0402a524d06cce24633173543c997d6 [diff] | |
parent | 39dae890b97eb9ab905cfdb27801d883cf5a72a4 [diff] |
Merge branch 'stable-2.15' * stable-2.15: Add Eclipse generated files to .gitignore AutomaticMerger: Format with google-java-format AtomicityHelper: Remove usage of deprecated SubmitInput.waitForMerge Stop using deprecated Files.toString Add missing test deps for Eclipse project Set executable flag on tools/eclipse/project.sh Add standalone build with 2.14.17 API Fix partial merge of cross-repo Also update WORKSPACE to build with 2.16-rc3 API. Change-Id: I2b965d677539da7dc9a7c5bdeda37baa35366e7e
A gerrit plugin that takes care of automatically merging reviews when all approvals are present.
Also, it introduces the concept of cross-repository reviews. Cross repository reviews are reviews that share a common topic, and are all in different gerrit repositories. They will be merged at the same time, when all approvals for all reviews are present, and all reviews are mergeable.
Requires Gerrit 2.14 or later.
[automerge] botEmail=admin@example.com [commentlink "change"] match = "#/c/(\\d+)" html = "<a href=\"/#/c/$1/\">$1</a>"