From 557a1fa25a0a1d60bdb71ea3ad0e4e9a9cd9cc61 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 17 Sep 2013 17:39:10 -0400
Subject: [PATCH] Ignore the contents of a default .git/description file
---
src/main/java/com/gitblit/RedmineUserService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/RedmineUserService.java b/src/main/java/com/gitblit/RedmineUserService.java
index 9d571e3..d677e3e 100644
--- a/src/main/java/com/gitblit/RedmineUserService.java
+++ b/src/main/java/com/gitblit/RedmineUserService.java
@@ -135,7 +135,7 @@
user.accountType = getAccountType();
user.displayName = current.user.firstname + " " + current.user.lastname;
user.emailAddress = current.user.mail;
- user.password = ExternalAccount;
+ user.password = Constants.EXTERNAL_ACCOUNT;
if (!StringUtils.isEmpty(current.user.login)) {
// only admin users can get login name
// evidently this is an undocumented behavior of Redmine
@@ -158,7 +158,7 @@
String url = this.settings.getString(Keys.realm.redmine.url, "");
if (!url.endsWith("/")) {
- url.concat("/");
+ url = url.concat("/");
}
HttpURLConnection http;
if (username == null) {
--
Gitblit v1.9.1