Skip to content

Commit 1b6e855

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix only text/* being viewable in web UI (go-gitea#34374) add maintainer tobiasbp (go-gitea#34372) [skip ci] Updated translations via Crowdin Use lfs label for lfs file rather than a long description (go-gitea#34363) Fix bug when API get pull changed files for deleted head repository (go-gitea#34333) Fix bug when visiting comparation page (go-gitea#34334) Fix LFS files being editable in web UI (go-gitea#34356) Bump `@github/relative-time-element` to v4.4.6 (go-gitea#34352) Fix repo search input height (go-gitea#34330) feat: return time of last usage for public keys and access tokens in the api (go-gitea#34323) fix: do not return archive download URLs in API if downloads are disabled (go-gitea#34324)
2 parents ed34981 + 12bf0b8 commit 1b6e855

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+170
-71
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,4 @@ Rowan Bohde <[email protected]> (@bohde)
6464
hiifong <[email protected]> (@hiifong)
6565
metiftikci <[email protected]> (@metiftikci)
6666
Christopher Homberger <[email protected]> (@ChristopherHX)
67+
Tobias Balle-Petersen <[email protected]> (@tobiasbp)

modules/structs/repo_tag.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ type Tag struct {
1111
Message string `json:"message"`
1212
ID string `json:"id"`
1313
Commit *CommitMeta `json:"commit"`
14-
ZipballURL string `json:"zipball_url"`
15-
TarballURL string `json:"tarball_url"`
14+
ZipballURL string `json:"zipball_url,omitempty"`
15+
TarballURL string `json:"tarball_url,omitempty"`
1616
}
1717

1818
// AnnotatedTag represents an annotated tag

modules/structs/user_app.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ import (
1111
// AccessToken represents an API access token.
1212
// swagger:response AccessToken
1313
type AccessToken struct {
14-
ID int64 `json:"id"`
15-
Name string `json:"name"`
16-
Token string `json:"sha1"`
17-
TokenLastEight string `json:"token_last_eight"`
18-
Scopes []string `json:"scopes"`
14+
ID int64 `json:"id"`
15+
Name string `json:"name"`
16+
Token string `json:"sha1"`
17+
TokenLastEight string `json:"token_last_eight"`
18+
Scopes []string `json:"scopes"`
19+
Created time.Time `json:"created_at"`
20+
Updated time.Time `json:"last_used_at"`
1921
}
2022

2123
// AccessTokenList represents a list of API access token.

modules/structs/user_key.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ type PublicKey struct {
1616
Fingerprint string `json:"fingerprint,omitempty"`
1717
// swagger:strfmt date-time
1818
Created time.Time `json:"created_at,omitempty"`
19+
Updated time.Time `json:"last_used_at,omitempty"`
1920
Owner *User `json:"user,omitempty"`
2021
ReadOnly bool `json:"read_only,omitempty"`
2122
KeyType string `json:"key_type,omitempty"`

options/locale/locale_cs-CZ.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1285,7 +1285,6 @@ file_copy_permalink=Kopírovat trvalý odkaz
12851285
view_git_blame=Zobrazit Git Blame
12861286
video_not_supported_in_browser=Váš prohlížeč nepodporuje značku pro HTML5 video.
12871287
audio_not_supported_in_browser=Váš prohlížeč nepodporuje značku pro HTML5 audio.
1288-
stored_lfs=Uloženo pomocí Git LFS
12891288
symbolic_link=Symbolický odkaz
12901289
executable_file=Spustitelný soubor
12911290
vendored=Vendorováno

options/locale/locale_de-DE.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,6 @@ file_copy_permalink=Permalink kopieren
12861286
view_git_blame=Git Blame ansehen
12871287
video_not_supported_in_browser=Dein Browser unterstützt das HTML5 'video'-Tag nicht.
12881288
audio_not_supported_in_browser=Dein Browser unterstützt den HTML5 'audio'-Tag nicht.
1289-
stored_lfs=Gespeichert mit Git LFS
12901289
symbolic_link=Softlink
12911290
executable_file=Ausführbare Datei
12921291
vendored=Vendor

options/locale/locale_el-GR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,6 @@ file_copy_permalink=Αντιγραφή Permalink
11481148
view_git_blame=Προβολή Git Blame
11491149
video_not_supported_in_browser=Το πρόγραμμα περιήγησής σας δεν υποστηρίζει την ετικέτα HTML5 'video'.
11501150
audio_not_supported_in_browser=Το πρόγραμμα περιήγησής σας δεν υποστηρίζει την ετικέτα HTML5 'audio'.
1151-
stored_lfs=Αποθηκεύτηκε με το Git LFS
11521151
symbolic_link=Symbolic link
11531152
executable_file=Εκτελέσιμο Αρχείο
11541153
commit_graph=Γράφημα Υποβολών

options/locale/locale_en-US.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,6 @@ file_copy_permalink = Copy Permalink
13051305
view_git_blame = View Git Blame
13061306
video_not_supported_in_browser = Your browser does not support the HTML5 'video' tag.
13071307
audio_not_supported_in_browser = Your browser does not support the HTML5 'audio' tag.
1308-
stored_lfs = Stored with Git LFS
13091308
symbolic_link = Symbolic link
13101309
executable_file = Executable File
13111310
vendored = Vendored

options/locale/locale_es-ES.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,6 @@ file_copy_permalink=Copiar Permalink
11381138
view_git_blame=Ver la culpa de Git
11391139
video_not_supported_in_browser=Su navegador no soporta el tag video de HTML5.
11401140
audio_not_supported_in_browser=Su navegador no soporta el tag audio de HTML5.
1141-
stored_lfs=Almacenados con Git LFS
11421141
symbolic_link=Enlace simbólico
11431142
executable_file=Archivo Ejecutable
11441143
commit_graph=Gráfico de commits

options/locale/locale_fa-IR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,6 @@ file_too_large=حجم این پرونده بیشتر از آن است که قا
900900
file_copy_permalink=پرمالینک را کپی کنید
901901
video_not_supported_in_browser=مرورگر شما از تگ video که در HTML5 تعریف شده است، پشتیبانی نمی کند.
902902
audio_not_supported_in_browser=مرورگر شما از تگ audio که در HTML5 تعریف شده است، پشتیبانی نمی کند.
903-
stored_lfs=ذخیره شده با GIT LFS
904903
symbolic_link=پیوند نمادین
905904
commit_graph=نمودار کامیت
906905
commit_graph.select=انتخاب برنچها

0 commit comments

Comments
 (0)