Merge branch 'stable-3.4-2021-07'
* stable-3.4-2021-07:
Hide repository name and description when user has no access
Change-Id: I28d2b12772bcfe8345127ca668ccf72fca49a47b
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java
index f1c34c6..a2d5c94 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java
@@ -17,6 +17,7 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.config.SitePaths;
+import com.google.gitiles.BranchRedirectFilter;
import com.google.gitiles.GitilesAccess;
import com.google.gitiles.GitilesServlet;
import com.google.gitiles.GitilesUrls;
@@ -108,7 +109,17 @@
GitilesUrls urls,
GitilesAccess.Factory accessFactory,
RepositoryResolver<HttpServletRequest> resolver) {
- return new GitilesServlet(cfg, null, urls, accessFactory, resolver, null, null, null, null);
+ return new GitilesServlet(
+ cfg,
+ null,
+ urls,
+ accessFactory,
+ resolver,
+ null,
+ null,
+ null,
+ null,
+ new BranchRedirectFilter());
}
@Provides