]> source.dussan.org Git - gitblit.git/commitdiff
Merge branch 'ticket/129' into develop
authorJames Moger <james.moger@gitblit.com>
Tue, 30 Sep 2014 16:43:59 +0000 (12:43 -0400)
committerJames Moger <james.moger@gitblit.com>
Tue, 30 Sep 2014 16:43:59 +0000 (12:43 -0400)
1  2 
src/main/java/com/gitblit/Constants.java
src/main/java/com/gitblit/auth/RedmineAuthProvider.java
src/main/java/com/gitblit/manager/AuthenticationManager.java
src/main/java/com/gitblit/servlet/PtServlet.java

index e41deebc46b7b0643e694f4ca4159d554e420398,f98f7b643ea6c216fdf841f3949d7c8a07f630f1..29221e6fbc8e67c5d98f064013cdaabf9dce07c5
@@@ -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.
index 313b284ce0200ed5f0328cfcd5e3acb7a02cd848,f69b444d9f1b838eca5b6f69627a0ad292bcd065..5f577f85693cf27a38b797546a2ed73422cdd20c
@@@ -34,11 -32,13 +35,10 @@@ import org.apache.commons.compress.arch
  import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;\r
  import org.apache.commons.compress.compressors.CompressorOutputStream;\r
  import org.apache.commons.compress.compressors.CompressorStreamFactory;\r
- import org.apache.wicket.util.io.ByteArrayOutputStream;\r
  import org.eclipse.jgit.lib.FileMode;\r
  \r
 -import com.gitblit.dagger.DaggerServlet;\r
  import com.gitblit.manager.IRuntimeManager;\r
  \r
 -import dagger.ObjectGraph;\r
 -\r
  /**\r
   * Handles requests for the Barnum pt (patchset tool).\r
   *\r