From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result
---
src/main/java/com/gitblit/servlet/PagesFilter.java | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/PagesFilter.java b/src/main/java/com/gitblit/servlet/PagesFilter.java
index 42e7de7..9e00916 100644
--- a/src/main/java/com/gitblit/servlet/PagesFilter.java
+++ b/src/main/java/com/gitblit/servlet/PagesFilter.java
@@ -15,15 +15,9 @@
*/
package com.gitblit.servlet;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
import org.eclipse.jgit.lib.Repository;
import com.gitblit.Constants.AccessRestrictionType;
-import com.gitblit.manager.IRepositoryManager;
-import com.gitblit.manager.IRuntimeManager;
-import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
@@ -34,16 +28,7 @@
* @author James Moger
*
*/
-@Singleton
public class PagesFilter extends AccessRestrictionFilter {
-
- @Inject
- public PagesFilter(IRuntimeManager runtimeManager,
- IAuthenticationManager authenticationManager,
- IRepositoryManager repositoryManager) {
-
- super(runtimeManager, authenticationManager, repositoryManager);
- }
/**
* Extract the repository name from the url.
--
Gitblit v1.9.1