Merge branch 'stable-2.10'

* stable-2.10:
  Update 2.10 release notes
  Re-enable the Cherry Pick button when cancelled

Conflicts:
	gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CherryPickAction.java

Change-Id: Ida1b759ef46b2de808e56568f43bff9b2b21fd79
This commit is contained in:
David Pursehouse 2015-01-20 16:50:05 +09:00
commit b675732aaf
2 changed files with 6 additions and 0 deletions

View File

@ -490,6 +490,11 @@ As linkifying trailing dots and trailing commas does more harm than
good, we only treat dots and commas as being part of urls, if they are
neither followed by whitespace nor occur at the end of a string.
* Re-enable the 'Cherry Pick' button after canceling the dialog.
+
If the dialog was canceled, the button remained disabled and could not be
used again.
* Improve message when removing a reviewer.
* link:http://code.google.com/p/gerrit/issues/detail?id=527[Issue 527]:

View File

@ -27,6 +27,7 @@ import com.google.gwt.event.logical.shared.CloseEvent;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.PopupPanel;
class CherryPickAction {
static void call(final Button b, final ChangeInfo info, final String revision,
String project, final String commitMessage) {