| commit | 65f112881996356dcf34e36cf497e33f20df93d5 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Fri Jun 07 23:20:17 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jun 07 23:20:17 2013 +0000 |
| tree | 2fb75e207a082115ff99630723e8258689d20aca | |
| parent | 441d1ba2574517ef1ffe92b8ac6e488024abe464 [diff] | |
| parent | 832014f7043837d09fd8e74c61cf3ff651e985b8 [diff] |
Merge "Documentation: Reverse Proxy Configuration" into stable-2.6
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties index ffa749d..caaf3bf 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties
@@ -5,7 +5,7 @@ changesMergedInProject = Merged Changes In {0} changesAbandonedInProject = Abandoned Changes In {0} -revertChangeDefaultMessage = Revert \"{0}\"\n\nThis reverts commit {1} +revertChangeDefaultMessage = Revert \"{0}\"\n\nThis reverts commit {1}. changeScreenTitleId = Change {0} outdatedHeader = Change depends on {0} outdated change(s) and should be rebased on the latest patch sets.
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java index 9089710..89c507b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
@@ -313,6 +313,9 @@ OrmException, IOException, InvalidChangeOperationException, PathConflictException { Change change = chg; + if (!chg.currentPatchSetId().equals(patchSetId)) { + throw new InvalidChangeOperationException("patch set is not current"); + } final PatchSet originalPatchSet = db.patchSets().get(patchSetId); final RevCommit rebasedCommit;
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/change/ChangeMessages.properties b/gerrit-server/src/main/resources/com/google/gerrit/server/change/ChangeMessages.properties index 11384a1..f05f23b 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/change/ChangeMessages.properties +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/change/ChangeMessages.properties
@@ -1,6 +1,6 @@ # Changes to this file should also be made in # gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties -revertChangeDefaultMessage = Revert \"{0}\"\n\nThis reverts commit {1} +revertChangeDefaultMessage = Revert \"{0}\"\n\nThis reverts commit {1}. reviewerNotFound = {0} does not identify a registered user or group groupIsNotAllowed = The group {0} cannot be added as reviewer.