Merge branch 'develop' into feature/merge_detection

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -5,9 +5,13 @@ 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
+
 ### Added
 - Introduced merge detection for receive hooks ([#1278](https://github.com/scm-manager/scm-manager/pull/1278))
 
+### Fixed
+- Repository names may not end with ".git" ([#1277](https://github.com/scm-manager/scm-manager/pull/1277))
+
 ## [2.3.1] - 2020-08-04
 ### Added
 - New api to resolve SCM-Manager root url ([#1276](https://github.com/scm-manager/scm-manager/pull/1276))

docs/en/administration/logging.md

@@ -25,7 +25,7 @@ The location of the file depends also on the type of installation.
 
 | Type of Installation | Path |
 |----------------------|---------|
-| Docker | /opt/scm-server/conf/logging.xml |
+| Docker | /etc/scm/logging.xml |
 | RPM | /etc/scm/logging.xml |
 | DEB | /etc/scm/logging.xml |
 | Unix | $EXTRACT_PATH/scm-server/conf/logging.xml |

scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.test.ts

@@ -37,7 +37,7 @@ describe("repository name validation", () => {
   });
 
   it("should allow same names as the backend", () => {
-    const validPaths = ["scm", "s", "sc", ".hiddenrepo", "b.", "...", "..c", "d..", "a..c"];
+    const validPaths = ["scm", "scm.gitz", "s", "sc", ".hiddenrepo", "b.", "...", "..c", "d..", "a..c"];
 
     validPaths.forEach(path => expect(validator.isNameValid(path)).toBe(true));
   });
@@ -91,7 +91,8 @@ describe("repository name validation", () => {
       "a/..b",
       "scm/main",
       "scm/plugins/git-plugin",
-      "scm/plugins/git-plugin"
+      "scm/plugins/git-plugin",
+      "scm.git"
     ];
 
     invalidPaths.forEach(path => expect(validator.isNameValid(path)).toBe(false));

scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.ts

@@ -24,7 +24,7 @@
 
 import { validation } from "@scm-manager/ui-components";
 
-const nameRegex = /(?!^\.\.$)(?!^\.$)(?!.*[\\\[\]])^[A-Za-z0-9\.][A-Za-z0-9\.\-_]*$/;
+const nameRegex = /(?!^\.\.$)(?!^\.$)(?!.*[.]git$)(?!.*[\\\[\]])^[A-Za-z0-9\.][A-Za-z0-9\.\-_]*$/;
 
 export const isNameValid = (name: string) => {
   return nameRegex.test(name);