Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 16:05:44 +01:00
Code Issues Packages Projects Releases Activity

Merge with 2.0.0-m3

Browse Source
This commit is contained in:
René Pfeuffer
2018-08-31 10:46:20 +02:00
parent ba05417aeb beb8b95924
commit c3bf2a6e9c
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
View File

@@ -172,10 +172,8 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
GitChangesetConverter converter = null; GitChangesetConverter converter = null;
RevWalk revWalk = null; RevWalk revWalk = null;
try try (org.eclipse.jgit.lib.Repository gr = open())
{ {
org.eclipse.jgit.lib.Repository gr = open();
if (!gr.getAllRefs().isEmpty()) if (!gr.getAllRefs().isEmpty())
{ {
int counter = 0; int counter = 0;

2
scm-ui/package.json
View File

@@ -35,7 +35,7 @@
"start": "npm-run-all -p webfonts watch-css build-vendor start-js", "start": "npm-run-all -p webfonts watch-css build-vendor start-js",
"build-js": "ui-bundler bundle target/scm-ui.bundle.js", "build-js": "ui-bundler bundle target/scm-ui.bundle.js",
"build-vendor": "ui-bundler vendor target/vendor.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": "ui-bundler test",
"test-ci": "ui-bundler test --ci", "test-ci": "ui-bundler test --ci",
"flow": "flow", "flow": "flow",

4
scm-webapp/src/main/java/sonia/scm/WebResourceServlet.java
View File

@@ -30,10 +30,10 @@ public class WebResourceServlet extends HttpServlet {
/** /**
* exclude api requests and the old frontend servlets. * 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 @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); private static final Logger LOG = LoggerFactory.getLogger(WebResourceServlet.class);