Merge "Migrate gr-editable-label to iron-a11y-keys"

gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigrationState.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigrationState.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigrationState.java
index d7ea447..49a30bb 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigrationState.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigrationState.java
@@ -31,13 +31,16 @@
 
   WRITE(false, true, false, PrimaryStorage.REVIEW_DB, false, false),
 
-  READ_WRITE_NO_SEQUENCE(true, true, false, PrimaryStorage.NOTE_DB, false, false),
+  READ_WRITE_NO_SEQUENCE(true, true, false, PrimaryStorage.REVIEW_DB, false, false),
 
   READ_WRITE_WITH_SEQUENCE_REVIEW_DB_PRIMARY(
       true, true, true, PrimaryStorage.REVIEW_DB, false, false),
 
   READ_WRITE_WITH_SEQUENCE_NOTE_DB_PRIMARY(true, true, true, PrimaryStorage.NOTE_DB, false, false),
 
+  // TODO(dborowitz): This only exists as a separate state to support testing in different
+  // NoteDbModes. Once FileRepository fuses BatchRefUpdates, we won't have separate fused/unfused
+  // states.
   NOTE_DB_UNFUSED(true, true, true, PrimaryStorage.NOTE_DB, true, false),
 
   NOTE_DB(true, true, true, PrimaryStorage.NOTE_DB, true, true);

polygerrit-ui/.gitignore

diff --git a/polygerrit-ui/.gitignore b/polygerrit-ui/.gitignore
index b3b74a6..7f06bef 100644
--- a/polygerrit-ui/.gitignore
+++ b/polygerrit-ui/.gitignore
@@ -4,3 +4,4 @@
 fonts
 bower_components
 .tmp
+.vscode
\ No newline at end of file

polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html
index 50741fb..a47a695 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html
@@ -90,6 +90,7 @@
       .dropdown-content {
         background-color: #fff;
         box-shadow: 0 1px 5px rgba(0, 0, 0, .3);
+        max-height: 70vh;
       }
       .dropdown-content a {
         cursor: pointer;