Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e92516d

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix CI status popup (go-gitea#20737) Add documentation about pagination of the API (go-gitea#20740) [skip ci] Updated translations via Crowdin Change commit status icons to SVG (go-gitea#20736) Add support for NuGet API keys (go-gitea#20721) Keep download count on Container tag overwrite (go-gitea#20728) Replace fomantic popup module with tippy.js (go-gitea#20428) Add an option to create new issues from "/issues" page (go-gitea#20650) Restore history button and hide add button when unable to add (go-gitea#20718) Remove manual rollback for failed generated repositories (go-gitea#20639)
2 parents 89132e1 + 452272c commit e92516d

Some content is hidden

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

49 files changed

+400
-2187
lines changed

‎docs/content/doc/developers/api-usage.en-us.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,18 @@ curl -X POST "http://localhost:4000/api/v1/repos/test1/test1/issues" \
105105
As mentioned above, the token used is the same one you would use in
106106
the `token=` string in a GET request.
107107
108+
## Pagination
109+
110+
The API supports pagination. The `page` and `limit` parameters are used to specify the page number and the number of items per page. As well, the `Link` header is returned with the next, previous, and last page links if there are more than one pages. The `x-total-count` is also returned to indicate the total number of items.
111+
112+
```sh
113+
curl -v "http://localhost/api/v1/repos/search?limit=1"
114+
...
115+
< link: <http://localhost/api/v1/repos/search?limit=1&page=2>; rel="next",<http://localhost/api/v1/repos/search?limit=1&page=5252>; rel="last"
116+
...
117+
< x-total-count: 5252
118+
```
119+
108120
## API Guide:
109121
110122
API Reference guide is auto-generated by swagger and available on:

‎docs/content/doc/packages/nuget.en-us.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ For example:
4747
dotnet nuget add source --name gitea --username testuser --password password123 https://gitea.example.com/api/packages/testuser/nuget/index.json
4848
```
4949

50+
You can add the source without credentials and use the [`--api-key`](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-nuget-push) parameter when publishing packages. In this case you need to provide a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}).
51+
5052
## Publish a package
5153

5254
Publish a package by running the following command:

‎integrations/api_packages_container_test.go‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,23 @@ func TestPackageContainer(t *testing.T) {
276276
}
277277
}
278278

279-
// Overwrite existing tag
279+
req = NewRequest(t, "GET", fmt.Sprintf("%s/manifests/%s", url, tag))
280+
addTokenAuthHeader(req, userToken)
281+
MakeRequest(t, req, http.StatusOK)
282+
283+
pv, err = packages_model.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, image, tag)
284+
assert.NoError(t, err)
285+
assert.EqualValues(t, 1, pv.DownloadCount)
286+
287+
// Overwrite existing tag should keep the download count
280288
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, tag), strings.NewReader(manifestContent))
281289
addTokenAuthHeader(req, userToken)
282290
req.Header.Set("Content-Type", oci.MediaTypeDockerManifest)
283291
MakeRequest(t, req, http.StatusCreated)
292+
293+
pv, err = packages_model.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, image, tag)
294+
assert.NoError(t, err)
295+
assert.EqualValues(t, 1, pv.DownloadCount)
284296
})
285297

286298
t.Run("HeadManifest", func(t *testing.T) {

‎integrations/api_packages_nuget_test.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,16 @@ import (
2424
"github.com/stretchr/testify/assert"
2525
)
2626

27+
func addNuGetAPIKeyHeader(request *http.Request, token string) *http.Request {
28+
request.Header.Set("X-NuGet-ApiKey", token)
29+
return request
30+
}
31+
2732
func TestPackageNuGet(t *testing.T) {
2833
defer prepareTestEnv(t)()
34+
2935
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).(*user_model.User)
36+
token := getUserToken(t, user.Name)
3037

3138
packageName := "test.package"
3239
packageVersion := "1.0.3"
@@ -60,6 +67,10 @@ func TestPackageNuGet(t *testing.T) {
6067

6168
req := NewRequest(t, "GET", fmt.Sprintf("%s/index.json", url))
6269
req = AddBasicAuthHeader(req, user.Name)
70+
MakeRequest(t, req, http.StatusOK)
71+
72+
req = NewRequest(t, "GET", fmt.Sprintf("%s/index.json", url))
73+
req = addNuGetAPIKeyHeader(req, token)
6374
resp := MakeRequest(t, req, http.StatusOK)
6475

6576
var result nuget.ServiceIndexResponse

‎integrations/pull_status_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ func TestPullCreate_CommitStatus(t *testing.T) {
5656
}
5757

5858
statesIcons := map[api.CommitStatusState]string{
59-
api.CommitStatusPending: "circle icon yellow",
60-
api.CommitStatusSuccess: "check icon green",
61-
api.CommitStatusError: "warning icon red",
62-
api.CommitStatusFailure: "remove icon red",
63-
api.CommitStatusWarning: "warning sign icon yellow",
59+
api.CommitStatusPending: "octicon-dot-fill",
60+
api.CommitStatusSuccess: "octicon-check",
61+
api.CommitStatusError: "gitea-exclamation",
62+
api.CommitStatusFailure: "octicon-x",
63+
api.CommitStatusWarning: "gitea-exclamation",
6464
}
6565

6666
testCtx := NewAPITestContext(t, "user1", "repo1")
@@ -80,9 +80,9 @@ func TestPullCreate_CommitStatus(t *testing.T) {
8080
assert.NotEmpty(t, commitURL)
8181
assert.EqualValues(t, commitID, path.Base(commitURL))
8282

83-
cls, ok := doc.doc.Find("#commits-table tbody tr td.message i.commit-status").Last().Attr("class")
83+
cls, ok := doc.doc.Find("#commits-table tbody tr td.message .commit-status").Last().Attr("class")
8484
assert.True(t, ok)
85-
assert.EqualValues(t, "commit-status "+statesIcons[status], cls)
85+
assert.Contains(t, cls, statesIcons[status])
8686
}
8787
})
8888
}

‎integrations/repo_commits_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) {
5555

5656
doc = NewHTMLParser(t, resp.Body)
5757
// Check if commit status is displayed in message column
58-
sel := doc.doc.Find("#commits-table tbody tr td.message a.commit-statuses-trigger i.commit-status")
58+
sel := doc.doc.Find("#commits-table tbody tr td.message a.commit-statuses-trigger .commit-status")
5959
assert.Equal(t, 1, sel.Length())
6060
for _, class := range classes {
6161
assert.True(t, sel.HasClass(class))
@@ -96,21 +96,21 @@ func testRepoCommitsWithStatus(t *testing.T, resp, respOne *httptest.ResponseRec
9696
}
9797

9898
func TestRepoCommitsWithStatusPending(t *testing.T) {
99-
doTestRepoCommitWithStatus(t, "pending", "circle", "yellow")
99+
doTestRepoCommitWithStatus(t, "pending", "octicon-dot-fill", "yellow")
100100
}
101101

102102
func TestRepoCommitsWithStatusSuccess(t *testing.T) {
103-
doTestRepoCommitWithStatus(t, "success", "check", "green")
103+
doTestRepoCommitWithStatus(t, "success", "octicon-check", "green")
104104
}
105105

106106
func TestRepoCommitsWithStatusError(t *testing.T) {
107-
doTestRepoCommitWithStatus(t, "error", "warning", "red")
107+
doTestRepoCommitWithStatus(t, "error", "gitea-exclamation", "red")
108108
}
109109

110110
func TestRepoCommitsWithStatusFailure(t *testing.T) {
111-
doTestRepoCommitWithStatus(t, "failure", "remove", "red")
111+
doTestRepoCommitWithStatus(t, "failure", "octicon-x", "red")
112112
}
113113

114114
func TestRepoCommitsWithStatusWarning(t *testing.T) {
115-
doTestRepoCommitWithStatus(t, "warning", "warning", "sign", "yellow")
115+
doTestRepoCommitWithStatus(t, "warning", "gitea-exclamation", "yellow")
116116
}

‎options/locale/locale_it-IT.ini‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,6 +1063,7 @@ normal_view=Vista normale
10631063
line=riga
10641064
lines=righe
10651065
1066+
editor.add_file=Aggiungi file
10661067
editor.new_file=Nuovo file
10671068
editor.upload_file=Carica File
10681069
editor.edit_file=Modifica File
@@ -1268,6 +1269,8 @@ issues.filter_milestone=Traguardo
12681269
issues.filter_milestone_no_select=Tutte le pietre miliari
12691270
issues.filter_assignee=Assegnatario
12701271
issues.filter_assginee_no_select=Tutte le assegnazioni
1272+
issues.filter_poster=Autore
1273+
issues.filter_poster_no_select=Tutti gli autori
12711274
issues.filter_type=Tipo
12721275
issues.filter_type.all_issues=Tutti i problemi
12731276
issues.filter_type.assigned_to_you=Assegnati a te
@@ -3111,6 +3114,9 @@ npm.dependencies.development=Dipendenze Di Sviluppo
31113114
npm.dependencies.peer=Dipendenze Peer
31123115
npm.dependencies.optional=Dipendenze Opzionali
31133116
npm.details.tag=Tag
3117+
pub.install=Per installare il pacchetto utilizzando NuGet, eseguire il seguente comando:
3118+
pub.documentation=Per ulteriori informazioni sul registro Pub, consultare <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/pub/">la documentazione</a>.
3119+
pub.details.repository_site=Sito Repository
31143120
pypi.requires=Richiede Python
31153121
pypi.install=Per installare il pacchetto usando pip, eseguire il seguente comando:
31163122
pypi.documentation=Per ulteriori informazioni sul registro PyPI, consultare <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/pypi/">la documentazione</a>.

‎options/locale/locale_nl-NL.ini‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,6 +1063,7 @@ normal_view=Normale weergave
10631063
line=regel
10641064
lines=regels
10651065

1066+
editor.add_file=Bestand toevoegen
10661067
editor.new_file=Nieuw bestand
10671068
editor.upload_file=Upload bestand
10681069
editor.edit_file=Bewerk bestand
@@ -1268,6 +1269,8 @@ issues.filter_milestone=Mijlpaal
12681269
issues.filter_milestone_no_select=Alle mijlpalen
12691270
issues.filter_assignee=Aangewezene
12701271
issues.filter_assginee_no_select=Alle toegewezen personen
1272+
issues.filter_poster=Auteur
1273+
issues.filter_poster_no_select=Alle auteurs
12711274
issues.filter_type=Type
12721275
issues.filter_type.all_issues=Alle kwesties
12731276
issues.filter_type.assigned_to_you=Aan jou toegewezen
@@ -1296,6 +1299,11 @@ issues.action_milestone_no_select=Geen mijlpaal
12961299
issues.action_assignee=Toegewezene
12971300
issues.action_assignee_no_select=Geen verantwoordelijke
12981301
issues.opened_by=%[1]s geopend door <a href="%[2]s">%[3]s</a>
1302+
pulls.merged_by=door <a href="%[2]s">%[3]s</a> was samengevoegd %[1]s
1303+
pulls.merged_by_fake=bij %[2]s is %[1]s samengevoegd
1304+
issues.closed_by=door <a href="%[2]s">%[3]s</a> was gesloten %[1]s
1305+
issues.opened_by_fake=%[1]s geopend door %[2]s
1306+
issues.closed_by_fake=door %[2]s was gesloten %[1]s
12991307
issues.previous=Vorige
13001308
issues.next=Volgende
13011309
issues.open_title=Open
@@ -1311,6 +1319,8 @@ issues.context.edit=Bewerken
13111319
issues.context.delete=Verwijder
13121320
issues.no_content=Er is nog geen inhoud.
13131321
issues.close_issue=Sluit
1322+
issues.pull_merged_at=`commit samengevoegd <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> in <b>%[3]s</b> %[4]s`
1323+
issues.manually_pull_merged_at=`commit <a class="ui sha" href="%[1]s"> handmatig samengevoegd <code>%[2]s</code></a> in <b>%[3]s</b> %[4]s`
13141324
issues.close_comment_issue=Reageer en sluit
13151325
issues.reopen_issue=Heropen
13161326
issues.reopen_comment_issue=Heropen en geef commentaar
@@ -1333,6 +1343,7 @@ issues.is_stale=Er zijn wijzigingen aangebracht in deze PR sinds deze beoordelin
13331343
issues.remove_request_review=Verwijder beoordelingsverzoek
13341344
issues.remove_request_review_block=Kan beoordelingsverzoek niet verwijderen
13351345
issues.dismiss_review=Beoordeling afwijzen
1346+
issues.dismiss_review_warning=Bent u zeker dat u deze beoordeling wilt afwijzen?
13361347
issues.sign_in_require_desc=<a href="%s">Log in</a> om deel te nemen aan deze discussie.
13371348
issues.edit=Bewerken
13381349
issues.cancel=Annuleren
@@ -1406,6 +1417,7 @@ issues.error_modifying_due_date=Deadline aanpassen mislukt.
14061417
issues.error_removing_due_date=Deadline verwijderen mislukt.
14071418
issues.push_commit_1=toegevoegd %d commit %s
14081419
issues.push_commits_n=toegevoegd %d commits %s
1420+
issues.force_push_codes=`force-push %[1]s van <a class="ui sha" href="%[3]s"><code>%[2]s</code></a> naar <a class="ui sha" href="%[5]s"><code>%[4]s</code></a> %[6]s`
14091421
issues.due_date_form=jjjj-mm-dd
14101422
issues.due_date_form_add=Vervaldatum toevoegen
14111423
issues.due_date_form_edit=Bewerk
@@ -1426,6 +1438,7 @@ issues.dependency.remove=Verwijder
14261438
issues.dependency.remove_info=Verwijder afhankelijkheid
14271439
issues.dependency.added_dependency=`voegde een nieuwe afhankelijkheid %s toe `
14281440
issues.dependency.removed_dependency=`verwijderde een afhankelijkheid %s`
1441+
issues.dependency.pr_closing_blockedby=Het sluiten van deze pull-aanvraag is geblokkeerd door de volgende issues
14291442
issues.dependency.issue_closing_blockedby=Het sluiten van dit issue is geblokkeerd door de volgende problemen
14301443
issues.dependency.issue_close_blocks=Deze kwestie blokkeert het sluiten van de volgende kwesties
14311444
issues.dependency.pr_close_blocks=Deze pull-aanvraag blokkeert het sluiten van de volgende kwesties
@@ -1598,6 +1611,8 @@ pulls.auto_merge_newly_scheduled=De pull-verzoek was gepland om samen te voegen
15981611
pulls.auto_merge_has_pending_schedule=%[1]s heeft deze pull-verzoek automatisch samengevoegd wanneer alle checks succesvol zijn geweest %[2]s.
15991612
16001613
pulls.auto_merge_cancel_schedule=Automatisch samenvoegen annuleren
1614+
pulls.auto_merge_not_scheduled=Deze pull-aanvraag is niet gepland om automatisch samen te voegen.
1615+
pulls.auto_merge_canceled_schedule=De automatisch samenvoegen is geannuleerd voor deze pull-aanvraag.
16011616
16021617
16031618
pulls.delete.title=Deze pull-verzoek verwijderen?
@@ -1761,6 +1776,7 @@ settings.hooks=Webhooks
17611776
settings.githooks=Git-hooks
17621777
settings.basic_settings=Basis instellingen
17631778
settings.mirror_settings=Kopie Settings
1779+
settings.mirror_settings.mirrored_repository=Gespiegelde repository
17641780
settings.mirror_settings.direction=Richting
17651781
settings.mirror_settings.direction.pull=Pull
17661782
settings.mirror_settings.direction.push=Push
@@ -1790,6 +1806,8 @@ settings.tracker_url_format_error=Het URL-formaat van de externe wiki is geen ge
17901806
settings.tracker_issue_style=Nummerformaat van de externe kwestie-tracker
17911807
settings.tracker_issue_style.numeric=Nummeriek
17921808
settings.tracker_issue_style.alphanumeric=Alfanummeriek
1809+
settings.tracker_issue_style.regexp=Reguliere expressie
1810+
settings.tracker_issue_style.regexp_pattern=Reguliere expressie patroon
17931811
settings.tracker_url_format_desc=Gebruik de aanduidingen <code>{user}</code>, <code>{repo}</code> en <code>{index}</code> voor de gebruikersnaam, repositorynaam en kwestie-index.
17941812
settings.enable_timetracker=Tijdregistratie inschakelen
17951813
settings.allow_only_contributors_to_track_time=Sta alleen bijdragers toe tijdregistratie te gebruiken

‎options/locale/locale_pt-PT.ini‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,6 +1269,8 @@ issues.filter_milestone=Etapa
12691269
issues.filter_milestone_no_select=Todas as etapas
12701270
issues.filter_assignee=Encarregado
12711271
issues.filter_assginee_no_select=Todos os encarregados
1272+
issues.filter_poster=Autor(a)
1273+
issues.filter_poster_no_select=Todos os autores
12721274
issues.filter_type=Tipo
12731275
issues.filter_type.all_issues=Todas as questões
12741276
issues.filter_type.assigned_to_you=Atribuídas a si

‎options/locale/locale_tr-TR.ini‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,6 +1269,8 @@ issues.filter_milestone=Kilometre Taşı
12691269
issues.filter_milestone_no_select=Tüm kilometre taşları
12701270
issues.filter_assignee=Atanan
12711271
issues.filter_assginee_no_select=Tüm atananlar
1272+
issues.filter_poster=Yazar
1273+
issues.filter_poster_no_select=Tüm yazarlar
12721274
issues.filter_type=Tür
12731275
issues.filter_type.all_issues=Tüm konular
12741276
issues.filter_type.assigned_to_you=Size atanan

0 commit comments

Comments
 (0)