Merge branch 'main' into lunny/actions_log_api

lunny · lunny · commit 24b215ad378d · 2025-03-13T17:33:40.000-07:00
diff --git a/modules/migration/retry_downloader.go b/modules/migration/retry_downloader.go
@@ -13,36 +13,34 @@ var _ Downloader = &RetryDownloader{}
 // RetryDownloader retry the downloads
 type RetryDownloader struct {
 	Downloader
-	ctx        context.Context
 	RetryTimes int // the total execute times
 	RetryDelay int // time to delay seconds
 }
 
 // NewRetryDownloader creates a retry downloader
-func NewRetryDownloader(ctx context.Context, downloader Downloader, retryTimes, retryDelay int) *RetryDownloader {
+func NewRetryDownloader(downloader Downloader, retryTimes, retryDelay int) *RetryDownloader {
 	return &RetryDownloader{
 		Downloader: downloader,
-		ctx:        ctx,
 		RetryTimes: retryTimes,
 		RetryDelay: retryDelay,
 	}
 }
 
-func (d *RetryDownloader) retry(work func() error) error {
+func (d *RetryDownloader) retry(ctx context.Context, work func(context.Context) error) error {
 	var (
 		times = d.RetryTimes
 		err   error
 	)
 	for ; times > 0; times-- {
-		if err = work(); err == nil {
+		if err = work(ctx); err == nil {
 			return nil
 		}
 		if IsErrNotSupported(err) {
 			return err
 		}
 		select {
-		case <-d.ctx.Done():
-			return d.ctx.Err()
+		case <-ctx.Done():
+			return ctx.Err()
 		case <-time.After(time.Second * time.Duration(d.RetryDelay)):
 		}
 	}
@@ -56,7 +54,7 @@ func (d *RetryDownloader) GetRepoInfo(ctx context.Context) (*Repository, error)
 		err  error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		repo, err = d.Downloader.GetRepoInfo(ctx)
 		return err
 	})
@@ -71,7 +69,7 @@ func (d *RetryDownloader) GetTopics(ctx context.Context) ([]string, error) {
 		err    error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		topics, err = d.Downloader.GetTopics(ctx)
 		return err
 	})
@@ -86,7 +84,7 @@ func (d *RetryDownloader) GetMilestones(ctx context.Context) ([]*Milestone, erro
 		err        error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		milestones, err = d.Downloader.GetMilestones(ctx)
 		return err
 	})
@@ -101,7 +99,7 @@ func (d *RetryDownloader) GetReleases(ctx context.Context) ([]*Release, error) {
 		err      error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		releases, err = d.Downloader.GetReleases(ctx)
 		return err
 	})
@@ -116,7 +114,7 @@ func (d *RetryDownloader) GetLabels(ctx context.Context) ([]*Label, error) {
 		err    error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		labels, err = d.Downloader.GetLabels(ctx)
 		return err
 	})
@@ -132,7 +130,7 @@ func (d *RetryDownloader) GetIssues(ctx context.Context, page, perPage int) ([]*
 		err    error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		issues, isEnd, err = d.Downloader.GetIssues(ctx, page, perPage)
 		return err
 	})
@@ -148,7 +146,7 @@ func (d *RetryDownloader) GetComments(ctx context.Context, commentable Commentab
 		err      error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(context.Context) error {
 		comments, isEnd, err = d.Downloader.GetComments(ctx, commentable)
 		return err
 	})
@@ -164,7 +162,7 @@ func (d *RetryDownloader) GetPullRequests(ctx context.Context, page, perPage int
 		isEnd bool
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		prs, isEnd, err = d.Downloader.GetPullRequests(ctx, page, perPage)
 		return err
 	})
@@ -178,7 +176,7 @@ func (d *RetryDownloader) GetReviews(ctx context.Context, reviewable Reviewable)
 		reviews []*Review
 		err     error
 	)
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		reviews, err = d.Downloader.GetReviews(ctx, reviewable)
 		return err
 	})
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
@@ -1463,6 +1463,8 @@ issues.filter_milestones=Filtrer le jalon
 issues.filter_projects=Filtrer par projet
 issues.filter_labels=Filtrer par labels
 issues.filter_reviewers=Filtrer par évaluateur
+issues.filter_no_results=Aucun résultat
+issues.filter_no_results_placeholder=Essayez d’ajuster vos filtres de recherche.
 issues.new=Nouveau ticket
 issues.new.title_empty=Le titre ne peut pas être vide
 issues.new.labels=Labels
