Merge branch 'main' into patch-1

GiteaBot · web-flow · commit 165883af8530 · 2025-02-15T13:09:38.000+08:00
diff --git a/services/cron/tasks_basic.go b/services/cron/tasks_basic.go
@@ -54,7 +54,7 @@ func registerRepoHealthCheck() {
 			RunAtStart: false,
 			Schedule:   "@midnight",
 		},
-		Timeout: 60 * time.Second,
+		Timeout: time.Duration(setting.Git.Timeout.Default) * time.Second,
 		Args:    []string{},
 	}, func(ctx context.Context, _ *user_model.User, config Config) error {
 		rhcConfig := config.(*RepoHealthCheckConfig)
diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
@@ -445,7 +445,7 @@ export default defineComponent({
               class="item navigation tw-py-1" :class="{'disabled': page === 1}"
               @click="changePage(page - 1)" :title="textPreviousPage"
             >
-              <svg-icon name="octicon-chevron-left" :size="16" clsas="tw-mr-1"/>
+              <svg-icon name="octicon-chevron-left" :size="16" class="tw-mr-1"/>
             </a>
             <a class="active item tw-py-1">{{ page }}</a>
             <a

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ export default defineComponent({`
`445`	`445`	`class="item navigation tw-py-1" :class="{'disabled': page === 1}"`
`446`	`446`	`@click="changePage(page - 1)" :title="textPreviousPage"`
`447`	`447`	`>`
`448`		`- <svg-icon name="octicon-chevron-left" :size="16" clsas="tw-mr-1"/>`
	`448`	`+ <svg-icon name="octicon-chevron-left" :size="16" class="tw-mr-1"/>`
`449`	`449`	`</a>`
`450`	`450`	`<a class="active item tw-py-1">{{ page }}</a>`
`451`	`451`	`<a`