Browse Source

fix: pullrequest name

tags/v3.1.5
yystopf 4 years ago
parent
commit
4b8bb8a65f
2 changed files with 3 additions and 2 deletions
  1. +1
    -0
      app/controllers/projects/webhooks_controller.rb
  2. +2
    -2
      app/views/projects/webhooks/edit.json.jbuilder

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

@@ -80,6 +80,7 @@ class Projects::WebhooksController < Projects::BaseController
private
def find_webhook
@webhook = Gitea::Webhook.find_by_id(params[:id])
return render_not_found if @webhook.nil?
end

def webhook_params


+ 2
- 2
app/views/projects/webhooks/edit.json.jbuilder View File

@@ -5,7 +5,7 @@ json.create_time Time.at(@webhook.created_unix).strftime("%Y-%m-%d %H:%M:%S")
event = @webhook.events
json.branch_filter event["branch_filter"]
if event["send_everything"]
json.events event["events"].keys
json.events event["events"].keys.collect{|i| i == "pull_request" ? i + "_only" : i}
else
json.events event["events"].select{|k, v| v}.keys
json.events event["events"].select{|k, v| v}.keys.collect{|i| i == "pull_request" ? i + "_only" : i}
end

Loading…
Cancel
Save