From 47b97cd527d2ddfbc2b9cba9e2026317a8339ffb Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 30 Aug 2018 13:12:16 +0200 Subject: [PATCH 1/3] run build sequential --- scm-ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm-ui/package.json b/scm-ui/package.json index f628a43276..e54baaba20 100644 --- a/scm-ui/package.json +++ b/scm-ui/package.json @@ -35,7 +35,7 @@ "start": "npm-run-all -p webfonts watch-css build-vendor start-js", "build-js": "ui-bundler bundle target/scm-ui.bundle.js", "build-vendor": "ui-bundler vendor target/vendor.bundle.js", - "build": "npm-run-all webfonts build-css build-vendor build-js", + "build": "npm-run-all -s webfonts build-css build-vendor build-js", "test": "ui-bundler test", "test-ci": "ui-bundler test --ci", "flow": "flow", From d4ed3b72d359ff1af98f5f2e6c5912613f9d236e Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 30 Aug 2018 13:12:33 +0200 Subject: [PATCH 2/3] fix mercurial hook integration tests --- scm-webapp/src/main/java/sonia/scm/WebResourceServlet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/WebResourceServlet.java b/scm-webapp/src/main/java/sonia/scm/WebResourceServlet.java index 43e7dbacb5..764e4f18d2 100644 --- a/scm-webapp/src/main/java/sonia/scm/WebResourceServlet.java +++ b/scm-webapp/src/main/java/sonia/scm/WebResourceServlet.java @@ -30,10 +30,10 @@ public class WebResourceServlet extends HttpServlet { /** * exclude api requests and the old frontend servlets. * - * TODO remove old protocol servlets + * TODO remove old protocol servlets and hook. Move /hook/hg to api? */ @VisibleForTesting - static final String PATTERN = "/(?!api/|git/|hg/|svn/|debug/).*"; + static final String PATTERN = "/(?!api/|git/|hg/|svn/|hook/).*"; private static final Logger LOG = LoggerFactory.getLogger(WebResourceServlet.class); From 9725f2d19f0d0a88d053de8650b5165565469252 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 30 Aug 2018 13:29:52 +0200 Subject: [PATCH 3/3] use try-with-resources for git repository --- .../src/main/java/sonia/scm/repository/spi/GitLogCommand.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java index 52625ff6c4..65a6f9daf8 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java @@ -172,10 +172,8 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand GitChangesetConverter converter = null; RevWalk revWalk = null; - try + try (org.eclipse.jgit.lib.Repository gr = open()) { - org.eclipse.jgit.lib.Repository gr = open(); - if (!gr.getAllRefs().isEmpty()) { int counter = 0;