Commit Graph

9309 Commits

Author SHA1 Message Date
René Pfeuffer
2d117648ba Add possibility to set jgit nfs related config
It may be necessary for users to configure jgit behaviour related to
file handling. This commit makes the following two configurations
available (among others):

- core.trustfolderstat
- core.supportsatomicfilecreation
2020-03-09 16:44:42 +01:00
Sebastian Sdorra
5879249bd5 fix wrong ignore rule for .pyc files 2020-03-09 14:26:48 +01:00
Eduard Heimbuch
6ad7ebeb18 update .gitignore // delete .hgignore 2020-03-09 11:17:16 +01:00
Eduard Heimbuch
2c18933951 update .gitignore 2020-03-09 11:12:21 +01:00
Sebastian Sdorra
2b6a961d9a migrate bitbucket wiki to docs folder 2020-03-09 08:01:43 +01:00
Sebastian Sdorra
d350177b3f migrate Jenkinsfile from mercurial to git 2020-03-09 08:01:36 +01:00
Sebastian Sdorra
abb6a41946 migrate from bitbucket to github 2020-03-09 08:01:36 +01:00
Sebastian Sdorra
8d2f117a6b update httpclient in order to fix security vulnerability 2020-03-04 13:27:47 +01:00
Sebastian Sdorra
7785ea2d68 Merged in bugfix/openapi_errors (pull request #417)
prevent using same classloader multiple times
2020-03-04 08:31:08 +00:00
Sebastian Sdorra
6fe273e821 Close branch bugfix/openapi_errors 2020-03-04 08:31:08 +00:00
Eduard Heimbuch
8b738f52c1 add schema for response headers 2020-03-04 08:46:33 +01:00
Sebastian Sdorra
cb22c4c2f5 merge with feature/update_jgit branch 2020-03-04 08:23:55 +01:00
Sebastian Sdorra
62dd29c4d7 close branch feature/update_jgit 2020-03-04 08:23:25 +01:00
Sebastian Sdorra
65918fc187 Merged in bugfix/remove_obsolete_repository_fields (pull request #416)
remove obsolete repository fields
2020-03-03 15:40:02 +00:00
Sebastian Sdorra
69eb9793a8 Close branch bugfix/remove_obsolete_repository_fields 2020-03-03 15:40:02 +00:00
Rene Pfeuffer
e0b02ea1a3 Use api to set system config for lfs
Could be so simple if this works :-)
2020-03-03 16:13:17 +01:00
Sebastian Sdorra
1160702ede merge with default branch 2020-03-03 16:00:30 +01:00
Sebastian Sdorra
4dd3e5e7d2 merge with branch bugfix/fix_broken_unit_test_timing 2020-03-03 16:00:06 +01:00
Sebastian Sdorra
5368f17893 close branch bugfix/fix_broken_unit_test_timing 2020-03-03 15:59:40 +01:00
Sebastian Sdorra
f6368360c7 try to fix flappy unit tests, by using awaitility instead of Thread.sleep 2020-03-03 15:15:17 +01:00
Eduard Heimbuch
5897863f7e fix several openapi errors 2020-03-03 14:49:35 +01:00
Sebastian Sdorra
d72f119725 merge with default branch 2020-03-03 14:03:38 +01:00
Sebastian Sdorra
a4f15f1e87 merge with default branch 2020-03-03 12:02:57 +01:00
Sebastian Sdorra
e30dabcda6 merge repository heads 2020-03-03 12:01:06 +01:00
Sebastian Sdorra
2ba65f48c9 merge with feature/build_in_docker_with_hg 2020-03-03 12:00:18 +01:00
Sebastian Sdorra
7fe58f042e close branch feature/build_in_docker_with_hg 2020-03-03 11:59:40 +01:00
Sebastian Sdorra
f8c3476655 install git to fix scm-ui build on ci server 2020-03-03 11:59:02 +01:00
Sebastian Sdorra
be66f57c49 fix missing image for maven execution 2020-03-03 11:16:12 +01:00
Sebastian Sdorra
21bb9351d2 use jdk 11 in docker for ci build 2020-03-03 11:13:11 +01:00
Sebastian Sdorra
aa8388cbb3 update maven to 3.6.3 2020-03-03 11:12:49 +01:00
Rene Pfeuffer
32fe2affd0 Merged in feature/update_svnkit (pull request #408)
Update svnkit to version 1.10.1-scm1
2020-03-03 09:51:58 +00:00
Rene Pfeuffer
3c5c5eef16 Close branch feature/update_svnkit 2020-03-03 09:51:58 +00:00
Eduard Heimbuch
04d480684a prevent using same classloader multiple times 2020-03-03 10:39:07 +01:00
Rene Pfeuffer
775b478b54 Merge with default 2020-03-03 09:46:54 +01:00
Rene Pfeuffer
80bfc37d0f Merge with default 2020-03-03 09:35:01 +01:00
Rene Pfeuffer
34b570fddf Fix unit test
It looks like the system config is cached somehow from jgit 5.4.3 on,
so that putting the config in a file that is deleted after the first
test invalidates this config, which leads to the effect, that for the
test that runs second the filter is not applied.
2020-03-03 09:30:24 +01:00
Eduard Heimbuch
e3099c16a2 update CHANGELOG.md 2020-03-02 11:32:01 +01:00
Eduard Heimbuch
8618a27ec8 remove obsolete properties from user and group 2020-03-02 11:26:15 +01:00
Eduard Heimbuch
b6208240ab remove obsolete repository fields 2020-03-02 11:18:57 +01:00
Eduard Heimbuch
e8074e7f7e Merged in bugfix/keep_file_attributes (pull request #414)
Keep file attributes on modification
2020-02-28 12:18:37 +00:00
Eduard Heimbuch
af3c1c52e8 Close branch bugfix/keep_file_attributes 2020-02-28 12:18:37 +00:00
Eduard Heimbuch
aa05b8ede1 update openapi.md 2020-02-28 08:13:58 +01:00
Rene Pfeuffer
9b7d5daae3 Use simple executable check from old java io 2020-02-27 13:13:09 +01:00
Rene Pfeuffer
9c75ff95c8 Keep file attributes on modification 2020-02-27 11:42:37 +01:00
Rene Pfeuffer
ba2b6e41e1 Log change 2020-02-27 10:38:47 +01:00
Eduard Heimbuch
2a16ec1b65 Merged in bugfix/merge_failures_without_conflicts (pull request #413)
Handle unexpected merge results
2020-02-27 09:35:43 +00:00
Eduard Heimbuch
d36063be24 Close branch bugfix/merge_failures_without_conflicts 2020-02-27 09:35:43 +00:00
Eduard Heimbuch
fbededbcaa cleanup test 2020-02-27 10:34:48 +01:00
Rene Pfeuffer
33037385e4 Handle unexpected merge results
It is possible that a git work tree is dirty directly after the clone
of a repository, eg. when files are not changed correctly due to bogous
.gitattribute files (though this is just a guess). In these cases a
merge might fail due to these dirty files and not due to merge
conflicts. Without this change such results lead to null pointer
exceptions, because result.getConflicts() is null.
2020-02-27 09:56:25 +01:00
Rene Pfeuffer
eb81bf4005 Enable tests for mercurial
Therefore disable build in docker and use native worker.
2020-02-27 08:36:47 +01:00