Merge "InternalQuery: Cast setter return types to specific subtype"
diff --git a/java/com/google/gerrit/server/project/CreateRefControl.java b/java/com/google/gerrit/server/project/CreateRefControl.java
index f89e298..e841401 100644
--- a/java/com/google/gerrit/server/project/CreateRefControl.java
+++ b/java/com/google/gerrit/server/project/CreateRefControl.java
@@ -138,9 +138,15 @@
return;
}
- throw new AuthException(
+ AuthException e =
+ new AuthException(
+ String.format(
+ "%s for creating new commit object not permitted",
+ RefPermission.UPDATE.describeForException()));
+ e.setAdvice(
String.format(
- "%s for creating new commit object not permitted",
+ "use a SHA1 visible to you, or get %s permission on the ref",
RefPermission.UPDATE.describeForException()));
+ throw e;
}
}
diff --git a/polygerrit-ui/app/elements/admin/gr-group-audit-log/gr-group-audit-log.html b/polygerrit-ui/app/elements/admin/gr-group-audit-log/gr-group-audit-log.html
index eb6a708..05b176c 100644
--- a/polygerrit-ui/app/elements/admin/gr-group-audit-log/gr-group-audit-log.html
+++ b/polygerrit-ui/app/elements/admin/gr-group-audit-log/gr-group-audit-log.html
@@ -26,7 +26,13 @@
<dom-module id="gr-group-audit-log">
<template>
<style include="shared-styles"></style>
- <style include="gr-table-styles"></style>
+ <style include="gr-table-styles">
+ /* GenericList style centers the last column, but we don't want that here. */
+ .genericList tr th:last-of-type,
+ .genericList tr td:last-of-type {
+ text-align: left;
+ }
+ </style>
<table id="list" class="genericList">
<tr class="headerRow">
<th class="date topHeader">Date</th>
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-image.js b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-image.js
index bf543e5..11bea8c 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-image.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-image.js
@@ -20,7 +20,9 @@
// Prevent redefinition.
if (window.GrDiffBuilderImage) { return; }
- const IMAGE_MIME_PATTERN = /^image\/(bmp|gif|jpeg|jpg|png|tiff|webp)$/;
+ // MIME types for images we allow showing. Do not include SVG, it can contain
+ // arbitrary JavaScript.
+ const IMAGE_MIME_PATTERN = /^image\/(bmp|gif|x-icon|jpeg|jpg|png|tiff|webp)$/;
function GrDiffBuilderImage(diff, prefs, outputEl, baseImage, revisionImage) {
GrDiffBuilderSideBySide.call(this, diff, prefs, outputEl, []);
