mirror of
https://github.com/go-gitea/gitea
synced 2025-08-25 02:48:27 +00:00
Upgrade xorm to v1.2.2 (#16663) & Add test to ensure that dumping of login sources remains correct (#16847) (#16848)
* Upgrade xorm to v1.2.2 (#16663) Backport #16663 Fix #16683 * Add test to ensure that dumping of login sources remains correct (#16847) #16831 has occurred because of a missed regression. This PR adds a simple test to try to prevent this occuring again. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
28
vendor/xorm.io/xorm/internal/json/gojson.go
generated
vendored
Normal file
28
vendor/xorm.io/xorm/internal/json/gojson.go
generated
vendored
Normal file
@@ -0,0 +1,28 @@
|
||||
// Copyright 2021 The Xorm Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
// +build gojson
|
||||
|
||||
package json
|
||||
|
||||
import (
|
||||
gojson "github.com/goccy/go-json"
|
||||
)
|
||||
|
||||
func init() {
|
||||
DefaultJSONHandler = GOjson{}
|
||||
}
|
||||
|
||||
// GOjson implements JSONInterface via gojson
|
||||
type GOjson struct{}
|
||||
|
||||
// Marshal implements JSONInterface
|
||||
func (GOjson) Marshal(v interface{}) ([]byte, error) {
|
||||
return gojson.Marshal(v)
|
||||
}
|
||||
|
||||
// Unmarshal implements JSONInterface
|
||||
func (GOjson) Unmarshal(data []byte, v interface{}) error {
|
||||
return gojson.Unmarshal(data, v)
|
||||
}
|
Reference in New Issue
Block a user