From c332d9a3d4d9485cfe60fb8dd9db7dbde971642c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 10 Nov 2015 08:58:35 -0500
Subject: [PATCH] Do not display fork button if target repo already exists (fixes #944)
---
src/main/java/com/gitblit/git/GitblitUploadPackFactory.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
index d4e3ca1..ec85628 100644
--- a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
+++ b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
@@ -15,8 +15,6 @@
*/
package com.gitblit.git;
-import javax.servlet.http.HttpServletRequest;
-
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.UploadPack;
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
@@ -24,7 +22,7 @@
import org.eclipse.jgit.transport.resolver.UploadPackFactory;
import com.gitblit.manager.IAuthenticationManager;
-import com.gitblit.models.UserModel;
+import com.gitblit.transport.git.GitDaemonClient;
/**
* The upload pack factory creates an upload pack which controls what refs are
@@ -46,16 +44,9 @@
public UploadPack create(X req, Repository db)
throws ServiceNotEnabledException, ServiceNotAuthorizedException {
- UserModel user = UserModel.ANONYMOUS;
int timeout = 0;
- if (req instanceof HttpServletRequest) {
- // http/https request may or may not be authenticated
- user = authenticationManager.authenticate((HttpServletRequest) req);
- if (user == null) {
- user = UserModel.ANONYMOUS;
- }
- } else if (req instanceof GitDaemonClient) {
+ if (req instanceof GitDaemonClient) {
// git daemon request is always anonymous
GitDaemonClient client = (GitDaemonClient) req;
// set timeout from Git daemon
--
Gitblit v1.9.1