512 Commits

Author	SHA1	Message	Date
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	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
Sebastian Sdorra	e4c8783c61	return null if commit was not merged into requested branch	2019-11-04 11:46:27 +01:00
Eduard Heimbuch	531259bec0	check if request branch contains revision	2019-10-28 11:45:42 +01:00
Eduard Heimbuch	949a8fe4f1	merge 2.0.0-m3	2019-10-25 12:33:16 +02:00
Eduard Heimbuch	a938fd8682	enhance logcommand	2019-10-25 12:31:18 +02:00
Eduard Heimbuch	5c7bd90f7a	return changesetId for git & hg	2019-10-24 11:57:16 +02:00
Eduard Heimbuch	fb0eb329e5	return branch for git & hg for correct redirect	2019-10-24 09:11:17 +02:00
Sebastian Sdorra	8a6f862d3d	Merged in feature/lfs_over_ssh (pull request #336) ... Feature LFS over ssh	2019-10-22 12:01:38 +00:00
Sebastian Sdorra	52f471b5dd	fix lfs authentication via ssh command and enabled xsrf protection	2019-10-22 10:50:49 +02:00
Sebastian Sdorra	e885d130be	add push permissions to read access token ... This is required because the read access token is used to obtain the write access token.	2019-10-22 10:13:46 +02:00
Rene Pfeuffer	a93380b867	Differentiate types for central and cloned repository	2019-10-21 14:10:50 +02:00
Rene Pfeuffer	5185a68eeb	Formatter is not thread safe	2019-10-21 13:10:48 +02:00
Rene Pfeuffer	36d2723c50	Add unit test	2019-10-21 11:11:44 +02:00
Rene Pfeuffer	287ee9efe1	Simplify stream	2019-10-21 10:40:16 +02:00
Rene Pfeuffer	647464618a	Fix time format	2019-10-21 10:24:53 +02:00
Rene Pfeuffer	f9ecae129e	Add unit test	2019-10-19 15:55:07 +02:00
Rene Pfeuffer	9f6674cce4	Add permission checks	2019-10-19 13:54:27 +02:00
Rene Pfeuffer	2a998060f4	Cleanup	2019-10-19 13:50:49 +02:00
Rene Pfeuffer	c067ce1a5c	Extract token generation	2019-10-19 13:47:59 +02:00
Rene Pfeuffer	d43080a3ea	Extract common functionality	2019-10-19 13:24:58 +02:00
Rene Pfeuffer	a2c42060e5	POC	2019-10-18 16:17:22 +02:00
Rene Pfeuffer	162a1d9e05	POC	2019-10-18 13:33:53 +02:00
Rene Pfeuffer	6cdb81d263	POC	2019-10-18 10:22:45 +02:00
Rene Pfeuffer	9f48875d57	POC	2019-10-17 09:23:37 +02:00
Eduard Heimbuch	f90b8a987a	merge 2.0.0	2019-10-17 08:34:23 +02:00
Rene Pfeuffer	4cb79ffe5a	Detect proper merge and prevent empty commits	2019-10-16 14:59:38 +02:00
Eduard Heimbuch	bf32f53c2d	do merge commit also without diffs between branches	2019-10-15 10:16:26 +02:00
Eduard Heimbuch	a3c5f97a23	merged	2019-10-11 11:22:24 +02:00
Rene Pfeuffer	38f0ed3bbd	Use constant from jgit	2019-10-09 13:56:44 +02:00
Rene Pfeuffer	5eab6f5af4	Fix sonar issues	2019-10-09 11:47:56 +02:00
Rene Pfeuffer	c5bbfa8af9	Merge with 2.0.0-m3	2019-10-09 11:46:17 +02:00
Rene Pfeuffer	369ad9e788	Reduce log levels	2019-10-09 11:27:54 +02:00
Rene Pfeuffer	a81049eea3	Register own git config	2019-10-09 10:57:58 +02:00
Rene Pfeuffer	7af882fe8e	Insert some logging	2019-10-08 16:19:30 +02:00
Rene Pfeuffer	76c7821ed2	Reduce code redundancy	2019-10-08 11:58:13 +02:00
Rene Pfeuffer	ffcb96820e	Merge with 2.0.0-m3	2019-10-08 10:49:15 +02:00
Rene Pfeuffer	24e18b4414	Use no-op filter as default for lfs	2019-10-07 18:45:12 +02:00
Rene Pfeuffer	a1da5eaddb	Simplify	2019-10-07 18:25:31 +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
René Pfeuffer	9120d492ab	LFS upload POC	2019-10-04 19:46:16 +02:00
Rene Pfeuffer	a9559f5fad	Merge with 2.0.0-m3	2019-10-02 11:48:37 +02:00
Eduard Heimbuch	6417ab57e8	remove unnecessary handler from HgModifyCommand / move NoChangesMadeException to scm-core	2019-10-02 10:43:35 +02:00
Sebastian Sdorra	a632350d32	added message to NoCommonHistoryException	2019-10-02 07:43:17 +02:00
Sebastian Sdorra	34177be6f7	merge with 2.0.0-m3	2019-10-01 17:09:53 +02:00
Sebastian Sdorra	151049657a	Merged in bugfix/postpone_writing_to_stream (pull request #322) ... Postpone writing to output stream in diff command	2019-10-01 12:52:25 +00:00