From e0dc80dcd0d17262782bec349419713a82ebadc5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 06 May 2013 23:25:10 -0400
Subject: [PATCH] Fixed regression with http socket connector
---
src/main/java/com/gitblit/wicket/pages/BasePage.java | 27 ---------------------------
1 files changed, 0 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/BasePage.java b/src/main/java/com/gitblit/wicket/pages/BasePage.java
index b3b0767..19fa749 100644
--- a/src/main/java/com/gitblit/wicket/pages/BasePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.java
@@ -57,7 +57,6 @@
import com.gitblit.Constants.FederationStrategy;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
-import com.gitblit.SparkleShareInviteServlet;
import com.gitblit.models.ProjectModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.TeamModel;
@@ -311,32 +310,6 @@
// git daemon is not running
return new Label(wicketId).setVisible(false);
}
- }
-
- protected String getSparkleShareInviteUrl(RepositoryModel repository) {
- if (repository.isBare && repository.isSparkleshared()) {
- UserModel user = GitBlitWebSession.get().getUser();
- if (user == null) {
- user = UserModel.ANONYMOUS;
- }
- String username = null;
- if (UserModel.ANONYMOUS != user) {
- username = user.username;
- }
- if (GitBlit.getBoolean(Keys.git.enableGitServlet, true) || (GitBlit.getInteger(Keys.git.daemonPort, 0) > 0)) {
- // Gitblit as server
- // ensure user can rewind
- if (user.canRewindRef(repository)) {
- String baseURL = WicketUtils.getGitblitURL(RequestCycle.get().getRequest());
- return SparkleShareInviteServlet.asLink(baseURL, repository.name, username);
- }
- } else {
- // Gitblit as viewer, assume RW+ permission
- String baseURL = WicketUtils.getGitblitURL(RequestCycle.get().getRequest());
- return SparkleShareInviteServlet.asLink(baseURL, repository.name, username);
- }
- }
- return null;
}
protected List<ProjectModel> getProjectModels() {
--
Gitblit v1.9.1