The Unified and Autonomous Development Platform
Merge branch 'main' of https://code.onedev.io/onedev/server
Robin Shen2bcb68933bd2
diff --cc server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.javaindex 2d2617fd39,0bc27827d6..024042d8f0--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java@@@ -296,7 -296,7 +296,7 @@@ public class ProjectResourcecheckProjectCreationPermission(subject, project.getParent());if (project.getParent() != null && project.isSelfOrAncestorOf(project.getParent()))- throw new ExplicitException("Cannot use current or descendant project as parent");- throw new NotAcceptableException("Can not use current or descendant project as parent");++ throw new NotAcceptableException("Cannot use current or descendant project as parent");checkProjectNameDuplication(project);diff --cc server-eeindex f27607dc7d,eafe3009ee..76b63e3257--- a/server-ee+++ b/server-ee@@@ -1,1 -1,1 +1,1 @@@- Subproject commit f27607dc7d4a494f8a1be83b74145822405fdf7f-Subproject commit eafe3009ee15bc1fd0d7d0f34f9501092437530b++Subproject commit 76b63e3257854a8f6fe7da6dce1a1eb916001b09