From 69fd3a468d330d3178927c5db1fe011af48a7550 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Thu, 10 Apr 2014 13:07:11 +0200 Subject: [PATCH 1/3] Fix JavaDoc warning The JavaDoc generation reported the following warning: .../EmailReviewCommentsExecutor.java:29: warning - Tag @link: reference not found: EmailReviewComments Change-Id: If30a0e08ccbcea0ee55d208cc2dc6840c4dab00e Signed-off-by: Edwin Kempin (cherry picked from commit a5d2ad3933bd021d6a5a947642bf14bcfd1b998b) --- .../com/google/gerrit/server/change/EmailReviewComments.java | 2 +- .../google/gerrit/server/git/EmailReviewCommentsExecutor.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java index eea2f4827c..e37eede394 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java @@ -43,7 +43,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -class EmailReviewComments implements Runnable, RequestContext { +public class EmailReviewComments implements Runnable, RequestContext { private static final Logger log = LoggerFactory.getLogger(EmailReviewComments.class); interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/EmailReviewCommentsExecutor.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/EmailReviewCommentsExecutor.java index 1581ec48d1..9ad0dfcaa4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/EmailReviewCommentsExecutor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/EmailReviewCommentsExecutor.java @@ -16,6 +16,7 @@ package com.google.gerrit.server.git; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import com.google.gerrit.server.change.EmailReviewComments; import com.google.inject.BindingAnnotation; import java.lang.annotation.Retention; From 980c5bf9ef4f27cc8d25cb0c4aebf8d54b9cc47f Mon Sep 17 00:00:00 2001 From: Christian Aistleitner Date: Thu, 10 Apr 2014 14:30:22 +0200 Subject: [PATCH 2/3] Set uploader to current user in "patchset-created" event upon cherry-picking When using the web ui (both old and new ChangeScreen) to cherry-pick a change to a branch that already has this change (e.g.: cherry-picking on the same branch to get rid of dependencies), the corresponding patchset-created event had its patchSet.uploader set to the Change's owner instead of the current user. We now set it to the current user, so stream-events consumers can properly detect who uploaded the rebased patch set. Change-Id: I0613ecae06b7843b8ca0294f83378c3917c26810 --- .../com/google/gerrit/server/change/CherryPickChange.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java index bf848a6767..a5c7c69c4d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java @@ -175,7 +175,7 @@ public class CherryPickChange { // The change key exists on the destination branch. The cherry pick // will be added as a new patch set. return insertPatchSet(git, revWalk, destChanges.get(0), patchSetId, - cherryPickCommit, refControl); + cherryPickCommit, refControl, currentUser); } else { // Change key not found on destination branch. We can create a new // change. @@ -192,8 +192,9 @@ public class CherryPickChange { private Change.Id insertPatchSet(Repository git, RevWalk revWalk, Change change, PatchSet.Id patchSetId, RevCommit cherryPickCommit, - RefControl refControl) throws InvalidChangeOperationException, - IOException, OrmException, NoSuchChangeException { + RefControl refControl, IdentifiedUser uploader) + throws InvalidChangeOperationException, IOException, OrmException, + NoSuchChangeException { final PatchSetInserter inserter = patchSetInserterFactory .create(git, revWalk, refControl, currentUser, change, cherryPickCommit); final PatchSet.Id newPatchSetId = inserter.getPatchSetId(); @@ -201,6 +202,7 @@ public class CherryPickChange { inserter .setMessage("Uploaded patch set " + newPatchSetId.get() + ".") .setDraft(current.isDraft()) + .setUploader(uploader.getAccountId()) .insert(); return change.getId(); } From 429c79d61ef5f96e7c3b657ea8c061f8d11b7924 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 26 Mar 2014 07:30:39 -0700 Subject: [PATCH 3/3] Release notes for Gerrit 2.8.4 Change-Id: If89b43f642e2cd06c29e1549273832ca70d07cb4 --- ReleaseNotes/ReleaseNotes-2.8.4.txt | 173 ++++++++++++++++++++++++++++ ReleaseNotes/index.txt | 1 + 2 files changed, 174 insertions(+) create mode 100644 ReleaseNotes/ReleaseNotes-2.8.4.txt diff --git a/ReleaseNotes/ReleaseNotes-2.8.4.txt b/ReleaseNotes/ReleaseNotes-2.8.4.txt new file mode 100644 index 0000000000..1719294456 --- /dev/null +++ b/ReleaseNotes/ReleaseNotes-2.8.4.txt @@ -0,0 +1,173 @@ +Release notes for Gerrit 2.8.4 +============================== + +There are no schema changes from link:ReleaseNotes-2.8.3.html[2.8.3]. + +Download: +link:https://gerrit-releases.storage.googleapis.com/gerrit-2.8.4.war[ +https://gerrit-releases.storage.googleapis.com/gerrit-2.8.4.war] + + +Bug Fixes +--------- + + +Secondary Index +~~~~~~~~~~~~~~~ + + +* Disable `commitWithin` when running Reindex. ++ +If `commitWithin` was set to a low value, it caused poor performance +when running the Reindex program on sites with a large amount of changes. ++ +The `commitWithin` setting is now disabled from within Reindex by overriding +the configuration with '-1'. Index updates are auto-flushed but not +auto-committed, which is the least safe but the most efficient for reindexing +the entire site. + +* Fix memory leak in Lucene index. ++ +`SubIndex.NrtFuture` objects were being added as listeners of `searchManager` +and never released. + +Change Screen +~~~~~~~~~~~~~ + + +* link:https://code.google.com/p/gerrit/issues/detail?id=2456[Issue 2456]: +Respect the comment visibility preference in the new change screen. ++ +The "Expand All" and "Collapse All" settings now work like they did on +the old change screen. + +* link:https://code.google.com/p/gerrit/issues/detail?id=2538[Issue 2538]: +Don't show the "Patch File" download for merge commits. ++ +The patch file download does not work for commits with more than one +parent (i.e. merges) and results in an error being displayed. Now the +link is not shown for merge commits; a solution for merge patches will +be investigated for future releases. + +* link:https://code.google.com/p/gerrit/issues/detail?id=2526[Issue 2526]: +Hide the `refs/heads/` prefix in branch suggestion list for cherry-picks. ++ +Regular branches like `refs/heads/stable/` will now be displayed as +just `stable` in the suggestion list when cherry-picking a change in the +Web UI. + +* Disable the "Save" button after it is pressed when editing the commit +message. ++ +The "Save" button was not being disabled, and could be pressed multiple +times while the message was being saved, resulting in multiple new patch +sets being created. + +* Fix syntax highlighting for shell files in new side-by-side diff. + +* Fix inconsistent behavior of diff view when viewing binary files. ++ +In the new change screen, if the user clicked on a binary file in +the file list, the unified view was used. Then when navigating to +a previous or next file that is not binary, the diff view stayed in +the old unified setting. + +* Make the skip bar more user friendly in side-by-side diff. ++ +The whole "skipped xxx common lines" text is now a link, rather +than just the number. + +* Show previous and next file shortcut keys in new side-by-side +navigation arrow tooltips. ++ +In the top right corner of a file the navigation cluster has a +tooltip on the up arrow but did not show the tooltip on the left +or right arrows. + +Plugins +~~~~~~~ + + +* Fix ChangeListener auto-registered implementations. ++ +Add missing `@ExtensionPoint` in `ChangeListener` so implementors can +use `@Listen` to register. + +* Escape dollar sign in plugin manifest entries. ++ +Plugins could be built, but not loaded, if they had any manifest entries +that contained a dollar sign. + +Misc +~~~~ + + +* link:https://code.google.com/p/gerrit/issues/detail?id=2564[Issue 2564], +link:https://code.google.com/p/gerrit/issues/detail?id=2571[Issue 2571]: +Emit ref-updated event when editing project access via Web UI. + +* link:https://code.google.com/p/gerrit/issues/detail?id=2557[Issue 2557]: +By default don't allow admins to create new branches by push. ++ +When pushing changes it is easy to make a typo in the refspec and in this case +new branches should not be created. If administrators want to create branches +by push they should explicitly assign themselves the needed access rights. + +* Do not refresh project list if filter did not change. ++ +The project list was being refreshed on every key event even if the +filter did not change, e.g. moving the cursor inside the text entry was +causing the list to update unnecessarily. + +* Fix mail thread getting stuck when waiting for response from SMTP server. ++ +It is now possible to configure the default thread pool size, the size of +the thread pool for sending emails, and the SMTP server connection timeout. + +* link:https://code.google.com/p/gerrit/issues/detail?id=2215[Issue 2215]: +Paginate the project list screen. ++ +The project list screen was taking a long time to render over a large +amount of projects (1,000+) and with even larger number of projects +(3,000+), it could make the browser unresponsive. ++ +The project list screen now uses pagination to resolve this issue. The +number of projects displayed is determined by the 'Maximum Page Size' +user preference. ++ +Option 'S' is added to the projects REST API to support query offset. + +* link:https://code.google.com/p/gerrit/issues/detail?id=2599[Issue 2599]: +Always auto confirm adding reviewers in `set-reviewers` SSH command. ++ +If a group contains more than 'addreviewer.maxWithoutConfirmation' +members, adding it as reviewer to a change requires a confirmation. A +user should only be asked for the confirmation when reviewers are +added from the Web UI but not when the `set-reviewers` SSH command is +used. + +* Set uploader to current user in `patchset-created` event upon cherry-picking. ++ +When using the Web UI (both old and new change screens) to cherry-pick a +change to a branch that already has this change (e.g. cherry-picking +on the same branch to get rid of dependencies), the corresponding +`patchset-created` event had its `patchSet.uploader` set to the change's +owner instead of the current user. It is now set to the current user, +so stream-events consumers can properly detect who uploaded the +rebased patch set. + +Documentation +~~~~~~~~~~~~~ + + +* link:https://code.google.com/p/gerrit/issues/detail?id=1273[Issue 1273]: +Update the MySQL documentation concerning character sets. ++ +The setup documentation is updated to mention that there is no need to use +latin1 encoding if you are using an engine other than MyISAM. + +* Use consistent grammatical tense in ssh command descriptions. + +* Add more detail about `refs/drafts` in +link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.8.4/access-control.html[ +access control documentation]. diff --git a/ReleaseNotes/index.txt b/ReleaseNotes/index.txt index e73d22454c..94f6a92f44 100644 --- a/ReleaseNotes/index.txt +++ b/ReleaseNotes/index.txt @@ -4,6 +4,7 @@ Gerrit Code Review - Release Notes [[2_8]] Version 2.8.x ------------- +* link:ReleaseNotes-2.8.4.html[2.8.4] * link:ReleaseNotes-2.8.3.html[2.8.3] * link:ReleaseNotes-2.8.2.html[2.8.2] * link:ReleaseNotes-2.8.1.html[2.8.1]