Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

2022-09-07 11:13:00 +08:00 · 2022-09-07 11:13:00 +08:00 · 4a08c9be88
parent 200d5e0d69 a0413be4b9
commit 4a08c9be88
2 changed files with 7 additions and 0 deletions
--- a/app/forms/contents/create_form.rb
+++ b/app/forms/contents/create_form.rb
@ -3,6 +3,8 @@ class Contents::CreateForm < BaseForm

  validates :filepath, presence: true

+  validates :new_branch, length: { maximum: 100, too_long: "过长，仅支持%{count}的长度"}
+
  validate :check_branch

  def 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: 分支名称