diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index 5f9b369c3e..ccaca6a3ac 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -2208,13 +2208,6 @@ file containing the class must be placed in the `$site_path/lib` folder. + If not specified, the default no-op implementation is used. -[[gerrit.canLoadInIFrame]]gerrit.canLoadInIFrame:: -+ -For security reasons Gerrit will always jump out of iframe. -Setting this option to true will prevent this behavior. -+ -By default false. - [[gerrit.cdnPath]]gerrit.cdnPath:: + Path prefix for PolyGerrit's static resources if using a CDN. diff --git a/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java b/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java index 41d2f83975..cddaea4aaf 100644 --- a/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java +++ b/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java @@ -153,8 +153,7 @@ public class IndexHtmlUtil { serializeObject(GSON, accountApi.getEditPreferences())); data.put("userIsAuthenticated", true); } catch (AuthException e) { - logger.atFine().withCause(e).log( - "Can't inline account-related data because user is unauthenticated"); + logger.atFine().log("Can't inline account-related data because user is unauthenticated"); // Don't render data } diff --git a/java/com/google/gerrit/server/project/ProjectJson.java b/java/com/google/gerrit/server/project/ProjectJson.java index f2254d6bd7..f00df537f6 100644 --- a/java/com/google/gerrit/server/project/ProjectJson.java +++ b/java/com/google/gerrit/server/project/ProjectJson.java @@ -18,6 +18,7 @@ import static java.util.stream.Collectors.toMap; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; +import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.LabelValue; import com.google.gerrit.entities.Project; @@ -34,6 +35,7 @@ import java.util.HashMap; /** Collection of routines to populate {@link ProjectInfo}. */ @Singleton public class ProjectJson { + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private final AllProjectsName allProjects; private final WebLinks webLinks; @@ -50,7 +52,17 @@ public class ProjectJson { for (LabelType t : projectState.getLabelTypes().getLabelTypes()) { LabelTypeInfo labelInfo = new LabelTypeInfo(); labelInfo.values = - t.getValues().stream().collect(toMap(LabelValue::formatValue, LabelValue::getText)); + t.getValues().stream() + .collect( + toMap( + LabelValue::formatValue, + LabelValue::getText, + (v1, v2) -> { + logger.atSevere().log( + "Duplicate values for project: %s, label: %s found: '%s':'%s'", + projectState.getName(), t.getName(), v1, v2); + return v1; + })); labelInfo.defaultValue = t.getDefaultValue(); info.labels.put(t.getName(), labelInfo); } diff --git a/resources/com/google/gerrit/httpd/raw/HostPage.html b/resources/com/google/gerrit/httpd/raw/HostPage.html deleted file mode 100644 index c0d84468d9..0000000000 --- a/resources/com/google/gerrit/httpd/raw/HostPage.html +++ /dev/null @@ -1,26 +0,0 @@ - - - Gerrit Code Review - - - - - - -
-
-
-

Loading Gerrit Code Review ...

- -
-
-
- -
-
- - - -