From f214681aa9514bb31789be907429dd68d0b4da38 Mon Sep 17 00:00:00 2001 From: Simon Hwang Date: Wed, 11 Nov 2015 16:13:17 -0500 Subject: [PATCH 1/6] Display latest result of branch list screen's filter Before the fix the branch list screen displays branches based on the filter but sometimes failed to display the latest result when filter is typed fast and server is slow enough. This change ensures that the branch list screen always displays the latest result of the filter. Change-Id: Iea902adea7f5e9753a54e140ebc0cbfff1f12239 --- .../google/gerrit/client/admin/ProjectBranchesScreen.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java index c5f7225b04..3b3a6fcba3 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java @@ -258,8 +258,10 @@ public class ProjectBranchesScreen extends ProjectScreen { Query q = new Query(filterTxt.getValue()); if (match.equals(q.qMatch)) { q.start(start); - } else if (query == null) { - q.run(); + } else { + if (query == null) { + q.run(); + } query = q; } } From 579b6ebfccf70014cfb2c510cd519901fa445083 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 12 Nov 2015 15:07:32 -0800 Subject: [PATCH 2/6] Update replication plugin revision - Destination: parse replication delay and retry as time units - Remove obsolete remote.NAME.timeout from config documentation Change-Id: I272cb2a8ff9023df0580378ddd6419942fbfe116 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index af5edf6047..6ee0a32f59 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit af5edf6047f2a730c5a9fbc6b08dad6edba21dab +Subproject commit 6ee0a32f594c42a656e9080083e924b34779a4ab From 4cf1aae60b68ebe9781e48712703700c65e44e77 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 29 Oct 2015 16:42:06 +0900 Subject: [PATCH 3/6] Release notes for Gerrit 2.11.5 Change-Id: I30af4773f610d4ddecb305f811591fd279c5b2a7 --- ReleaseNotes/ReleaseNotes-2.11.5.txt | 89 ++++++++++++++++++++++++++++ ReleaseNotes/index.txt | 1 + 2 files changed, 90 insertions(+) create mode 100644 ReleaseNotes/ReleaseNotes-2.11.5.txt diff --git a/ReleaseNotes/ReleaseNotes-2.11.5.txt b/ReleaseNotes/ReleaseNotes-2.11.5.txt new file mode 100644 index 0000000000..03427bb4c2 --- /dev/null +++ b/ReleaseNotes/ReleaseNotes-2.11.5.txt @@ -0,0 +1,89 @@ +Release notes for Gerrit 2.11.5 +=============================== + +Gerrit 2.11.5 is now available: + +link:https://gerrit-releases.storage.googleapis.com/gerrit-2.11.5.war[ +https://gerrit-releases.storage.googleapis.com/gerrit-2.11.5.war] + +There are no schema changes from link:ReleaseNotes-2.11.4.html[2.11.4]. + + +Bug Fixes +--------- + +* link:https://code.google.com/p/gerrit/issues/detail?id=3442[Issue 3442]: +Handle commit validation errors when creating/editing changes via REST. ++ +When an exception was thrown by a commit validator during creation of +a new change, or during publish of an inline edit, this resulted in an +internal server error message which did not include the actual reason +for the error. + +* link:https://code.google.com/p/gerrit/issues/detail?id=3616[Issue 3616]: +Strip trailing blank lines from commit messages when modified in the inline +editor. ++ +Blank lines were not trimmed from the end of commit messages, which caused +problems when the commit was merged and then cherry-picked with the `-x` +option (from the command line). + +* Tweak JS clipboard API integration to work on Firefox. ++ +The JS 'copy' functionality was working on Chrome, but not on Firefox. + +* Use image instead of unicode character for copy button. ++ +Some browsers were unable to render the unicode character. + +* Include server config module in init step. ++ +This allows SecureStore to be used during plugins' init step. + +* link:https://code.google.com/p/gerrit/issues/detail?id=3659[Issue 3659]: +Show inline comments in change screen history when inline edit is active. ++ +It was not possible to see the inline comments in the history on the +change screen when in edit mode. + +* Improve rendering of `stream-events` tasks in the `show-queue` output. ++ +Entries for `stream-events` are now rendered as 'Stream Events (username)'. + +* link:https://code.google.com/p/gerrit/issues/detail?id=3655[Issue 3655]: +Fix incorrect owner group matching behavior. ++ +When the given group did not match any group, the group was matched +on a group whose name starts with the argument, instead of throwing an +error to notify the user. + +* link:https://code.google.com/p/gerrit/issues/detail?id=3664[Issue 3664]: +Fix double slash on URL when switching account. ++ +One too many slashes on the URL caused redirection back to the root +page instead of the intended location. + +* link:https://code.google.com/p/gerrit/issues/detail?id=3666[Issue 3666]: +Fix server error when commit validator is invoked on initial commit. ++ +If a commit was uploaded for review as the first commit in a repository +that was created with no initial empty commit, invoking a commit validator +on the new commit would cause an internal error. + +* Replication plugin. + +** Parse replication delay and retry times as time units. ++ +The replication delay and retry values were interpreted as seconds and +minutes respectively, but were being parsed as integers. ++ +This is inconsistent with how time units are handled in other Gerrit +configuration settings, and can cause confusion when the user configures +them using the time unit syntax such as '15s' and it causes the plugin +to fail with 'invalid value'. ++ +The delay and retry now are parsed as time units. The value can be given +in any recognized time unit, and the defaults remain the same as before; +15 seconds and 1 minute respectively. + +** Remove documentation of obsolete `remote.NAME.timeout` setting. diff --git a/ReleaseNotes/index.txt b/ReleaseNotes/index.txt index bae63e8d87..32a0101431 100644 --- a/ReleaseNotes/index.txt +++ b/ReleaseNotes/index.txt @@ -4,6 +4,7 @@ Gerrit Code Review - Release Notes [[2_11]] Version 2.11.x -------------- +* link:ReleaseNotes-2.11.5.html[2.11.5] * link:ReleaseNotes-2.11.4.html[2.11.4] * link:ReleaseNotes-2.11.3.html[2.11.3] * link:ReleaseNotes-2.11.2.html[2.11.2] From 4a3b5baec2fb2ee21a62788b7ac9f413479ea0aa Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 12 Nov 2015 17:05:19 -0800 Subject: [PATCH 4/6] Set version to 2.11.5 Change-Id: I40e9ae66e3761c09de0697f39740d49d0b491aa1 --- Documentation/dev-plugins.txt | 2 +- VERSION | 2 +- gerrit-extension-api/pom.xml | 2 +- gerrit-plugin-api/pom.xml | 2 +- gerrit-plugin-archetype/pom.xml | 2 +- gerrit-plugin-gwt-archetype/pom.xml | 2 +- gerrit-plugin-gwtui/pom.xml | 2 +- gerrit-plugin-js-archetype/pom.xml | 2 +- gerrit-war/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt index f301ac2317..828ea3293e 100644 --- a/Documentation/dev-plugins.txt +++ b/Documentation/dev-plugins.txt @@ -36,7 +36,7 @@ plugin project. ---- mvn archetype:generate -DarchetypeGroupId=com.google.gerrit \ -DarchetypeArtifactId=gerrit-plugin-archetype \ - -DarchetypeVersion=2.11.4 \ + -DarchetypeVersion=2.11.5 \ -DgroupId=com.googlesource.gerrit.plugins.testplugin \ -DartifactId=testplugin ---- diff --git a/VERSION b/VERSION index 64ba198701..7d9849aac8 100644 --- a/VERSION +++ b/VERSION @@ -2,4 +2,4 @@ # Used by :api_install and :api_deploy targets # when talking to the destination repository. # -GERRIT_VERSION = '2.11.4' +GERRIT_VERSION = '2.11.5' diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml index dc1283cf3f..a5d7e5c4fc 100644 --- a/gerrit-extension-api/pom.xml +++ b/gerrit-extension-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-extension-api - 2.11.4 + 2.11.5 jar Gerrit Code Review - Extension API API for Gerrit Extensions diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml index f5b7bd2812..469aea4a68 100644 --- a/gerrit-plugin-api/pom.xml +++ b/gerrit-plugin-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-api - 2.11.4 + 2.11.5 jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/gerrit-plugin-archetype/pom.xml b/gerrit-plugin-archetype/pom.xml index 77bd67e78e..5fccaa5f93 100644 --- a/gerrit-plugin-archetype/pom.xml +++ b/gerrit-plugin-archetype/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.gerrit gerrit-plugin-archetype - 2.11.4 + 2.11.5 Gerrit Code Review - Plugin Archetype Maven Archetype for Gerrit Plugins http://code.google.com/p/gerrit/ diff --git a/gerrit-plugin-gwt-archetype/pom.xml b/gerrit-plugin-gwt-archetype/pom.xml index 03f2d52dfd..9fc70df031 100644 --- a/gerrit-plugin-gwt-archetype/pom.xml +++ b/gerrit-plugin-gwt-archetype/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.gerrit gerrit-plugin-gwt-archetype - 2.11.4 + 2.11.5 Gerrit Code Review - Web UI GWT Plugin Archetype Maven Archetype for Gerrit Web UI GWT Plugins http://code.google.com/p/gerrit/ diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml index 7d811ae627..4d00566eff 100644 --- a/gerrit-plugin-gwtui/pom.xml +++ b/gerrit-plugin-gwtui/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-gwtui - 2.11.4 + 2.11.5 jar Gerrit Code Review - Plugin GWT UI Common Classes for Gerrit GWT UI Plugins diff --git a/gerrit-plugin-js-archetype/pom.xml b/gerrit-plugin-js-archetype/pom.xml index 61b98f7543..e85beefeea 100644 --- a/gerrit-plugin-js-archetype/pom.xml +++ b/gerrit-plugin-js-archetype/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.gerrit gerrit-plugin-js-archetype - 2.11.4 + 2.11.5 Gerrit Code Review - Web UI JavaScript Plugin Archetype Maven Archetype for Gerrit Web UI JavaScript Plugins http://code.google.com/p/gerrit/ diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml index aaa78fae4d..fa7cb66270 100644 --- a/gerrit-war/pom.xml +++ b/gerrit-war/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 2.11.4 + 2.11.5 war Gerrit Code Review - WAR Gerrit WAR From 864355d71ea94cfe09f5d95637767661ff41352a Mon Sep 17 00:00:00 2001 From: Doug Kelly Date: Thu, 12 Nov 2015 17:35:11 -0800 Subject: [PATCH 5/6] Correct RebaseChangeOp running hooks Hooks were not properly invoked for RebaseChangeOp, since it would simply fall back to the parent class and not call the PatchSetInserter's method to ensure hooks are run. Change-Id: I3c70c5e46f84891d79a80630e191288bf7e68e52 --- .../com/google/gerrit/server/change/RebaseChangeOp.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java index 31bfc500b8..d3367a085f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java @@ -25,6 +25,7 @@ import com.google.gerrit.reviewdb.client.RevId; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.git.BatchUpdate; import com.google.gerrit.server.git.BatchUpdate.ChangeContext; +import com.google.gerrit.server.git.BatchUpdate.Context; import com.google.gerrit.server.git.BatchUpdate.RepoContext; import com.google.gerrit.server.git.MergeUtil; import com.google.gerrit.server.git.validators.CommitValidators; @@ -148,6 +149,11 @@ public class RebaseChangeOp extends BatchUpdate.Op { rebasedPatchSet = patchSetInserter.getPatchSet(); } + @Override + public void postUpdate(Context ctx) throws OrmException { + patchSetInserter.postUpdate(ctx); + } + public PatchSet getPatchSet() { checkState(rebasedPatchSet != null, "getPatchSet() only valid after executing update"); From 291fcd26f00e27d2c19a7ffdc72f0c1de082d318 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 12 Nov 2015 17:53:07 -0800 Subject: [PATCH 6/6] Update replication plugin with merge from stable-2.11 Change-Id: I158b4f5b7f82a5e1bdeee64aec78c25d01478829 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index 32e84b1b61..675d9dd370 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 32e84b1b6131230caf880b0c181f98551edc44c6 +Subproject commit 675d9dd370948f0508dbe536dfc65cc6cd3bb00d