summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/manager/GitblitManager.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-09-25 09:17:44 -0400
committerJames Moger <james.moger@gitblit.com>2014-09-25 09:17:44 -0400
commit219722e27a5832b33d2fad7cd5649015ea3523a8 (patch)
tree41147ec35e9118bc2415bc41c4f9a9d433273bfd /src/main/java/com/gitblit/manager/GitblitManager.java
parentbfc22d47158b685ff8c6a686faf0f213a65fa0e1 (diff)
parentec7ed84b04cd3981ae01b104bd52fc010f31e6a7 (diff)
downloadgitblit-219722e27a5832b33d2fad7cd5649015ea3523a8.tar.gz
gitblit-219722e27a5832b33d2fad7cd5649015ea3523a8.zip
Merge branch 'ticket/187' into develop
Diffstat (limited to 'src/main/java/com/gitblit/manager/GitblitManager.java')
-rw-r--r--src/main/java/com/gitblit/manager/GitblitManager.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index 38a18efb..2c883af2 100644
--- a/src/main/java/com/gitblit/manager/GitblitManager.java
+++ b/src/main/java/com/gitblit/manager/GitblitManager.java
@@ -665,16 +665,28 @@ public class GitblitManager implements IGitblit {
}
@Override
+ @Deprecated
public void setCookie(HttpServletResponse response, UserModel user) {
authenticationManager.setCookie(response, user);
}
@Override
+ public void setCookie(HttpServletRequest request, HttpServletResponse response, UserModel user) {
+ authenticationManager.setCookie(request, response, user);
+ }
+
+ @Override
+ @Deprecated
public void logout(HttpServletResponse response, UserModel user) {
authenticationManager.logout(response, user);
}
@Override
+ public void logout(HttpServletRequest request, HttpServletResponse response, UserModel user) {
+ authenticationManager.logout(request, response, user);
+ }
+
+ @Override
public boolean supportsCredentialChanges(UserModel user) {
return authenticationManager.supportsCredentialChanges(user);
}