Merge branch 'pre_trustie_server' into trustie_server

2022-09-07 11:15:52 +08:00 · 2022-09-07 11:15:52 +08:00 · 9a19046e96
parent e71a3f6864 1ade73f21a
commit 9a19046e96
4 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: 分支名称
--- a/public/images/logo.png
+++ b/public/images/logo.png
--- a/public/images/logo_x2.png
+++ b/public/images/logo_x2.png