1612 Commits

Author	SHA1	Message	Date
Eduard Heimbuch	83cc1c4a6f	return revision on merge	2019-12-18 13:17:30 +01:00
Eduard Heimbuch	dc6d9cc5eb	return revision on merge	2019-12-18 11:03:07 +01:00
Sebastian Sdorra	dd3b02bbff	added subscription api to apiClient	2019-12-11 10:11:40 +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
Eduard Heimbuch	8d416c6c67	create ScmConfigurationChangedListener to create _anonymous user	2019-10-14 09:32:48 +02:00
Rene Pfeuffer	c465a48ece	Set new plugin center url	2019-10-11 15:23:18 +02:00
Eduard Heimbuch	a3c5f97a23	merged	2019-10-11 11:22:24 +02:00
Eduard Heimbuch	1162b353db	remove logout link when authenticated as _anonymous user	2019-10-10 14:05:34 +02:00
Eduard Heimbuch	18cb7020d0	implement anonymous realm // use constant for _anonymous user	2019-10-10 13:40:40 +02:00
Eduard Heimbuch	344ad696b2	do not add _anonymous to group _authenticated / use AnonymousToken for anonymous access in authenticationFilter	2019-10-09 16:41:55 +02:00
Rene Pfeuffer	76c7821ed2	Reduce code redundancy	2019-10-08 11:58:13 +02:00
Eduard Heimbuch	cb6f1bfa22	remove unused move-method from ModifyCommand / create interface for CommandRequests with Author	2019-10-07 14:59:46 +02:00
Eduard Heimbuch	34169fb21c	merged	2019-10-07 10:48:07 +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
Rene Pfeuffer	a9559f5fad	Merge with 2.0.0-m3	2019-10-02 11:48:37 +02:00
Eduard Heimbuch	d1f7362ab1	set author from subject if not available in request for MergeCommandBuilder and ModifyCommandBuilder	2019-10-02 11:34:42 +02:00
Eduard Heimbuch	6417ab57e8	remove unnecessary handler from HgModifyCommand / move NoChangesMadeException to scm-core	2019-10-02 10:43:35 +02:00
Rene Pfeuffer	458d2fb4ee	Make AvailablePlugin immutable	2019-10-02 10:05:07 +02:00
Sebastian Sdorra	8174019931	merge with 2.0.0-m3	2019-10-02 07:47:44 +02:00
Sebastian Sdorra	a632350d32	added message to NoCommonHistoryException	2019-10-02 07:43:17 +02:00
Rene Pfeuffer	d5a1423e87	Merged in feature/abort_plugin_installation (pull request #326) ... Feature/abort plugin installation	2019-10-02 05:04:10 +00:00