Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-31 03:39:14 +01:00
Code Issues Packages Projects Releases Activity
9,000 Commits 40 Branches 210 Tags
8bdd4cf3191c545119cd475c560fbcd10fd83e89
Commit Graph

1643 Commits

Author SHA1 Message Date
Rene Pfeuffer
d6b60afeac Merge with default 2020-01-08 11:22:47 +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
83cc1c4a6f return revision on merge 2019-12-18 13:17:30 +01:00
Rene Pfeuffer
edcc036f62 Make reverse channel transient 2019-12-18 12:48:11 +01:00
Rene Pfeuffer
a5dc2828ad Remove unused function 2019-12-18 12:11:57 +01:00
Rene Pfeuffer
42d8d844c0 Remove unused functions 2019-12-18 11:52:08 +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
6b93099048 Merge with default 2019-12-17 14:16:00 +01:00
Rene Pfeuffer
0d6dcbd6bd Merge with default 2019-12-17 14:14:34 +01:00
Rene Pfeuffer
7332f9dcb4 Merge with default 2019-12-13 08:57:16 +01:00
Rene Pfeuffer
4fd2a0dd23 Small API changes 2019-12-12 16:13:36 +01:00
Rene Pfeuffer
8df43e7b4e Let background computations abort for browse command 2019-12-12 11:47:03 +01:00
Rene Pfeuffer
8129f2fad0 Add 'partial' flag to files 2019-12-11 14:41:42 +01:00
Rene Pfeuffer
a37df2c20b Fix test helper 2019-12-11 12:58:01 +01:00
Rene Pfeuffer
9a8f0a4ee7 Use interfaces for executor classes 2019-12-11 12:42:21 +01:00
Sebastian Sdorra
dd3b02bbff added subscription api to apiClient 2019-12-11 10:11:40 +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
Sebastian Sdorra
33833994d3 merge with default branch 2019-12-05 16:14:44 +01:00
Sebastian Sdorra
854e42a609 merge with default branch 2019-11-27 15:01:09 +01:00
Rene Pfeuffer
55b1d1331b Merge with 2.0.0-m3 2019-11-20 07:54:15 +01:00
Rene Pfeuffer
f12c3920c0 Merge with 2.0.0-m3 2019-11-18 13:15:54 +01:00
Rene Pfeuffer
ff1abf2c1c Add conflict type 2019-11-14 15:07:49 +01:00
Sebastian Sdorra
42ab81cf50 implement ui client session id 
This changeset introduces a client side session id, which is generated
once by the client (ui: apiClient) and is send with each request to server.
The server makes the session id available by the PrincipalCollection of the
subject.
 2019-11-13 14:03:48 +01:00
Rene Pfeuffer
47da287178 Merge with 2.0.0-m3 2019-11-13 13:06:39 +01:00
Rene Pfeuffer
d1747557b3 Make conflict exception accessible with complex context 2019-11-13 10:48:36 +01:00
Eduard Heimbuch
234d98aee7 Don't use anonymous access after access token expires 2019-11-12 13:49:37 +01:00
Rene Pfeuffer
d8d7d993e3 Merge with 2.0.0-m3 2019-11-12 08:51:28 +01:00
Rene Pfeuffer
f0f134daeb Merged in feature/delete_source_branch (pull request #350) 
Feature/delete source branch
 2019-11-12 07:50:07 +00: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
cc7ef47153 Fix access across jars 2019-11-11 16:15:45 +01:00
Rene Pfeuffer
3be74fbed6 Add api call for conflicts 2019-11-11 14:01:03 +01:00
Rene Pfeuffer
a1ec0b0636 Merge with 2.0.0-m3 2019-11-11 13:18:07 +01:00
Rene Pfeuffer
0f0e7437fd Revert changes to diff command components 2019-11-11 13:08:40 +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
c2e30a582f Remove unused mapper 2019-11-08 16:44:04 +01:00
Rene Pfeuffer
ae32b6f797 Use dedicated exception for unsupported merge strategies 2019-11-08 15:44:37 +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
Eduard Heimbuch
ec6b4493c8 use strategy pattern for mergeStrategies 2019-11-07 11:50:28 +01:00
Eduard Heimbuch
de09097203 cleanup 2019-11-07 08:14:15 +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