Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-01 11:05:56 +01:00
Code Issues Packages Projects Releases Activity
11,168 Commits 32 Branches 207 Tags
c4735e70976be2d3ddd352676d27a6c96e91a9d2
Commit Graph

1130 Commits

Author SHA1 Message Date
René Pfeuffer
c4735e7097 Show configured branch in case of error with competing modifications 2020-10-30 14:12:56 +01:00
Florian Scholdei
196ea227d2 Add new default branch option with 'main' as default 2020-10-30 14:12:56 +01:00
CES Marvin
520db79a38 prepare for next development iteration 2020-10-27 08:35:13 +00:00
CES Marvin
1db75f4cf3 release version 2.8.0 2020-10-27 08:00:25 +00:00
CES Marvin
bb9f1adc52 prepare for next development iteration 2020-10-14 12:38:13 +00:00
CES Marvin
eb126a5bbe release version 2.7.1 2020-10-14 12:03:24 +00:00
René Pfeuffer
c5f8d975a3 Remove unnecessary null check 
The function RevWalk#parseAny indeed never returns null. This check only
was there to satisfy the (therefore wrong) unit test.
 2020-10-12 19:02:28 +02:00
CES Marvin
befd50eeef prepare for next development iteration 2020-10-12 13:26:08 +00:00
CES Marvin
abe8413802 release version 2.7.0 2020-10-12 12:41:15 +00:00
Eduard Heimbuch
3d8dc0ed05 Revert "Fix sonar issue" 
This reverts commit 0b0df4ed
 2020-10-12 14:24:11 +02:00
René Pfeuffer
0b0df4ed5f Fix sonar issue 2020-10-12 08:28:39 +02:00
René Pfeuffer
18412d67a3 Merge branch 'bugfix/git_browse_recursive' into develop 2020-10-08 09:30:25 +02:00
René Pfeuffer
805f0894fb Fix sonar finding 2020-10-08 09:24:59 +02:00
René Pfeuffer
e8506ff14d Fix recursive iteration 
Due to the api of TreeWalk we have no real change to iterate this
recursively, so we get back to good old loops.
 2020-10-08 09:24:56 +02:00
CES Marvin
bc7d4ed9f6 prepare for next development iteration 2020-09-30 08:15:47 +00:00
CES Marvin
5887c5c268 release version 2.6.1 2020-09-30 07:32:54 +00:00
CES Marvin
4e7d62ce2f prepare for next development iteration 2020-09-25 10:05:04 +00:00
CES Marvin
e2f8566a8b release version 2.6.0 2020-09-25 09:25:13 +00:00
Eduard Heimbuch
a39abcdbe9 enhance mergeCommandBuilder API with setMessage to avoid templating commit messages 2020-09-25 10:30:45 +02:00
Eduard Heimbuch
f0db57faed update CHANGELOG.md 2020-09-25 10:05:33 +02:00
Eduard Heimbuch
f5060f9d16 fix message templating 2020-09-25 09:46:52 +02:00
René Pfeuffer
cd9da7e658 Determine correct revision for tags in hooks 
The former code only resolved the object id of the tags, when those were
annotated tags (for "simple" tags the code worked fine). Now we even can
handle nested tags (tags that reference other tags).
 2020-09-24 08:28:52 +02:00
Eduard Heimbuch
1cad9c3fbc Merge branch 'develop' into feature/rebase 2020-09-21 14:01:34 +02:00
Konstantin Schaper
48419aa656 Merge pull request #1331 from scm-manager/feature/tag_overview 
Feature/tag overview
 2020-09-18 11:16:55 +02:00
Eduard Heimbuch
b2a204dda0 fix review findings 2020-09-18 10:12:56 +02:00
Konstantin Schaper
3e96d89480 implement requested review changes 2020-09-18 08:47:04 +02:00
Sebastian Sdorra
ec19291393 Fire missing BranchCreatedEvent for mercurial 
The event is now fired in the builder instead of command implementation
 2020-09-17 11:03:13 +02:00
Konstantin Schaper
2d024fe210 update head of scm-git-spi-test.zip back to master 2020-09-17 09:15:53 +02:00
Eduard Heimbuch
909f5ebec9 add instructions to checkout tags 2020-09-16 14:11:27 +02:00
Konstantin Schaper
b30a97948e implement git rebase 2020-09-15 15:48:22 +02:00
CES Marvin
93f240e087 prepare for next development iteration 2020-09-11 06:21:29 +00:00
CES Marvin
fab108c3b7 release version 2.5.0 2020-09-11 05:46:15 +00:00
René Pfeuffer
a4bd251f90 Accept git change type 'copy', too 
This one was not expected to exist, though praxis proves otherwise.
So we simply accept this one here, too.
 2020-09-10 08:21:15 +02:00
René Pfeuffer
2cfd3faf34 Set version to 2.5.0-SNAPSHOT globally 2020-09-03 07:56:01 +02:00
Sebastian Sdorra
d12572f765 Merge branch 'develop' into feature/tag-dates 2020-09-02 10:43:08 +02:00
CES Marvin
a66ae32b61 prepare for next development iteration 2020-09-01 14:26:34 +00:00
CES Marvin
6913f642a1 release version 2.4.1 2020-09-01 13:52:15 +00:00
René Pfeuffer
96d16fe4cc "Unpeel" annotated tags to get correct changeset 
If we just parse the object id of the reference for annotated tags, we
get the annotated tag object and not the reference the tag refers to.
 2020-08-27 11:15:13 +02:00
René Pfeuffer
565ec3ff3c Cleanup 2020-08-27 10:48:54 +02:00
Konstantin Schaper
15fac8ba2c remove ref usage and directly use objectId 2020-08-26 15:06:00 +02:00
Konstantin Schaper
ecfc70eb77 wip refactoring 2020-08-26 10:01:51 +02:00
Konstantin Schaper
36231d077a cleanup and update tests 2020-08-25 18:08:31 +02:00
Konstantin Schaper
6d409c65c0 initial implementation 2020-08-25 14:45:48 +02:00
CES Marvin
c7309d8962 prepare for next development iteration 2020-08-14 08:51:55 +00:00
CES Marvin
81bfddd141 release version 2.4.0 2020-08-14 08:15:36 +00:00
Konstantin Schaper
5a5289f381 fix merge issues 2020-08-11 15:04:52 +02:00
Konstantin Schaper
8576b66559 Merge branch 'develop' into feature/create_gpg_signatures 
# Conflicts:
#	CHANGELOG.md
#	scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitHookContextProvider.java
#	scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
#	scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
 2020-08-11 13:33:21 +02:00
Konstantin Schaper
0601770262 resolve review findings 2020-08-11 13:28:16 +02:00
Sebastian Sdorra
e7535903f7 Fix unit test on platforms which are not using UTF-8 as default 2020-08-10 09:22:29 +02:00
Sebastian Sdorra
3ea55c3422 Fix small SonarQube findings 2020-08-10 08:53:49 +02:00