@@ -1935,6 +1937,7 @@ pulls.outdated_with_base_branch=Cette branche est désynchronisée avec la branc
 pulls.close=Fermer la demande d’ajout
 pulls.closed_at=`a fermé cette demande d'ajout <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
 pulls.reopened_at=`a rouvert cette demande d'ajout <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
+pulls.cmd_instruction_hint=Voir les instructions en ligne de commande
 pulls.cmd_instruction_checkout_title=Basculer
 pulls.cmd_instruction_checkout_desc=Depuis votre dépôt, basculer sur une nouvelle branche et tester des modifications.
 pulls.cmd_instruction_merge_title=Fusionner
@@ -2376,6 +2379,9 @@ settings.event_pull_request_review_request=Demande d’évaluation
 settings.event_pull_request_review_request_desc=Création ou suppresion de demandes d’évaluation.
 settings.event_pull_request_approvals=Approbations de demande d'ajout
 settings.event_pull_request_merge=Fusion de demande d'ajout
+settings.event_header_workflow=Événements du flux de travail
+settings.event_workflow_job=Tâches du flux de travail
+settings.event_workflow_job_desc=Tâche du flux de travail Gitea Actions en file d’attente, en attente, en cours ou terminée.
 settings.event_package=Paquet
 settings.event_package_desc=Paquet créé ou supprimé.
 settings.branch_filter=Filtre de branche
@@ -2454,7 +2460,7 @@ settings.protect_whitelist_teams=Équipes autorisées à pousser :
 settings.protect_force_push_allowlist_users=Utilisateurs autorisés à pousser en force :
 settings.protect_force_push_allowlist_teams=Équipes autorisées à pousser en force :
 settings.protect_force_push_allowlist_deploy_keys=Clés de déploiement pouvant pousser autorisées à pousser en force.
-settings.protect_merge_whitelist_committers=Activer la liste d’autorisés pour la fusion
+settings.protect_merge_whitelist_committers=Fusion sur autorisation uniquement
 settings.protect_merge_whitelist_committers_desc=N’autoriser que les utilisateurs et les équipes listés à appliquer les demandes de fusion sur cette branche.
 settings.protect_merge_whitelist_users=Utilisateurs autorisés à fusionner :
 settings.protect_merge_whitelist_teams=Équipes autorisées à fusionner :
@@ -2468,7 +2474,7 @@ settings.protect_invalid_status_check_pattern=Motif de vérification des statuts
 settings.protect_no_valid_status_check_patterns=Aucun motif de vérification des statuts valide.
 settings.protect_required_approvals=Minimum d'approbations requis :
 settings.protect_required_approvals_desc=Permet de fusionner les demandes d’ajout lorsque suffisamment d’évaluation sont positives.
-settings.protect_approvals_whitelist_enabled=Restreindre les approbations aux utilisateurs ou aux équipes sur liste d’autorisés
+settings.protect_approvals_whitelist_enabled=Restreindre les approbations sur autorisation uniquement
 settings.protect_approvals_whitelist_enabled_desc=Seuls les évaluations des utilisateurs ou des équipes suivantes compteront dans les approbations requises. Si laissé vide, les évaluations de toute personne ayant un accès en écriture seront comptabilisées à la place.
 settings.protect_approvals_whitelist_users=Évaluateurs autorisés :
 settings.protect_approvals_whitelist_teams=Équipes d’évaluateurs autorisés :
diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini
@@ -2379,6 +2379,9 @@ settings.event_pull_request_review_request=Iarratas ar Athbhreithniú Tarraingth
 settings.event_pull_request_review_request_desc=Tarraing athbhreithniú iarratais iarrtha nó baineadh iarratas athbhreithnithe.
 settings.event_pull_request_approvals=Ceaduithe Iarratais Tarraing
 settings.event_pull_request_merge=Cumaisc Iarratas Tarraing
+settings.event_header_workflow=Imeachtaí Sreabhadh Oibre
+settings.event_workflow_job=Poist Sreabhadh Oibre
+settings.event_workflow_job_desc=Gitea Actions Sreabhadh oibre post ciúáilte, ag fanacht, ar siúl, nó críochnaithe.
 settings.event_package=Pacáiste
 settings.event_package_desc=Pacáiste a cruthaíodh nó a scriosadh i stóras.
 settings.branch_filter=Scagaire brainse
