Browse Source

Merge branch 'pre_trustie_server' into trustie_server

pull/312/head
“xxq250” 3 years ago
parent
commit
de9b3bc511
2 changed files with 2 additions and 1 deletions
  1. +1
    -0
      app/controllers/api/v1/projects/webhooks_controller.rb
  2. +1
    -1
      app/controllers/projects/webhooks_controller.rb

+ 1
- 0
app/controllers/api/v1/projects/webhooks_controller.rb View File

@@ -10,6 +10,7 @@ class Api::V1::Projects::WebhooksController < Api::V1::BaseController
end

def create
return render_error("webhooks数量已到上限!请删除暂不使用的webhooks以进行添加操作") if @project.webhooks.size > 49
@result_object = Api::V1::Projects::Webhooks::CreateService.call(@project, create_webhook_params, current_user&.gitea_token)
end



+ 1
- 1
app/controllers/projects/webhooks_controller.rb View File

@@ -9,7 +9,7 @@ class Projects::WebhooksController < Projects::BaseController

def create
ActiveRecord::Base.transaction do
return render_error("webhooks数量已到上限!请删除暂不使用的webhooks以进行添加操作") if @project.webhooks.size > 19
return render_error("webhooks数量已到上限!请删除暂不使用的webhooks以进行添加操作") if @project.webhooks.size > 49
return render_error("参数错误.") unless webhook_params.present?
form = Projects::Webhooks::CreateForm.new(webhook_params)
return render json: {status: -1, message: form.errors} unless form.validate!


Loading…
Cancel
Save