Skip to content

Commit d32d021

Browse files
committed
Fix blank lines
1 parent 0e961e9 commit d32d021

File tree

5 files changed

+3
-7
lines changed

5 files changed

+3
-7
lines changed

integrations/repo_commits_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) {
8686
}
8787

8888
func testRepoCommitsWithStatus(t *testing.T, resp, respOne *httptest.ResponseRecorder, state string) {
89-
9089
var statuses []*api.CommitStatus
9190
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), &statuses))
9291
var status api.CombinedStatus

integrations/testlogger.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ func NewTestLogger() log.LoggerProvider {
158158
// Init inits connection writer with json config.
159159
// json config only need key "level".
160160
func (log *TestLogger) Init(config string) error {
161-
162161
err := json.Unmarshal([]byte(config), log)
163162
if err != nil {
164163
return err

models/migrations/testlogger_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ func NewTestLogger() log.LoggerProvider {
158158
// Init inits connection writer with json config.
159159
// json config only need key "level".
160160
func (log *TestLogger) Init(config string) error {
161-
162161
err := json.Unmarshal([]byte(config), log)
163162
if err != nil {
164163
return err

models/task.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ func FinishMigrateTask(task *Task) error {
242242
conf.AuthPasswordEncrypted = ""
243243
conf.AuthTokenEncrypted = ""
244244
conf.CloneAddrEncrypted = ""
245-
246245
confBytes, err := json.Marshal(conf)
247246
if err != nil {
248247
return err

modules/lfs/http_client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ package lfs
77
import (
88
"bytes"
99
"context"
10+
"encoding/json"
1011
"errors"
1112
"fmt"
1213
"net/http"
1314
"net/url"
1415
"strings"
1516

1617
"code.gitea.io/gitea/modules/log"
17-
jsoniter "github.com/json-iterator/go"
1818
)
1919

2020
const batchSize = 20
@@ -68,7 +68,7 @@ func (c *HTTPClient) batch(ctx context.Context, operation string, objects []Poin
6868
request := &BatchRequest{operation, c.transferNames(), nil, objects}
6969

7070
payload := new(bytes.Buffer)
71-
err := jsoniter.NewEncoder(payload).Encode(request)
71+
err := json.NewEncoder(payload).Encode(request)
7272
if err != nil {
7373
log.Error("Error encoding json: %v", err)
7474
return nil, err
@@ -101,7 +101,7 @@ func (c *HTTPClient) batch(ctx context.Context, operation string, objects []Poin
101101
}
102102

103103
var response BatchResponse
104-
err = jsoniter.NewDecoder(res.Body).Decode(&response)
104+
err = json.NewDecoder(res.Body).Decode(&response)
105105
if err != nil {
106106
log.Error("Error decoding json: %v", err)
107107
return nil, err

0 commit comments

Comments
 (0)