Order commit comments in API chronologically
When fetching commit comments via API, the comments were not ordered, but just returned in the order Postgresql finds them. Now the API always returns comments in chronological order.
This commit is contained in:
parent
6c32abc5f7
commit
55f91f3d43
3 changed files with 4 additions and 2 deletions
|
@ -48,6 +48,7 @@ v 7.11.0 (unreleased)
|
|||
- Add footnotes support to Markdown (Guillaume Delbergue)
|
||||
- Add current_sign_in_at to UserFull REST api.
|
||||
- Make Sidekiq MemoryKiller shutdown signal configurable
|
||||
- Order commit comments chronologically in API.
|
||||
|
||||
v 7.10.2
|
||||
- Fix CI links on MR page
|
||||
|
|
|
@ -62,7 +62,7 @@ module API
|
|||
sha = params[:sha]
|
||||
commit = user_project.commit(sha)
|
||||
not_found! 'Commit' unless commit
|
||||
notes = Note.where(commit_id: commit.id)
|
||||
notes = Note.where(commit_id: commit.id).order(:created_at)
|
||||
present paginate(notes), with: Entities::CommitNote
|
||||
end
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@ describe API::API, api: true do
|
|||
let!(:master) { create(:project_member, user: user, project: project, access_level: ProjectMember::MASTER) }
|
||||
let!(:guest) { create(:project_member, user: user2, project: project, access_level: ProjectMember::GUEST) }
|
||||
let!(:note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'a comment on a commit') }
|
||||
let!(:another_note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'another comment on a commit') }
|
||||
|
||||
before { project.team << [user, :reporter] }
|
||||
|
||||
|
@ -89,7 +90,7 @@ describe API::API, api: true do
|
|||
get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user)
|
||||
expect(response.status).to eq(200)
|
||||
expect(json_response).to be_an Array
|
||||
expect(json_response.length).to eq(1)
|
||||
expect(json_response.length).to eq(2)
|
||||
expect(json_response.first['note']).to eq('a comment on a commit')
|
||||
expect(json_response.first['author']['id']).to eq(user.id)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue