Merge branch 'maser/gitlab-ce-order-commit-comments-in-api' into 'master'
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. Same as !628 but with CI See merge request !768
This commit is contained in:
commit
b7d20f14c6
3 changed files with 4 additions and 2 deletions
|
@ -139,6 +139,7 @@ v 7.10.4
|
|||
- Fix DB error when trying to tag a repository (Stan Hu)
|
||||
- Fix Error 500 when searching Wiki pages (Stan Hu)
|
||||
- Unescape branch names in compare commit (Stan Hu)
|
||||
- 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