services/convert: Convert a Repository's ObjectFormatName too
When converting a `repo_model.Repository` to `api.Repository`, copy the `ObjectFormatName` field too. Fixes #3458. Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu> (cherry picked from commit 2385f3c9db9c116d213dfeb722522f4e2a47a52d)
This commit is contained in:
parent
9cd8cd4874
commit
9860af7f39
2 changed files with 12 additions and 0 deletions
|
@ -232,6 +232,7 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, permissionInR
|
||||||
MirrorInterval: mirrorInterval,
|
MirrorInterval: mirrorInterval,
|
||||||
MirrorUpdated: mirrorUpdated,
|
MirrorUpdated: mirrorUpdated,
|
||||||
RepoTransfer: transfer,
|
RepoTransfer: transfer,
|
||||||
|
ObjectFormatName: repo.ObjectFormatName,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -701,3 +701,14 @@ func TestAPIRepoGetAssignees(t *testing.T) {
|
||||||
DecodeJSON(t, resp, &assignees)
|
DecodeJSON(t, resp, &assignees)
|
||||||
assert.Len(t, assignees, 1)
|
assert.Len(t, assignees, 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestAPIViewRepoObjectFormat(t *testing.T) {
|
||||||
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
|
var repo api.Repository
|
||||||
|
|
||||||
|
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1")
|
||||||
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
|
DecodeJSON(t, resp, &repo)
|
||||||
|
assert.EqualValues(t, "sha1", repo.ObjectFormatName)
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue