Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-06 21:45:43 +01:00
Code Issues Packages Projects Releases Activity
11,595 Commits 32 Branches 207 Tags
38a7ff6acb1e68500d0498759adb076fb653c7ef
Commit Graph

1196 Commits

Author SHA1 Message Date
Rene Pfeuffer
d1db083e9a Use namespace and name in logging 2020-01-08 10:14:43 +01:00
Rene Pfeuffer
88fb31c47b Add unit test for diff command 
This new tests ensures, that changes on a feature branch will be shown
in a diff even though the integration branch has been merged into the
feature branch.
 2020-01-07 15:49:35 +01:00
Rene Pfeuffer
148095ad4c Add revisions of merged branches before merge 2019-12-19 10:30:02 +01:00
Rene Pfeuffer
f7c4894fb2 Let merges without effect throw an exception 2019-12-19 09:47:31 +01:00
Rene Pfeuffer
1d3e51ce7b Use static create methods instead of ambiguous constructor 2019-12-19 09:27:18 +01:00
Rene Pfeuffer
fefd8b6de8 Merge with default 2019-12-19 08:46:45 +01:00
Eduard Heimbuch
39b4c59d82 add unit tests 2019-12-19 08:25:28 +01:00
Eduard Heimbuch
c5f7393116 rename helper class 2019-12-18 14:38:09 +01:00
Eduard Heimbuch
3ea788c3e3 fix unit test 2019-12-18 14:33:50 +01:00
Eduard Heimbuch
83cc1c4a6f return revision on merge 2019-12-18 13:17:30 +01:00
Rene Pfeuffer
cf9d1edb70 Make partial file attributes explicit. 2019-12-18 11:48:17 +01:00
Eduard Heimbuch
dc6d9cc5eb return revision on merge 2019-12-18 11:03:07 +01:00
Rene Pfeuffer
0d6dcbd6bd Merge with default 2019-12-17 14:14:34 +01:00
Rene Pfeuffer
5e47ef0323 Compute LFS attributes on top commit 
In the previous version, the LFS attributes were read for the latest
commit of the file. This is not the way, a git client handles LFS files.
Therefore we switch to the way, the native git client works and read the
attributes from the commit of the command.
 2019-12-13 14:41:36 +01:00
Sebastian Sdorra
8410e7e679 Log duration of commit message calculation and do not synchronize over all instances 2019-12-13 13:52:08 +01:00
Rene Pfeuffer
7332f9dcb4 Merge with default 2019-12-13 08:57:16 +01:00
Rene Pfeuffer
c8a115a373 Mark files aborted recursively 2019-12-13 08:20:26 +01:00
Rene Pfeuffer
ee0972ef34 synchronize cache updates 2019-12-12 17:31:55 +01:00
Rene Pfeuffer
1beaf9d53a Cleanup 2019-12-12 17:03:37 +01:00
Rene Pfeuffer
211aa15399 Make tasks explicit 2019-12-12 16:29:42 +01:00
Rene Pfeuffer
8df43e7b4e Let background computations abort for browse command 2019-12-12 11:47:03 +01:00
Florian Scholdei
aa4f3d4eaf Merge with default 2019-12-11 15:43:17 +01:00
Florian Scholdei
59974b4aad Move more buttons to the right 2019-12-11 15:40:37 +01:00
Rene Pfeuffer
8129f2fad0 Add 'partial' flag to files 2019-12-11 14:41:42 +01:00
Rene Pfeuffer
9caf6c0984 Update cache after each file 2019-12-11 14:01:17 +01:00
Rene Pfeuffer
093c0abb02 Add unit test for asynchronous browse 2019-12-11 13:32:05 +01:00
Rene Pfeuffer
ce15b116bd Introduce SyncAsyncExecutor 2019-12-11 10:10:56 +01:00
René Pfeuffer
8d0249b708 Make timeout configurable 2019-12-10 18:22:40 +01:00
René Pfeuffer
6f4074c21c Update browser result after computation 2019-12-10 18:10:11 +01:00
Rene Pfeuffer
87904e3da8 Stop fetching commits when this takes too long 
This is a first step to create results in big repositories. Next step
should be querying the commit messages in the background and update
cached results for further requests.
 2019-12-10 15:56:56 +01:00
Rene Pfeuffer
f85ae4f7f1 Guard against empty commit 2019-12-10 15:03:05 +01:00
Rene Pfeuffer
d0f8e4ccf2 Rename utility class 2019-12-05 17:43:21 +01:00
Rene Pfeuffer
e363f057b2 Merge with bugfix/classloader_leak 2019-12-05 17:04:27 +01:00
Rene Pfeuffer
11391f2f64 Merge with default 2019-12-05 10:53:33 +01:00
Rene Pfeuffer
516bbe6f26 Prepare for next development iteration 2019-12-02 15:15:34 +01:00
Rene Pfeuffer
2d08ba4adc Release version 2.0.0-rc1 2019-12-02 12:52:33 +01:00
Florian Scholdei
53c5f67550 Make Git Protocol Switch Button smaller 2019-11-27 16:48:11 +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
b35d407d96 Merge with 2.0.0-m3 2019-11-18 10:34:12 +01:00
Rene Pfeuffer
2f5095e76a Handle missing blobs in blob store for lfs pointers 2019-11-15 09:33:38 +01:00
Rene Pfeuffer
ecec0764f8 Invert merge to get proper file diff 2019-11-15 09:31:08 +01:00
Rene Pfeuffer
ff1abf2c1c Add conflict type 2019-11-14 15:07:49 +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