Skip to content

Commit d29bc96

Browse files
committed
Merge branch 'main' into fix/button-alignments
2 parents a02370b + 0376c09 commit d29bc96

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

modules/structs/user_app.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ type AccessToken struct {
2323
type AccessTokenList []*AccessToken
2424

2525
// CreateAccessTokenOption options when create access token
26+
// swagger:model CreateAccessTokenOption
2627
type CreateAccessTokenOption struct {
2728
// required: true
28-
Name string `json:"name" binding:"Required"`
29+
Name string `json:"name" binding:"Required"`
30+
// example: ["all", "read:activitypub","read:issue", "write:misc", "read:notification", "read:organization", "read:package", "read:repository", "read:user"]
2931
Scopes []string `json:"scopes"`
3032
}
3133

options/locale/locale_ga-IE.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1879,6 +1879,7 @@ pulls.add_prefix=Cuir réimír <strong>%s</strong> leis
18791879
pulls.remove_prefix=Bain an réimír <strong>%s</strong>
18801880
pulls.data_broken=Tá an t-iarratas tarraingthe seo briste mar gheall ar fhaisnéis forc a bheith in easnamh.
18811881
pulls.files_conflicted=Tá athruithe ag an iarratas tarraingthe seo atá contrártha leis an spriocbhrainse.
1882+
pulls.is_checking=Ag seiceáil le haghaidh coinbhleachtaí cumaisc ...
18821883
pulls.is_ancestor=Tá an brainse seo san áireamh cheana féin sa spriocbhrainse. Níl aon rud le cumasc.
18831884
pulls.is_empty=Tá na hathruithe ar an mbrainse seo ar an spriocbhrainse cheana féin. Is tiomantas folamh é seo.
18841885
pulls.required_status_check_failed=Níor éirigh le roinnt seiceálacha riachtanacha.
@@ -3842,6 +3843,8 @@ deleted.display_name=Tionscadal scriosta
38423843
type-1.display_name=Tionscadal Aonair
38433844
type-2.display_name=Tionscadal Stórais
38443845
type-3.display_name=Tionscadal Eagrúcháin
3846+
enter_fullscreen=Lánscáileán
3847+
exit_fullscreen=Scoir Lánscáileáin
38453848

38463849
[git.filemode]
38473850
changed_filemode=%[1]s → %[2]s

templates/swagger/v1_json.tmpl

Lines changed: 12 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)