Merge branch 'develop' into standalone_develop

2022-09-06 14:58:02 +08:00 · 2022-09-06 14:58:02 +08:00 · a0413be4b9
parent ce432d9ad3 a438ab6f3e
commit a0413be4b9
2 changed files with 6 additions and 1 deletions
--- a/app/forms/contents/create_form.rb
+++ b/app/forms/contents/create_form.rb
@ -3,7 +3,7 @@ class Contents::CreateForm < BaseForm

  validates :filepath, presence: true

-  validates :new_branch, length: { maximum: 50, too_long: "分支名称过长，仅支持%{count}的长度"}
+  validates :new_branch, length: { maximum: 100, too_long: "过长，仅支持%{count}的长度"}

  validate :check_branch

--- a/config/locales/forms/create_file_form.zh-CN.yml
+++ b/config/locales/forms/create_file_form.zh-CN.yml
@ -0,0 +1,5 @@
+'zh-CN':
+  activemodel:
+    attributes:
+      contents/create_form:
+        new_branch: 分支名称