diff --git a/CHANGELOG.md b/CHANGELOG.md index 85bd3e6ae9..cd845f009c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## Unreleased + +### Fixed +- Modification for mercurial repositories with enabled XSRF protection + +## 2.0.0-rc4 - 2020-02-14 ### Added - Support for Java versions > 8 - Simple ClassLoaderLifeCycle to fix integration tests on Java > 8 @@ -18,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Upgrade smp-maven-plugin to version 1.0.0-rc3 ### Fixed -- Modification for mercurial repositories with enabled XSRF protection +- Committer of new Git commits set to "SCM-Manager " ## 2.0.0-rc3 - 2020-01-31 ### Fixed diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java index 24f900dfc2..7ebe517e4a 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java @@ -243,6 +243,7 @@ class AbstractGitCommand if (!status.isClean() || isInMerge()) { return of(clone.commit() .setAuthor(authorToUse.getName(), authorToUse.getMail()) + .setCommitter("SCM-Manager", "noreply@scm-manager.org") .setMessage(message) .call()); } else {