From fd8cea4761b5382f23d06ed52608d1f556c4dbe5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 22 May 2014 17:31:30 -0400
Subject: [PATCH] Render GFM links using Markdown, not direct HTML
---
src/main/java/com/gitblit/DaggerModule.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/gitblit/DaggerModule.java b/src/main/java/com/gitblit/DaggerModule.java
index 1805c4e..b89f8c4 100644
--- a/src/main/java/com/gitblit/DaggerModule.java
+++ b/src/main/java/com/gitblit/DaggerModule.java
@@ -19,17 +19,17 @@
import com.gitblit.manager.AuthenticationManager;
import com.gitblit.manager.FederationManager;
-import com.gitblit.manager.PluginManager;
import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.manager.IFederationManager;
import com.gitblit.manager.IGitblit;
-import com.gitblit.manager.IPluginManager;
import com.gitblit.manager.INotificationManager;
+import com.gitblit.manager.IPluginManager;
import com.gitblit.manager.IProjectManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.manager.IUserManager;
import com.gitblit.manager.NotificationManager;
+import com.gitblit.manager.PluginManager;
import com.gitblit.manager.ProjectManager;
import com.gitblit.manager.RepositoryManager;
import com.gitblit.manager.RuntimeManager;
@@ -57,6 +57,7 @@
// core managers
IRuntimeManager.class,
+ IPluginManager.class,
INotificationManager.class,
IUserManager.class,
IAuthenticationManager.class,
@@ -64,7 +65,6 @@
IRepositoryManager.class,
IProjectManager.class,
IFederationManager.class,
- IPluginManager.class,
// the monolithic manager
IGitblit.class,
@@ -83,16 +83,16 @@
return new RuntimeManager(settings);
}
+ @Provides @Singleton IPluginManager providePluginManager(IRuntimeManager runtimeManager) {
+ return new PluginManager(runtimeManager);
+ }
+
@Provides @Singleton INotificationManager provideNotificationManager(IStoredSettings settings) {
return new NotificationManager(settings);
}
@Provides @Singleton IUserManager provideUserManager(IRuntimeManager runtimeManager) {
return new UserManager(runtimeManager);
- }
-
- @Provides @Singleton IPluginManager providePluginManager(IRuntimeManager runtimeManager) {
- return new PluginManager(runtimeManager);
}
@Provides @Singleton IAuthenticationManager provideAuthenticationManager(
@@ -162,29 +162,30 @@
@Provides @Singleton IGitblit provideGitblit(
IRuntimeManager runtimeManager,
+ IPluginManager pluginManager,
INotificationManager notificationManager,
IUserManager userManager,
IAuthenticationManager authenticationManager,
IPublicKeyManager publicKeyManager,
IRepositoryManager repositoryManager,
IProjectManager projectManager,
- IFederationManager federationManager,
- IPluginManager pluginManager) {
+ IFederationManager federationManager) {
return new GitBlit(
runtimeManager,
+ pluginManager,
notificationManager,
userManager,
authenticationManager,
publicKeyManager,
repositoryManager,
projectManager,
- federationManager,
- pluginManager);
+ federationManager);
}
@Provides @Singleton GitBlitWebApp provideWebApplication(
IRuntimeManager runtimeManager,
+ IPluginManager pluginManager,
INotificationManager notificationManager,
IUserManager userManager,
IAuthenticationManager authenticationManager,
@@ -196,6 +197,7 @@
return new GitBlitWebApp(
runtimeManager,
+ pluginManager,
notificationManager,
userManager,
authenticationManager,
--
Gitblit v1.9.1