Merge branch 'pre_trustie_server' into trustie_server

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

config/locales/forms/create_file_form.zh-CN.yml

@@ -0,0 +1,5 @@
+'zh-CN':
+  activemodel:
+    attributes:
+      contents/create_form:
+        new_branch: 分支名称