diff options
author | Dave Borowitz <dborowitz@google.com> | 2013-09-18 17:40:57 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-09-18 17:40:57 +0000 |
commit | 33476285103487fd57f95aa8879f1de0e9460537 (patch) | |
tree | 78319d3bbafa7374836d1eb189c7b540ae7f0381 | |
parent | 72fa3c242290a962873077c47d0fd82fceda049e (diff) | |
parent | 88976d45be8897ca7c83f549170e608b89716441 (diff) |
Merge "Merge branch 'stable-2.6' into stable-2.7" into stable-2.7
3 files changed, 5 insertions, 7 deletions
diff --git a/Documentation/prolog-cookbook.txt b/Documentation/prolog-cookbook.txt index 7912cf26a1..170d11a76a 100644 --- a/Documentation/prolog-cookbook.txt +++ b/Documentation/prolog-cookbook.txt @@ -303,11 +303,11 @@ Testing submit rules The prolog environment running the `submit_rule` is loaded with state describing the change that is being evaluated. The easiest way to load this state is to test your `submit_rule` against a real change on a running gerrit instance. The command -link:cmd-test-submit-rule.html[test-submit-rule] loads a specific change and executes +link:cmd-test-submit-rule.html[test-submit rule] loads a specific change and executes the `submit_rule`. It optionally reads the rule from from `stdin` to facilitate easy testing. ==== - cat rules.pl | ssh gerrit_srv gerrit test-submit-rule I45e080b105a50a625cc8e1fb5b357c0bfabe6d68 -s + cat rules.pl | ssh gerrit_srv gerrit test-submit rule I45e080b105a50a625cc8e1fb5b357c0bfabe6d68 -s ==== Prolog vs Gerrit plugin for project specific submit rules diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties index ce277809d9..178db6b35a 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties @@ -22,8 +22,8 @@ projects = All projects projectRepoBrowser = Repository Browser useContentMerge = Automatically resolve conflicts useContributorAgreements = Require a valid contributor agreement to upload -useSignedOffBy = Require <a href="http://gerrit-documentation.googlecode.com/svn/Documentation/2.5/user-signedoffby.html#Signed-off-by" target="_blank"><code>Signed-off-by</code></a> in commit message -requireChangeID = Require <a href="http://gerrit-documentation.googlecode.com/svn/Documentation/2.5/user-changeid.html" target="_blank"><code>Change-Id</code></a> in commit message +useSignedOffBy = Require <code>Signed-off-by</code> in commit message +requireChangeID = Require <code>Change-Id</code> in commit message headingGroupOptions = Group Options isVisibleToAll = Make group visible to all registered users. buttonSaveGroupOptions = Save Group Options diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/DeleteDraftPatchSet.java b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/DeleteDraftPatchSet.java index adec292ac2..d20b0f63a6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/DeleteDraftPatchSet.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/DeleteDraftPatchSet.java @@ -112,9 +112,7 @@ public class DeleteDraftPatchSet implements Callable<ReviewResult> { } if (change.currentPatchSetId().equals(patchSetId)) { try { - PatchSet.Id id = - new PatchSet.Id(patchSetId.getParentKey(), patchSetId.get() - 1); - change.setCurrentPatchSet(patchSetInfoFactory.get(db, id)); + change.setCurrentPatchSet(patchSetInfoFactory.get(db, highestId)); } catch (PatchSetInfoNotAvailableException e) { throw new NoSuchChangeException(changeId); } |