Merge branch 'stable-2.15' * stable-2.15: WebLinks: Don't show file weblinks for magic files Fix file list header on mobile Allow diff file picker to not text transform gr-button text Fix disabled buttons Fix patch range dropdown not updating the file list Change-Id: I1698d317485607c24cf7f9b562782428a31251dc
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java index 7bb5ba7..afa4609 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
@@ -31,9 +31,11 @@ import com.google.gerrit.extensions.webui.ProjectWebLink; import com.google.gerrit.extensions.webui.TagWebLink; import com.google.gerrit.extensions.webui.WebLink; +import com.google.gerrit.reviewdb.client.Patch; import com.google.gerrit.reviewdb.client.Project; import com.google.inject.Inject; import com.google.inject.Singleton; +import java.util.Collections; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -118,7 +120,9 @@ * @return Links for files. */ public List<WebLinkInfo> getFileLinks(String project, String revision, String file) { - return filterLinks(fileLinks, webLink -> webLink.getFileWebLink(project, revision, file)); + return Patch.isMagic(file) + ? Collections.emptyList() + : filterLinks(fileLinks, webLink -> webLink.getFileWebLink(project, revision, file)); } /** @@ -128,6 +132,9 @@ * @return Links for file history */ public List<WebLinkInfoCommon> getFileHistoryLinks(String project, String revision, String file) { + if (Patch.isMagic(file)) { + return Collections.emptyList(); + } return FluentIterable.from(fileHistoryLinks) .transform( webLink -> { @@ -165,6 +172,9 @@ final int patchSetIdB, final String revisionB, final String fileB) { + if (Patch.isMagic(fileA) || Patch.isMagic(fileB)) { + return Collections.emptyList(); + } return FluentIterable.from(diffLinks) .transform( webLink ->