Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-12-23 16:59:48 +01:00
Code Issues Packages Projects Releases Activity
12,891 Commits 34 Branches 209 Tags
75695f9fb116cdc6f8052dec83832a3f207e901b
Commit Graph

2229 Commits

Author SHA1 Message Date
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
Sebastian Sdorra
e2e74e73af Remove unused imports 2020-08-07 14:18:30 +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
Sebastian Sdorra
633bfe7657 Merge pull request #1259 from scm-manager/feature/init_svn_repo_with_trunk 
init svn repositories with README.md in trunk folder
 2020-07-22 15:04:03 +02:00
Eduard Heimbuch
b1660f5ec7 init svn repositories with README.md in trunk folder 2020-07-22 14:00:52 +02: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
Sebastian Sdorra
6e27051ed9 use child injector pattern for git commands 
We are using a Google Guice child injector to reduce the amount of injection dependencies for the GitRepositoryServiceResolver and the GitRepositoryServiceProvider.
 2020-07-20 16:18:00 +02:00
Eduard Heimbuch
b182f5b2d0 add key value entry inputfield component 2020-07-09 10:05:27 +02:00
René Pfeuffer
775784a10b Fix new version 2020-07-08 09:48:59 +02:00
CES Marvin
4279573633 prepare for next development iteration 2020-07-03 10:04:14 +00:00
CES Marvin
fcc4fd0960 release version 2.2.0 2020-07-03 09:33:30 +00:00
Sebastian Sdorra
3f857fec04 rename UnixAutoConfigurator to PosixAutoConfigurator and make it match for linux systems 2020-07-02 07:02:51 +02:00
Sebastian Sdorra
2bb865bf5c fixes python module path detection 2020-07-01 15:28:37 +02:00
Sebastian Sdorra
17d31b80e0 implemented a new auto configuration mechanism for mercurial on unix 
This new mechanism is more robust and should find python and python3 installations
 2020-07-01 15:01:14 +02:00
Sebastian Sdorra
4061cc6b73 added python 3 support to fielview hg extension 2020-07-01 11:10:39 +02:00
Sebastian Sdorra
4acedc1a8d merge with develop branch 2020-06-30 16:46:15 +02:00
Sebastian Sdorra
0720878a19 make scmhooks compatible between python 2 and 3 2020-06-30 16:40:34 +02:00
Sebastian Sdorra
3a4896091b make scmhooks compatible with python 2 and 3 2020-06-30 16:40:01 +02:00
René Pfeuffer
528432c2be Fix versions 2020-06-30 07:48:36 +02:00
Sebastian Sdorra
fe2111559a fixed hg clone on python 3 2020-06-29 16:13:05 +02:00
Sebastian Sdorra
f301d174d3 remove old python scripts which are not used in v2 2020-06-29 15:25:00 +02:00
Sebastian Sdorra
813b8db3ca update javahg to version 0.15-scm1 2020-06-29 15:15:03 +02:00
CES Marvin
c5f2502e6f prepare for next development iteration 2020-06-23 16:22:47 +00:00
CES Marvin
e5c7b4eda4 release version 2.1.1 2020-06-23 15:34:23 +00:00