commit 4d16b569f082cd7f8b266e947552d8d07e8ccc8e
author Wyatt Allen <wyatta@google.com> Wed Jun 27 22:07:06 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 27 22:07:06 2018 +0000
tree 237b7aaf03834ce0a07b5c15bcdc4c948847dbee
parent 91ac033599bd7b0ee0e860a8c07a3298a88a11d5
parent b38a1bec27cf6e76c6a193faf1ddc1114a7c3b7a

Merge "Clearer wording for force option in push permissions"

javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java

diff --git a/javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java b/javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java
index a4d9acb..bf01a21 100644
--- a/javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java
@@ -73,7 +73,10 @@
   public void testUserPredicate() throws Exception {
     // This test results in a RULE_ERROR as Prolog tries to find accounts by email, using the index.
     // TODO(maximeg) get OK results
-    modifySubmitRules("commit_author(user(1000000), 'John Doe', 'john.doe@example.com')");
+    modifySubmitRules(
+        String.format(
+            "gerrit:commit_author(user(%d), '%s', '%s')",
+            user.getId().get(), user.fullName, user.email));
     assertThat(statusForRule()).isEqualTo(SubmitRecord.Status.RULE_ERROR);
   }
 

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

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
index 9862b3f..8798a8f 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
@@ -990,6 +990,7 @@
     },
 
     _handleShiftXKey(e) {
+      if (this.shouldSuppressKeyboardShortcut(e)) { return; }
       this.$.diff.expandAllContext();
     },
   });