Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 23:45:44 +01:00
Code Issues Packages Projects Releases Activity
8,904 Commits 32 Branches 207 Tags
7332f9dcb4f0e7bce521e59fac16b1919a365490
Commit Graph

265 Commits

Author SHA1 Message Date
Rene Pfeuffer
7332f9dcb4 Merge with default 2019-12-13 08:57:16 +01:00
Rene Pfeuffer
d0f8e4ccf2 Rename utility class 2019-12-05 17:43:21 +01:00
Rene Pfeuffer
6bf86fab8d Introduce abstraction layer for RESTeasy mock dispatcher 2019-11-25 17:04:58 +01:00
Rene Pfeuffer
75b43ef453 Merge with 2.0.0-m3 2019-11-25 14:35:47 +01:00
Sebastian Sdorra
9e9df35fdb upgrade resteasy, legman and hibernate-validator 
* resteasy from 3.6.2.Final to 4.4.1.Final
* legman from 1.5.1 to 1.6.0
* hibernate-validator from 5.3.6.Final to 6.1.0.Final
 2019-11-20 10:57:32 +01:00
Rene Pfeuffer
55b1d1331b Merge with 2.0.0-m3 2019-11-20 07:54:15 +01:00
Rene Pfeuffer
1d2888f8e6 Fix dequote error in "normal" lines 
Without this, quotes in normal lines were removed.
 2019-11-19 10:13:58 +01:00
Rene Pfeuffer
f960bbd0b9 Replace quotes in git command line, too 2019-11-18 12:51:16 +01:00
Rene Pfeuffer
cbee87fa0c Buffer output and do not create new temp array streams 2019-11-18 11:41:09 +01:00
Rene Pfeuffer
d8d7d993e3 Merge with 2.0.0-m3 2019-11-12 08:51:28 +01:00
Rene Pfeuffer
8ed874c103 Use dedicated exception for default branch deletion 2019-11-11 16:51:46 +01:00
Rene Pfeuffer
f7e42db850 Rename method 2019-11-11 16:50:39 +01:00
Rene Pfeuffer
8e4606cff1 Merge with 2.0.0-m3 2019-11-11 16:33:40 +01:00
Rene Pfeuffer
6b9aabd3ff Fix merge direction 2019-11-11 16:15:59 +01:00
Rene Pfeuffer
a1ec0b0636 Merge with 2.0.0-m3 2019-11-11 13:18:07 +01:00
Rene Pfeuffer
913e5289e6 Move conflict computation to merge command 
Therefore revert changes to diff command and introduce new
MergeConflictResult instead of streaming result.
 2019-11-11 13:06:07 +01:00
Eduard Heimbuch
7cd2cb4ccb implement deleteBranchCommand for git 2019-11-11 11:15:56 +01:00
Rene Pfeuffer
1695d13a98 Create new branches without clone of git repository 2019-11-11 10:30:11 +01:00
Rene Pfeuffer
52ccce1aaa Secure test 2019-11-08 15:43:51 +01:00
Eduard Heimbuch
b1216a898b remove mergeResource and move dryRun to review-plugin 2019-11-08 11:46:13 +01:00
Eduard Heimbuch
a41f490871 refactor after review 2019-11-08 08:36:00 +01:00
Rene Pfeuffer
758e4ab750 Use jgit client library for diff with conflict 2019-11-07 16:26:30 +01:00
Rene Pfeuffer
df144e298c Add POC for diff against temporary merge result 
This fails for files with merge conflicts, because results for these
files are not added to git and therefore there is no blob the diff
formatter can use to render. This has somehow to be fixed by making
jgit use the version from the file system. Taking a look at the
implementation of Git.clone() might help here.
 2019-11-06 17:30:02 +01:00
Eduard Heimbuch
cf90654e24 implement fast forward if possible 2019-11-06 15:26:20 +01:00
Eduard Heimbuch
7e00d22e9e merge 2.0.0-m3 2019-11-06 07:48:35 +01:00
Eduard Heimbuch
9df12bc35e check if mergeStrategy is supported for mergeCommand 2019-11-04 17:34:44 +01:00
Eduard Heimbuch
4b024c650c implement squash to mergeCommand 2019-11-04 15:16:37 +01:00
Sebastian Sdorra
e4c8783c61 return null if commit was not merged into requested branch 2019-11-04 11:46:27 +01:00
Eduard Heimbuch
4f17bc6b1c refactor backend for modifyCommand / add sourceExtension for plugins 2019-10-30 12:59:54 +01:00
Eduard Heimbuch
a3d5e9669e add test for gitLogCommand 2019-10-26 17:59:37 +02:00
Eduard Heimbuch
949a8fe4f1 merge 2.0.0-m3 2019-10-25 12:33:16 +02:00
Eduard Heimbuch
a938fd8682 enhance logcommand 2019-10-25 12:31:18 +02:00
Sebastian Sdorra
8a6f862d3d Merged in feature/lfs_over_ssh (pull request #336) 
Feature LFS over ssh
 2019-10-22 12:01:38 +00:00
Rene Pfeuffer
a93380b867 Differentiate types for central and cloned repository 2019-10-21 14:10:50 +02:00
Rene Pfeuffer
36d2723c50 Add unit test 2019-10-21 11:11:44 +02:00
Rene Pfeuffer
647464618a Fix time format 2019-10-21 10:24:53 +02:00
Rene Pfeuffer
2a501a9dbb Simplify test 2019-10-19 16:31:54 +02:00
Rene Pfeuffer
f9ecae129e Add unit test 2019-10-19 15:55:07 +02:00
Eduard Heimbuch
f90b8a987a merge 2.0.0 2019-10-17 08:34:23 +02:00
Rene Pfeuffer
4cb79ffe5a Detect proper merge and prevent empty commits 2019-10-16 14:59:38 +02:00
Eduard Heimbuch
668007e084 change unit test 2019-10-15 13:09:51 +02:00
Eduard Heimbuch
ef7d958ba1 fix / change unit test 2019-10-15 13:05:26 +02:00
Eduard Heimbuch
a3c5f97a23 merged 2019-10-11 11:22:24 +02:00
Rene Pfeuffer
a81049eea3 Register own git config 2019-10-09 10:57:58 +02:00
Rene Pfeuffer
7af882fe8e Insert some logging 2019-10-08 16:19:30 +02:00
Rene Pfeuffer
ffcb96820e Merge with 2.0.0-m3 2019-10-08 10:49:15 +02:00
Rene Pfeuffer
24e18b4414 Use no-op filter as default for lfs 2019-10-07 18:45:12 +02:00
René Pfeuffer
3dea971e10 Checkout target branch while cloning repository 
This will prevent the checkout of a wrong initial branch and therefore
safe some unnecessary io
 2019-10-06 16:29:50 +02:00
René Pfeuffer
9120d492ab LFS upload POC 2019-10-04 19:46:16 +02:00
Sebastian Sdorra
151049657a Merged in bugfix/postpone_writing_to_stream (pull request #322) 
Postpone writing to output stream in diff command
 2019-10-01 12:52:25 +00:00