Merge branch 'stable-2.12'
* stable-2.12:
Fix keyboard shortcuts for special processing of CTRL and META
InitPlugins: Fix incorrect indentation
Add schema upgrade information in 2.12.2 release notes
Change-Id: I349a28fa3c910d3a9b4694734afa1ef75259bcf3
diff --git a/ReleaseNotes/ReleaseNotes-2.12.2.txt b/ReleaseNotes/ReleaseNotes-2.12.2.txt
index 5582bf9..500b015 100644
--- a/ReleaseNotes/ReleaseNotes-2.12.2.txt
+++ b/ReleaseNotes/ReleaseNotes-2.12.2.txt
@@ -6,7 +6,42 @@
link:https://gerrit-releases.storage.googleapis.com/gerrit-2.12.2.war[
https://gerrit-releases.storage.googleapis.com/gerrit-2.12.2.war]
-There are no schema changes from link:ReleaseNotes-2.12.1.html[2.12.1].
+Schema Upgrade
+--------------
+
+*WARNING:* There are no schema changes from link:ReleaseNotes-2.12.1.html[
+2.12.1] but a manual schema upgrade is necessary when upgrading from 2.12.
+
+When upgrading a site that is already running version 2.12, the `patch_sets`
+table must be manually migrated using the `gerrit gsql` SSH command or the
+`gqsl` site program.
+
+For the default H2 database, execute the command:
+
+----
+ alter table patch_sets modify push_certficate clob;
+----
+
+For MySQL, execute the command:
+
+----
+ alter table patch_sets modify push_certficate text;
+----
+
+For PostgreSQL, execute the command:
+
+----
+ alter table patch_sets alter column push_certficate type text;
+----
+
+For other database types, execute the appropriate equivalent command.
+
+Note that the misspelled `push_certficate` is the actual name of the
+column.
+
+When upgrading from a version earlier than 2.12, or from 2.12.1 having already
+done the migration, this manual step is not necessary and should be omitted.
+
Bug Fixes
---------
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java
index 2625222..e0a18aa 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java
@@ -136,6 +136,12 @@
if (mask == 0) {
mask = event.getNativeEvent().getKeyCode();
}
+ if (event.isControlKeyDown()) {
+ mask |= KeyCommand.M_CTRL;
+ }
+ if (event.isMetaKeyDown()) {
+ mask |= KeyCommand.M_META;
+ }
return mask;
}
}
