luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-19 23:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Display ui time with customize time location (#7792)

Browse source 
* display ui time with customize time location

* fix lint

* rename UILocation to DefaultUILocation

* move time related functions to modules/timeutil

* fix tests

* fix tests

* fix build

* fix swagger
This commit is contained in:
Lunny Xiao 2019-08-15 22:46:21 +08:00 • committed by GitHub
parent 5a44be627c
commit 85202d4784
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
77 changed files with 770 additions and 662 deletions
Download patch file Download diff file Expand all files Collapse all files

6
models/gpg_key_test.go
View file

@ -8,7 +8,7 @@ import (
"testing"
"time"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/timeutil"
"github.com/stretchr/testify/assert"
)
@ -112,7 +112,7 @@ MkM/fdpyc2hY7Dl/+qFmN5MG5yGmMpQcX+RNNR222ibNC1D3wg==
key := &GPGKey{
KeyID: pubkey.KeyIdString(),
Content: content,
CreatedUnix: util.TimeStamp(pubkey.CreationTime.Unix()),
CreatedUnix: timeutil.TimeStamp(pubkey.CreationTime.Unix()),
CanSign: pubkey.CanSign(),
CanEncryptComms: pubkey.PubKeyAlgo.CanEncrypt(),
CanEncryptStorage: pubkey.PubKeyAlgo.CanEncrypt(),
@ -122,7 +122,7 @@ MkM/fdpyc2hY7Dl/+qFmN5MG5yGmMpQcX+RNNR222ibNC1D3wg==
cannotsignkey := &GPGKey{
KeyID: pubkey.KeyIdString(),
Content: content,
CreatedUnix: util.TimeStamp(pubkey.CreationTime.Unix()),
CreatedUnix: timeutil.TimeStamp(pubkey.CreationTime.Unix()),
CanSign: false,
CanEncryptComms: false,
CanEncryptStorage: false,