From 018ad3913231e1aa53a60a00db40d5fea7ceb279 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Wed, 06 Apr 2016 14:28:09 -0400
Subject: [PATCH] Merge pull request #1045 from gitblit/882-HonourAllowNewTicketSetting
---
src/main/java/com/gitblit/manager/GitblitManager.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index a34e29d..85d5c19 100644
--- a/src/main/java/com/gitblit/manager/GitblitManager.java
+++ b/src/main/java/com/gitblit/manager/GitblitManager.java
@@ -649,8 +649,8 @@
*/
@Override
- public UserModel authenticate(String username, char[] password) {
- return authenticationManager.authenticate(username, password);
+ public UserModel authenticate(String username, char[] password, String remoteIP) {
+ return authenticationManager.authenticate(username, password, remoteIP);
}
@Override
@@ -1274,8 +1274,8 @@
}
@Override
- public List<FilestoreModel> getAllObjects() {
- return filestoreManager.getAllObjects();
+ public List<FilestoreModel> getAllObjects(UserModel user) {
+ return filestoreManager.getAllObjects(user);
}
@Override
--
Gitblit v1.9.1