Skip to content

The Unified and Autonomous Development Platform

chore: Improve default commit message when edit files from UI

Robin Shen08d552a741f5
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index ca610c6165..b464474d67 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -90,8 +90,9 @@ public class CommitOptionPanel extends Panel {
else
oldName = oldPath;
+ String commitMessage;
if (newContentProvider == null) {
- return "Delete " + oldName;
+ commitMessage = "Delete " + oldName;
} else {
String newPath = context.getNewPath();
@@ -103,16 +104,18 @@ public class CommitOptionPanel extends Panel {
if (oldPath == null) {
if (newName != null)
- return "Add " + newName;
+ commitMessage = "Add " + newName;
else
- return "Add new file";
+ commitMessage = "Add new file";
} else if (oldPath.equals(newPath)) {
- return "Edit " + oldName;
+ commitMessage = "Edit " + oldName;
} else {
- return "Rename " + oldName;
+ commitMessage = "Rename " + oldName;
}
}
-
+ if (context.getProject().getBranchProtection(context.getBlobIdent().revision, SecurityUtils.getUser()).isEnforceConventionalCommits())
+ commitMessage = "chore: " + commitMessage;
+ return commitMessage;
}
private GitService getGitService() {