Merge "Add .mailmap"

gitiles-servlet/src/main/java/com/google/gitiles/HostIndexServlet.java

diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/HostIndexServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/HostIndexServlet.java
index da79ea9..4b107c3 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/HostIndexServlet.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/HostIndexServlet.java
@@ -76,7 +76,7 @@
       return null;
     } catch (ServiceMayNotContinueException e) {
       // TODO(dborowitz): Show the error message to the user.
-      res.sendError(SC_FORBIDDEN);
+      res.sendError(e.getStatusCode());
       return null;
     } catch (IOException err) {
       String name = urls.getHostName(req);

gitiles-servlet/src/main/java/com/google/gitiles/RepositoryFilter.java

diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryFilter.java b/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryFilter.java
index ffb4a55..fa9d601 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryFilter.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryFilter.java
@@ -54,7 +54,7 @@
         // or send SC_NOT_FOUND there.
         chain.doFilter(req, res);
       } catch (ServiceMayNotContinueException e) {
-        sendError(req, res, SC_FORBIDDEN, e.getMessage());
+        sendError(req, res, e.getStatusCode(), e.getMessage());
       } finally {
         req.removeAttribute(ATTRIBUTE_REPOSITORY);
       }