Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-04 16:08:34 +02:00
Code Issues Packages Projects Releases Activity
8,674 Commits 42 Branches 217 Tags
d1747557b3d9df972c392d4fe45e32b8d7e86bf8
Commit Graph

8674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rene Pfeuffer
d1747557b3 Make conflict exception accessible with complex context 2019-11-13 10:48:36 +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
875b33d5c8 Close branch feature/delete_source_branch 2019-11-12 07:50:07 +00:00
Eduard Heimbuch
cc03af197f Merged in bugfix/merge_with_conflict (pull request #348) 
Remove unused mapper
 2019-11-12 07:48:20 +00:00
Eduard Heimbuch
b14fb1d852 Close branch bugfix/merge_with_conflict 2019-11-12 07:48:20 +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
8e4606cff1 Merge with 2.0.0-m3 2019-11-11 16:33:40 +01:00
Sebastian Sdorra
0168234534 Merged in feature/create_branch_without_clone (pull request #349) 
Create new branches without clone of git repository
 2019-11-11 15:08:27 +00:00
Sebastian Sdorra
6a2bf9d32a Close branch feature/create_branch_without_clone 2019-11-11 15:08:27 +00: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
c2e30a582f Remove unused mapper 2019-11-08 16:44:04 +01:00
Rene Pfeuffer
73cdab4ddc Merged in feature/merge_with_squash (pull request #347) 
Feature/merge with squash
 2019-11-08 15:41:45 +00:00
Rene Pfeuffer
520c0d6ecf Close branch feature/merge_with_squash 2019-11-08 15:41:45 +00: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
313ec7fe5d fix dependencies after removing mergeResource 2019-11-08 13:10:31 +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
Sebastian Sdorra
c51118f575 Merged in feature/remove_redundant_logging (pull request #346) 
Remove redundant logging
 2019-11-06 08:06:26 +00:00
Sebastian Sdorra
2826273719 Close branch feature/remove_redundant_logging 2019-11-06 08:06:26 +00:00
Rene Pfeuffer
b47cc56a86 Remove redundant logging 2019-11-06 08:32:00 +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
Sebastian Sdorra
4e053b1aa0 Merged in feature/modify_for_svn (pull request #342) 
Feature/modify for svn
 2019-11-05 13:30:25 +00:00
Sebastian Sdorra
c18c64c15a Close branch feature/modify_for_svn 2019-11-05 13:30:25 +00: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
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
d5bd83fafb fix encoding and decoding for branches including slashes 2019-11-01 13:52:53 +01:00
Eduard Heimbuch
557856185a small fix 2019-11-01 10:18:13 +01:00
Eduard Heimbuch
d7d7c87d16 Merged in feature/fix_sonar_and_lifecycle (pull request #345) 
Feature/fix sonar and lifecycle
 2019-11-01 09:13:35 +00:00
Eduard Heimbuch
b9fd0b3011 Close branch feature/fix_sonar_and_lifecycle 2019-11-01 09:13:35 +00:00
Eduard Heimbuch
33cce15e33 fix navLink Highlighting for sourceext 2019-11-01 09:40:20 +01:00
Eduard Heimbuch
5a9cbbc073 use i18n for missing extension warning / fix encoding for branches containing slashes 2019-11-01 09:29:57 +01:00
Sebastian Sdorra
c9defc7595 added missing tests for language select of DateFromNow 2019-10-30 15:46:03 +01:00
Sebastian Sdorra
55efed92f9 fix DateFromNow i18n without provided locales 2019-10-30 15:29:49 +01:00