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

1473 Commits

Author SHA1 Message Date
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
d7de7c2f36 merge with 2.0.0-m3 2019-11-28 11:30:05 +01:00
Florian Scholdei
53c5f67550 Make Git Protocol Switch Button smaller 2019-11-27 16:48:11 +01:00
Sebastian Sdorra
854e42a609 merge with default branch 2019-11-27 15:01:09 +01:00
Rene Pfeuffer
1d2888f8e6 Fix dequote error in "normal" lines 
Without this, quotes in normal lines were removed.
 2019-11-19 10:13:58 +01:00
Rene Pfeuffer
f960bbd0b9 Replace quotes in git command line, too 2019-11-18 12:51:16 +01:00
Rene Pfeuffer
cbee87fa0c Buffer output and do not create new temp array streams 2019-11-18 11:41:09 +01:00
Rene Pfeuffer
b35d407d96 Merge with 2.0.0-m3 2019-11-18 10:34:12 +01:00
Rene Pfeuffer
cc4c4f0822 Fix browse of empty repository 
In an empty hg repository the Changeset c is null. This leads to an
NullPointerException in the original code. So we check whether we have
a Changeset and otherwise use the old functionality.
 2019-11-15 09:50:28 +01:00
Rene Pfeuffer
2f5095e76a Handle missing blobs in blob store for lfs pointers 2019-11-15 09:33:38 +01: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
8e4606cff1 Merge with 2.0.0-m3 2019-11-11 16:33:40 +01:00
Eduard Heimbuch
73efd244ab add BranchCommand to git + hg repositoryServiceProvider 2019-11-11 11:53:28 +01:00
Eduard Heimbuch
782b201e55 cleanup 2019-11-11 11:21:51 +01:00
Eduard Heimbuch
39d41a56c5 implement deleteBranchCommand for hg 2019-11-11 11:16:33 +01:00
Eduard Heimbuch
7cd2cb4ccb implement deleteBranchCommand for git 2019-11-11 11:15:56 +01:00
Rene Pfeuffer
1695d13a98 Create new branches without clone of git repository 2019-11-11 10:30:11 +01:00
Rene Pfeuffer
ae32b6f797 Use dedicated exception for unsupported merge strategies 2019-11-08 15:44:37 +01:00
Rene Pfeuffer
52ccce1aaa Secure test 2019-11-08 15:43:51 +01:00
Rene Pfeuffer
8e0026962d Fix typo 2019-11-08 14:10:27 +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
e736ae6c50 cleanup 2019-11-07 13:42:45 +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
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
a532426958 refactor SvnModifyCommand to be more readable 2019-11-04 12:16:22 +01:00
Sebastian Sdorra
3aea20370a fixed returning null for getScmRepository from SimpleSvnWorkDirFactory 2019-11-04 12:03:19 +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
4f17bc6b1c refactor backend for modifyCommand / add sourceExtension for plugins 2019-10-30 12:59:54 +01:00
Eduard Heimbuch
7fd3d08540 add requestedRevision to BrowseCommandResult 2019-10-29 13:04:29 +01:00
Eduard Heimbuch
a13d129eff add Test / HgBrowseCommand shouldResolveBranchForRevision 2019-10-29 10:49:38 +01:00
Eduard Heimbuch
730646f4a8 hgBrowseCommand resolves Branches as Revision for BrowseResult 2019-10-29 10:40:10 +01:00
Eduard Heimbuch
531259bec0 check if request branch contains revision 2019-10-28 11:45:42 +01:00
Eduard Heimbuch
7190259813 cleanup 2019-10-26 19:29:17 +02:00
Eduard Heimbuch
a3d5e9669e add test for gitLogCommand 2019-10-26 17:59:37 +02: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
Florian Scholdei
6b21f609f4 Migrate react-i18next translate components in scm-plugins 2019-10-23 16:09:28 +02:00
Eduard Heimbuch
1d7d854ea8 implement svnModifyCommand 2019-10-23 14:42:19 +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