diff --git a/services/migrations/migrate.go b/services/migrations/migrate.go
@@ -168,7 +168,7 @@ func newDownloader(ctx context.Context, ownerName string, opts base.MigrateOptio
 	}
 
 	if setting.Migrations.MaxAttempts > 1 {
-		downloader = base.NewRetryDownloader(ctx, downloader, setting.Migrations.MaxAttempts, setting.Migrations.RetryBackoff)
+		downloader = base.NewRetryDownloader(downloader, setting.Migrations.MaxAttempts, setting.Migrations.RetryBackoff)
 	}
 	return downloader, nil
 }
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
@@ -203,8 +203,17 @@
 							{{range .PushMirrors}}
 							<tr>
 								<td class="tw-break-anywhere">{{.RemoteAddress}}</td>
-								<td>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
-								<td>{{if .LastUpdateUnix}}{{DateUtils.FullTime .LastUpdateUnix}}{{else}}{{ctx.Locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{ctx.Locale.Tr "error"}}</div>{{end}}</td>
+								<td>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.push"}} ({{.Interval}})</td>
+								<td>
+									<span class="flex-text-block">
+										{{if .LastUpdateUnix}}
+											{{DateUtils.FullTime .LastUpdateUnix}}
+										{{else}}
+											{{ctx.Locale.Tr "never"}}
+										{{end}}
+										{{if .LastError}}<span class="ui red label" data-tooltip-content="{{.LastError}}">{{ctx.Locale.Tr "error"}}</span>{{end}}
+									</span>
+								</td>
 								<td class="right aligned">
 									<button
 										class="ui tiny button show-modal"
diff --git a/templates/repo/settings/push_mirror_sync_modal.tmpl b/templates/repo/settings/push_mirror_sync_modal.tmpl
@@ -2,31 +2,27 @@
 	<div class="header">
 		{{ctx.Locale.Tr "repo.settings.mirror_settings.push_mirror.edit_sync_time"}}
 	</div>
-	<div class="content">
-		<form class="ui form ignore-dirty" method="post">
-			{{.CsrfTokenHtml}}
-			<input type="hidden" name="action" value="push-mirror-update">
-			<input type="hidden" name="push_mirror_id" id="push-mirror-edit-id">
-			<div class="field">
-				<label for="name">{{ctx.Locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</label>
-				<div class="ui small input">
-					<input id="push-mirror-edit-address" readonly>
-				</div>
-			</div>
-			<div class="inline field">
-				<label for="push-mirror-edit-interval">{{ctx.Locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
-				<input id="push-mirror-edit-interval" name="push_mirror_interval" autofocus>
-			</div>
-			<div class="actions">
-				<button class="ui small basic cancel button">
-					{{svg "octicon-x"}}
-					{{ctx.Locale.Tr "cancel"}}
-				</button>
-				<button class="ui primary small approve button">
-					{{svg "fontawesome-save"}}
-					{{ctx.Locale.Tr "save"}}
-				</button>
-			</div>
-		</form>
-	</div>
+	<form class="content ui form ignore-dirty" method="post">
+		{{.CsrfTokenHtml}}
+		<input type="hidden" name="action" value="push-mirror-update">
+		<input type="hidden" name="push_mirror_id" id="push-mirror-edit-id">
+		<div class="field">
+			<label>{{ctx.Locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</label>
+			<span id="push-mirror-edit-address"></span>
+		</div>
+		<div class="field">
+			<label for="push-mirror-edit-interval">{{ctx.Locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
+			<input id="push-mirror-edit-interval" name="push_mirror_interval" class="tw-w-auto">
+		</div>
+		<div class="actions">
+			<button class="ui small basic cancel button">
+				{{svg "octicon-x"}}
+				{{ctx.Locale.Tr "cancel"}}
+			</button>
+			<button class="ui primary small approve button">
+				{{svg "fontawesome-save"}}
+				{{ctx.Locale.Tr "save"}}
+			</button>
+		</div>
+	</form>
 </div>

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ func newDownloader(ctx context.Context, ownerName string, opts base.MigrateOptio`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`if setting.Migrations.MaxAttempts > 1 {`
`171`		`- downloader = base.NewRetryDownloader(ctx, downloader, setting.Migrations.MaxAttempts, setting.Migrations.RetryBackoff)`
	`171`	`+ downloader = base.NewRetryDownloader(downloader, setting.Migrations.MaxAttempts, setting.Migrations.RetryBackoff)`
`172`	`172`	`}`
`173`	`173`	`return downloader, nil`
`174`	`174`	`}`