Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-16 18:26:16 +01:00
Code Issues Packages Projects Releases Activity
10,448 Commits 32 Branches 207 Tags
2433c50d64a1e2fd7130d7eb1eb1b405b9788e4d
Commit Graph

2017 Commits

Author SHA1 Message Date
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
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
Sebastian Sdorra
854e42a609 merge with default branch 2019-11-27 15:01:09 +01:00
Rene Pfeuffer
75b43ef453 Merge with 2.0.0-m3 2019-11-25 14:35:47 +01:00
Rene Pfeuffer
1cd7983723 Merge with 2.0.0-m3 2019-11-21 07:39:28 +01:00
Rene Pfeuffer
4f43bce90e Reduce visibility of misleading install function 
This install function might be mistaken to really install this plugin,
whereas it only sets its internal status and does not really do smth.
 2019-11-20 11:14:58 +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
Eduard Heimbuch
e7cb674bb5 fix anonymous email 2019-11-19 14:27:14 +01:00
Eduard Heimbuch
e432d6d210 refactor 2019-11-19 14:23:05 +01:00
Eduard Heimbuch
2ec98c2763 remove repository public flag 2019-11-19 14:04:47 +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
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