diff --git a/app/controllers/api/v1/projects/develop_process_pull_requests_controller.rb b/app/controllers/api/v1/projects/develop_process_pull_requests_controller.rb index 7384fc190..69dcb73ed 100644 --- a/app/controllers/api/v1/projects/develop_process_pull_requests_controller.rb +++ b/app/controllers/api/v1/projects/develop_process_pull_requests_controller.rb @@ -2,7 +2,7 @@ class Api::V1::Projects::DevelopProcessPullRequestsController < Api::V1::BaseCon def index @pull_requests = PullRequest.includes(:project, project: :project_category) @pull_requests = @pull_requests.ransack(m: 'or', project_name_cont: params[:keyword], project_identifier_cont: params[:keyword]).result if params[:keyword].present? - @pull_requests = kaminari_paginate(@pull_requests) + @pull_requests = kaminari_paginate(@pull_requests.order(created_at: :desc)) end def count diff --git a/app/views/api/v1/projects/_detail.json.jbuilder b/app/views/api/v1/projects/_detail.json.jbuilder index 03219f822..8c21994cf 100644 --- a/app/views/api/v1/projects/_detail.json.jbuilder +++ b/app/views/api/v1/projects/_detail.json.jbuilder @@ -23,4 +23,11 @@ end json.topics project.project_topics.each do |topic| json.(topic, :id, :name) end -json.url project.full_url \ No newline at end of file +json.url project.full_url +if project.owner.present? + json.owner do + json.partial! "api/v1/users/simple_user", user: project.owner + end +else + json.nil! +end \ No newline at end of file