Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-09-09 01:39:15 +02:00
Code Issues Packages Projects Releases Activity
8,979 Commits 42 Branches 217 Tags
28f13199354824517aaed99811dfbb4db2cd47f8
Commit Graph

1629 Commits

Author SHA1 Message Date
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
0d6dcbd6bd Merge with default 2019-12-17 14:14:34 +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
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
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
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
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
Eduard Heimbuch
cf90654e24 implement fast forward if possible 2019-11-06 15:26:20 +01:00
Eduard Heimbuch
b4f1e8874a change mergeStrategy order 2019-11-06 09:54:17 +01:00
Eduard Heimbuch
7e00d22e9e merge 2.0.0-m3 2019-11-06 07:48:35 +01:00
Eduard Heimbuch
bc5948f823 add new MergeStrategies 2019-11-06 07:47:23 +01:00
Eduard Heimbuch
db46441adf move mergeResultDto + mapper to scm-core 2019-11-05 09:51:58 +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
Eduard Heimbuch
a938fd8682 enhance logcommand 2019-10-25 12:31:18 +02:00
Rene Pfeuffer
a909c07c95 Fix suppressions 2019-10-21 14:27:57 +02:00
Rene Pfeuffer
a93380b867 Differentiate types for central and cloned repository 2019-10-21 14:10:50 +02:00
Eduard Heimbuch
d9cf93b59a cleanup 2019-10-17 11:17:33 +02:00
Eduard Heimbuch
c6cbd68e98 create unit tests for ScmConfigChangedListener 2019-10-17 09:56:47 +02:00
Eduard Heimbuch
e91a3eac6a small fixes and cleanup after review 2019-10-17 09:33:54 +02:00
Eduard Heimbuch
f90b8a987a merge 2.0.0 2019-10-17 08:34:23 +02:00
Eduard Heimbuch
d69e93406c use static method to check if subject is anonymous 2019-10-14 16:21:14 +02:00
Eduard Heimbuch
b26f9068f4 move Anonymous Realm to webapp 2019-10-14 16:18:14 +02:00
Eduard Heimbuch
1d79ed86ea remove outdated unit test 2019-10-14 09:36:32 +02:00