Merge branch 'stable'

* stable:
  Update 2.1.8 release notes
  Allow serving static files in subdirectories
  Normalize OpenID URLs with http:// prefix
  Ignore PartialResultException from LDAP.
  Fix MySQL counter resets
  Substantially speed up pushing changes for review
  Avoid costly findMergedInto during push to refs/for/*
  Add cache for tag advertisements

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
	gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
	pom.xml

Change-Id: Ife316e255a8045bd28ca399d55e70eb8a075c48f

1 files changed, 6 insertions, 2 deletions

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java
index 56b71434..6e1366ae 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java
@@ -26,6 +26,7 @@ import com.google.gerrit.server.cache.CacheModule;
 import com.google.gerrit.server.config.CanonicalWebUrl;
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.git.ReceiveCommits;
+import com.google.gerrit.server.git.TagCache;
 import com.google.gerrit.server.git.TransferConfig;
 import com.google.gerrit.server.git.VisibleRefFilter;
 import com.google.gerrit.server.project.NoSuchProjectException;
@@ -218,11 +219,14 @@ public class ProjectServlet extends GitServlet {
   static class Upload implements UploadPackFactory<HttpServletRequest> {
     private final Provider<ReviewDb> db;
     private final PackConfig packConfig;
+    private final TagCache tagCache;
 
     @Inject
-    Upload(final Provider<ReviewDb> db, final TransferConfig tc) {
+    Upload(final Provider<ReviewDb> db, final TransferConfig tc,
+        final TagCache tagCache) {
       this.db = db;
       this.packConfig = tc.getPackConfig();
+      this.tagCache = tagCache;
     }
 
     @Override
@@ -238,7 +242,7 @@ public class ProjectServlet extends GitServlet {
       UploadPack up = new UploadPack(repo);
       up.setPackConfig(packConfig);
       if (!pc.allRefsAreVisible()) {
-        up.setRefFilter(new VisibleRefFilter(repo, pc, db.get(), true));
+        up.setRefFilter(new VisibleRefFilter(tagCache, repo, pc, db.get(), true));
       }
       return up;
     }