From b236d715383920b7c92c035dcf769114011fa426 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 13 Oct 2014 18:06:28 -0400 Subject: Fix backslash regression in relative path determiniation --- src/main/java/com/gitblit/utils/FileUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gitblit/utils/FileUtils.java b/src/main/java/com/gitblit/utils/FileUtils.java index 27caa7ea..e7f01045 100644 --- a/src/main/java/com/gitblit/utils/FileUtils.java +++ b/src/main/java/com/gitblit/utils/FileUtils.java @@ -296,7 +296,7 @@ public class FileUtils { Path exactBase = Paths.get(getExactFile(basePath).toURI()); Path exactPath = Paths.get(getExactFile(path).toURI()); if (exactPath.startsWith(exactBase)) { - return exactBase.relativize(exactPath).toString(); + return exactBase.relativize(exactPath).toString().replace('\\', '/'); } // no relative relationship return null; -- cgit v1.2.3 From cdb92477597f84f9c45347c803c6d305dea6ff2e Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 13 Oct 2014 19:08:30 -0400 Subject: Fix GitBlitTest.testGitblitSettings() --- src/test/java/com/gitblit/tests/GitBlitTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/gitblit/tests/GitBlitTest.java b/src/test/java/com/gitblit/tests/GitBlitTest.java index 1f81b875..9eaae7f8 100644 --- a/src/test/java/com/gitblit/tests/GitBlitTest.java +++ b/src/test/java/com/gitblit/tests/GitBlitTest.java @@ -15,6 +15,7 @@ */ package com.gitblit.tests; +import java.io.File; import java.util.List; import org.eclipse.jgit.lib.Repository; @@ -24,6 +25,7 @@ import com.gitblit.Constants.AccessRestrictionType; import com.gitblit.FileSettings; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; +import com.gitblit.utils.FileUtils; public class GitBlitTest extends GitblitUnitTest { @@ -156,7 +158,9 @@ public class GitBlitTest extends GitblitUnitTest { assertEquals(5, settings().getInteger("realm.userService", 5)); assertTrue(settings().getBoolean("git.enableGitServlet", false)); - assertEquals("src/test/config/test-users.conf", settings().getString("realm.userService", null)); + File userDir = new File(System.getProperty("user.dir")); + File userService = new File(settings().getString("realm.userService", null)); + assertEquals("src/test/config/test-users.conf", FileUtils.getRelativePath(userDir, userService)); assertEquals(5, settings().getInteger("realm.minPasswordLength", 0)); List mdExtensions = settings().getStrings("web.markdownExtensions"); assertTrue(mdExtensions.size() > 0); -- cgit v1.2.3 From 70250d8ff53081eaccac24517ea96b89d27507b9 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 13 Oct 2014 19:16:51 -0400 Subject: Fix potential NPE when excluding last change author --- src/main/java/com/gitblit/tickets/TicketNotifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java index 07371b1b..d6217b35 100644 --- a/src/main/java/com/gitblit/tickets/TicketNotifier.java +++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java @@ -596,7 +596,7 @@ public class TicketNotifier { // respect the author's email preference UserModel lastAuthor = userManager.getUserModel(lastChange.author); - if (!lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) { + if (lastAuthor != null && !lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) { toAddresses.remove(lastAuthor.emailAddress); ccAddresses.remove(lastAuthor.emailAddress); } -- cgit v1.2.3 From 2bce519cc05826f7180c023b44203bb27b036a93 Mon Sep 17 00:00:00 2001 From: James Moger Date: Tue, 14 Oct 2014 13:18:58 -0400 Subject: Update to JGit 3.5.1 --- .classpath | 4 ++-- build.moxie | 2 +- gitblit.iml | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.classpath b/.classpath index f970f85d..2644d446 100644 --- a/.classpath +++ b/.classpath @@ -40,14 +40,14 @@ - + - + diff --git a/build.moxie b/build.moxie index 41a6f198..6f07392b 100644 --- a/build.moxie +++ b/build.moxie @@ -105,7 +105,7 @@ properties: { jetty.version : 9.2.3.v20140905 wicket.version : 1.4.21 lucene.version : 4.6.0 - jgit.version : 3.5.0.201409260305-r + jgit.version : 3.5.1.201410131835-r groovy.version : 1.8.8 bouncycastle.version : 1.49 selenium.version : 2.28.0 diff --git a/gitblit.iml b/gitblit.iml index f223d226..d6f84df7 100644 --- a/gitblit.iml +++ b/gitblit.iml @@ -397,13 +397,13 @@ - + - + - + @@ -474,13 +474,13 @@ - + - + - + -- cgit v1.2.3