diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md index 650ad8a0d..dda761cad 100644 --- a/app/docs/slate/source/includes/_pulls.md +++ b/app/docs/slate/source/includes/_pulls.md @@ -30,6 +30,8 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/1.json') --------- | ----------- | ----------- |-|-|-| |id |int|合并请求ID| +|title |string|合并请求标题| +|body| |string|合并请求内容| |head |int|合并请求源分支| |base |int|合并请求目标分支| |index |int|合并请求序号| @@ -505,6 +507,8 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls.json') |-|-|-| |total_count |int|合并请求总数| |id |int|合并请求ID| +|title |string|合并请求标题| +|body |string|合并请求内容| |head |int|合并请求源分支| |base |int|合并请求目标分支| |index |int|合并请求序号| @@ -939,6 +943,8 @@ await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/reviews.json') --------- | ----------- | ----------- |reviewer |object |审查者 | |pull_request.id |integer|合并请求ID| +|pull_request.title |string|合并请求标题| +|pull_request.body |string|合并请求内容| |pull_request.head |string|合并请求源分支| |pull_request.base |string|合并请求目标分支| |pull_request.is_original |string|合并请求是否从fork仓库所来| diff --git a/app/services/api/v1/projects/pulls/list_service.rb b/app/services/api/v1/projects/pulls/list_service.rb index 6b18da2ce..4a1d6a2f6 100644 --- a/app/services/api/v1/projects/pulls/list_service.rb +++ b/app/services/api/v1/projects/pulls/list_service.rb @@ -11,7 +11,7 @@ class Api::V1::Projects::Pulls::ListService < ApplicationService def initialize(project, params={}) @project = project @keyword = params[:keyword] - @status = params[:status].to_i + @status = params[:status].present? ? params[:status].to_i : nil @priority_id = params[:priority_id] @issue_tag_id = params[:issue_tag_id] @version_id = params[:version_id] diff --git a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder index 93cba2e47..d07180851 100644 --- a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder +++ b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder @@ -1,4 +1,4 @@ -json.(pull, :id, :head, :base, :is_original) +json.(pull, :id, :title, :body, :head, :base, :is_original) json.index pull.gitea_number json.status pull.status == 1 ? "merged" : (pull.status == 2 ? "closed" : "open") diff --git a/public/docs/api.html b/public/docs/api.html index 967ed2335..ce1fea111 100644 --- a/public/docs/api.html +++ b/public/docs/api.html @@ -12079,6 +12079,16 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json