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
10,868 Commits 32 Branches 207 Tags
a169e64e0911f2b82c6aa92ba4c566630b479a2c
Commit Graph

1108 Commits

Author SHA1 Message Date
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
Konstantin Schaper
30aa592d73 Merge branch 'develop' into feature/create_gpg_signatures 
# Conflicts:
#	CHANGELOG.md
#	yarn.lock
 2020-08-07 15:13:29 +02:00
René Pfeuffer
a3a26c057e Cleanup 2020-08-07 10:53:08 +02:00
René Pfeuffer
2433c50d64 Add test for "real" merge commits 2020-08-07 08:01:13 +02:00
René Pfeuffer
6f20781812 Add first integration tests for merge detection 2020-08-06 17:12:14 +02:00
René Pfeuffer
072d8f15c9 Detect merges where branch has been deleted, too 2020-08-06 07:58:22 +02:00
René Pfeuffer
ac983d6067 Remove redundant code 2020-08-05 18:43:08 +02:00
René Pfeuffer
6bfefb3348 Introduce merge detection for receive hooks 
Here we add a merge detection provider for pre and post receive hooks
and implement this new provider for git.
 2020-08-05 17:57:50 +02:00
Konstantin Schaper
7072761ba1 implementation and unit tests 2020-08-05 13:02:02 +02:00
René Pfeuffer
592282eb0f Fix versions 2020-08-04 17:34:33 +02:00
CES Marvin
7352bdf55b prepare for next development iteration 2020-08-04 14:29:12 +00:00
CES Marvin
0394f8fd96 release version 2.3.1 2020-08-04 13:57:22 +00:00
René Pfeuffer
b3076f1997 Merge pull request #1276 from scm-manager/bugfix/protocol_url_outofscope 
Avoid stacktrace logging when protocol url is accessed outside of request scope
 2020-08-04 10:41:32 +02:00
René Pfeuffer
4499076180 Fix versions 2020-08-04 08:18:19 +02:00
Konstantin Schaper
08a025ba81 wip 2020-08-03 16:09:37 +02:00
Sebastian Sdorra
030ef30ffb uses parent constructor with RootURL 2020-08-03 14:01:44 +02:00
Eduard Heimbuch
b22ead23de show signature key on changeset 2020-07-29 15:43:14 +02:00
Eduard Heimbuch
ebb6a1fdb8 Merge branch 'develop' into feature/verify_gpg_signatures 2020-07-28 12:36:15 +02:00
CES Marvin
17da0b9a8a prepare for next development iteration 2020-07-23 12:17:00 +00:00
CES Marvin
efda158d76 release version 2.3.0 2020-07-23 11:43:35 +00:00
Eduard Heimbuch
5e10f6b730 Invalidate branches cache synchronously on create new branch 2020-07-22 10:20:37 +02:00
Sebastian Sdorra
64da676348 revisit gpg api and use it with from git plugin 2020-07-22 08:22:04 +02:00
Sebastian Sdorra
7cb349242c introduces GitChangesetConverterFactory 
This change introduces a GitChangesetConverterFactory to allow injections for the GitChangesetConverter.
 2020-07-21 07:34:14 +02:00