Merge branch 'develop' into standalone_develop

app/services/api/v1/projects/webhooks/create_service.rb

@@ -8,7 +8,7 @@ class Api::V1::Projects::Webhooks::CreateService < ApplicationService
   validates :active, inclusion: {in: [true, false]}
   validates :http_method, inclusion: { in: %w(POST GET), message: "请输入正确的请求方式"}
   validates :content_type, inclusion: { in: %w(json form), message: "请输入正确的Content Type"} 
-  validates :type, inclusion: {in: %w(gitea slack discord dingtalk telegram msteams feishu matrix jianmu), message: "请输入正确的Webhook Type"}
+  validates :type, inclusion: {in: %w(gitea slack discord dingtalk telegram msteams feishu matrix jianmu softbot), message: "请输入正确的Webhook Type"}
   def initialize(project, params, token=nil)
     @project = project
     @owner = project&.owner.login