From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 16:43:59 +0000 (-0400)
Subject: Merge branch 'ticket/129' into develop
X-Git-Tag: v1.7.0~1^2~137
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f685ea581f94373a63bcdc94ec417fdf92a95d68;p=gitblit.git

Merge branch 'ticket/129' into develop
---

f685ea581f94373a63bcdc94ec417fdf92a95d68
diff --cc src/main/java/com/gitblit/manager/AuthenticationManager.java
index e41deebc,f98f7b64..29221e6f
--- a/src/main/java/com/gitblit/manager/AuthenticationManager.java
+++ b/src/main/java/com/gitblit/manager/AuthenticationManager.java
@@@ -53,9 -52,6 +53,8 @@@ import com.gitblit.utils.Base64
  import com.gitblit.utils.HttpUtils;
  import com.gitblit.utils.StringUtils;
  import com.gitblit.utils.X509Utils.X509Metadata;
- import com.gitblit.wicket.GitBlitWebSession;
 +import com.google.inject.Inject;
 +import com.google.inject.Singleton;
  
  /**
   * The authentication manager handles user login & logout.
diff --cc src/main/java/com/gitblit/servlet/PtServlet.java
index 313b284c,f69b444d..5f577f85
--- a/src/main/java/com/gitblit/servlet/PtServlet.java
+++ b/src/main/java/com/gitblit/servlet/PtServlet.java
@@@ -34,11 -32,13 +35,10 @@@ import org.apache.commons.compress.arch
  import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
  import org.apache.commons.compress.compressors.CompressorOutputStream;
  import org.apache.commons.compress.compressors.CompressorStreamFactory;
- import org.apache.wicket.util.io.ByteArrayOutputStream;
  import org.eclipse.jgit.lib.FileMode;
  
 -import com.gitblit.dagger.DaggerServlet;
  import com.gitblit.manager.IRuntimeManager;
  
 -import dagger.ObjectGraph;
 -
  /**
   * Handles requests for the Barnum pt (patchset tool).
   *