Merge remote-tracking branch 'giteaofficial/main'

zjjhot · zjjhot · commit de715eb9e980 · 2025-04-28T10:04:42.000+08:00
* giteaofficial/main: Fix button alignments (go-gitea#34276) Update token creation API swagger documentation (go-gitea#34288) [skip ci] Updated translations via Crowdin Explicitly not update indexes when sync database schemas (go-gitea#34281) Introduce `--page-space-bottom` at 64px (go-gitea#30692) # Conflicts: # templates/repo/wiki/revision.tmpl
diff --git a/models/migrations/v1_23/v299.go b/models/migrations/v1_23/v299.go
@@ -14,5 +14,9 @@ func AddContentVersionToIssueAndComment(x *xorm.Engine) error {
 		ContentVersion int `xorm:"NOT NULL DEFAULT 0"`
 	}
 
-	return x.Sync(new(Comment), new(Issue))
+	_, err := x.SyncWithOptions(xorm.SyncOptions{
+		IgnoreConstrains: true,
+		IgnoreIndices:    true,
+	}, new(Comment), new(Issue))
+	return err
 }
diff --git a/models/migrations/v1_23/v300.go b/models/migrations/v1_23/v300.go
@@ -13,5 +13,9 @@ func AddForcePushBranchProtection(x *xorm.Engine) error {
 		ForcePushAllowlistTeamIDs    []int64 `xorm:"JSON TEXT"`
 		ForcePushAllowlistDeployKeys bool    `xorm:"NOT NULL DEFAULT false"`
 	}
-	return x.Sync(new(ProtectedBranch))
+	_, err := x.SyncWithOptions(xorm.SyncOptions{
+		IgnoreConstrains: true,
+		IgnoreIndices:    true,
+	}, new(ProtectedBranch))
+	return err
 }
diff --git a/models/migrations/v1_23/v301.go b/models/migrations/v1_23/v301.go
@@ -10,5 +10,9 @@ func AddSkipSecondaryAuthColumnToOAuth2ApplicationTable(x *xorm.Engine) error {
 	type oauth2Application struct {
 		SkipSecondaryAuthorization bool `xorm:"NOT NULL DEFAULT FALSE"`
 	}
-	return x.Sync(new(oauth2Application))
+	_, err := x.SyncWithOptions(xorm.SyncOptions{
+		IgnoreConstrains: true,
+		IgnoreIndices:    true,
+	}, new(oauth2Application))
+	return err
 }
diff --git a/models/migrations/v1_23/v303.go b/models/migrations/v1_23/v303.go
@@ -19,5 +19,9 @@ func AddCommentMetaDataColumn(x *xorm.Engine) error {
 		CommentMetaData *CommentMetaData `xorm:"JSON TEXT"` // put all non-index metadata in a single field
 	}
 
-	return x.Sync(new(Comment))
+	_, err := x.SyncWithOptions(xorm.SyncOptions{
+		IgnoreConstrains: true,
+		IgnoreIndices:    true,
+	}, new(Comment))
+	return err
 }
diff --git a/models/migrations/v1_23/v306.go b/models/migrations/v1_23/v306.go
@@ -9,5 +9,9 @@ func AddBlockAdminMergeOverrideBranchProtection(x *xorm.Engine) error {
 	type ProtectedBranch struct {
 		BlockAdminMergeOverride bool `xorm:"NOT NULL DEFAULT false"`
 	}
-	return x.Sync(new(ProtectedBranch))
+	_, err := x.SyncWithOptions(xorm.SyncOptions{
+		IgnoreConstrains: true,
+		IgnoreIndices:    true,
+	}, new(ProtectedBranch))
+	return err
 }
diff --git a/models/migrations/v1_23/v310.go b/models/migrations/v1_23/v310.go
@@ -12,5 +12,9 @@ func AddPriorityToProtectedBranch(x *xorm.Engine) error {
 		Priority int64 `xorm:"NOT NULL DEFAULT 0"`
 	}
 
-	return x.Sync(new(ProtectedBranch))
+	_, err := x.SyncWithOptions(xorm.SyncOptions{
+		IgnoreConstrains: true,
+		IgnoreIndices:    true,
+	}, new(ProtectedBranch))
+	return err
 }
diff --git a/models/migrations/v1_23/v311.go b/models/migrations/v1_23/v311.go
@@ -11,6 +11,9 @@ func AddTimeEstimateColumnToIssueTable(x *xorm.Engine) error {
 	type Issue struct {
 		TimeEstimate int64 `xorm:"NOT NULL DEFAULT 0"`
 	}
-
-	return x.Sync(new(Issue))
+	_, err := x.SyncWithOptions(xorm.SyncOptions{
+		IgnoreConstrains: true,
+		IgnoreIndices:    true,
+	}, new(Issue))
+	return err
 }
diff --git a/models/migrations/v1_24/v312.go b/models/migrations/v1_24/v312.go
@@ -17,5 +17,9 @@ func (pullAutoMerge) TableName() string {
 }
 
 func AddDeleteBranchAfterMergeForAutoMerge(x *xorm.Engine) error {
-	return x.Sync(new(pullAutoMerge))
+	_, err := x.SyncWithOptions(xorm.SyncOptions{
+		IgnoreConstrains: true,
+		IgnoreIndices:    true,
+	}, new(pullAutoMerge))
+	return err
 }
diff --git a/models/migrations/v1_24/v315.go b/models/migrations/v1_24/v315.go
@@ -11,6 +11,9 @@ func AddEphemeralToActionRunner(x *xorm.Engine) error {
 	type ActionRunner struct {
 		Ephemeral bool `xorm:"ephemeral NOT NULL DEFAULT false"`
 	}
-
-	return x.Sync(new(ActionRunner))
+	_, err := x.SyncWithOptions(xorm.SyncOptions{
+		IgnoreConstrains: true,
+		IgnoreIndices:    true,
+	}, new(ActionRunner))
+	return err
 }
diff --git a/models/migrations/v1_24/v316.go b/models/migrations/v1_24/v316.go
@@ -16,5 +16,9 @@ func AddDescriptionForSecretsAndVariables(x *xorm.Engine) error {
 		Description string `xorm:"TEXT"`
 	}
 
-	return x.Sync(new(Secret), new(ActionVariable))
+	_, err := x.SyncWithOptions(xorm.SyncOptions{
+		IgnoreConstrains: true,
+		IgnoreIndices:    true,
+	}, new(Secret), new(ActionVariable))
+	return err
 }
diff --git a/models/migrations/v1_24/v318.go b/models/migrations/v1_24/v318.go
@@ -13,5 +13,9 @@ func AddRepoUnitAnonymousAccessMode(x *xorm.Engine) error {
 	type RepoUnit struct { //revive:disable-line:exported
 		AnonymousAccessMode perm.AccessMode `xorm:"NOT NULL DEFAULT 0"`
 	}
-	return x.Sync(&RepoUnit{})
+	_, err := x.SyncWithOptions(xorm.SyncOptions{
+		IgnoreConstrains: true,
+		IgnoreIndices:    true,
+	}, new(RepoUnit))
+	return err
 }
diff --git a/models/migrations/v1_24/v319.go b/models/migrations/v1_24/v319.go
@@ -11,6 +11,9 @@ func AddExclusiveOrderColumnToLabelTable(x *xorm.Engine) error {
 	type Label struct {
 		ExclusiveOrder int `xorm:"DEFAULT 0"`
 	}
-
-	return x.Sync(new(Label))
+	_, err := x.SyncWithOptions(xorm.SyncOptions{
+		IgnoreConstrains: true,
+		IgnoreIndices:    true,
+	}, new(Label))
+	return err
 }
diff --git a/modules/structs/user_app.go b/modules/structs/user_app.go
@@ -23,9 +23,11 @@ type AccessToken struct {
 type AccessTokenList []*AccessToken
 
 // CreateAccessTokenOption options when create access token
+// swagger:model CreateAccessTokenOption
 type CreateAccessTokenOption struct {
 	// required: true
-	Name   string   `json:"name" binding:"Required"`
+	Name string `json:"name" binding:"Required"`
+	// example: ["all", "read:activitypub","read:issue", "write:misc", "read:notification", "read:organization", "read:package", "read:repository", "read:user"]
 	Scopes []string `json:"scopes"`
 }
 
diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini
@@ -1879,6 +1879,7 @@ pulls.add_prefix=Cuir réimír <strong>%s</strong> leis
 pulls.remove_prefix=Bain an réimír <strong>%s</strong>
 pulls.data_broken=Tá an t-iarratas tarraingthe seo briste mar gheall ar fhaisnéis forc a bheith in easnamh.
 pulls.files_conflicted=Tá athruithe ag an iarratas tarraingthe seo atá contrártha leis an spriocbhrainse.
+pulls.is_checking=Ag seiceáil le haghaidh coinbhleachtaí cumaisc ...
 pulls.is_ancestor=Tá an brainse seo san áireamh cheana féin sa spriocbhrainse. Níl aon rud le cumasc.
 pulls.is_empty=Tá na hathruithe ar an mbrainse seo ar an spriocbhrainse cheana féin. Is tiomantas folamh é seo.
 pulls.required_status_check_failed=Níor éirigh le roinnt seiceálacha riachtanacha.
@@ -3842,6 +3843,8 @@ deleted.display_name=Tionscadal scriosta
 type-1.display_name=Tionscadal Aonair
 type-2.display_name=Tionscadal Stórais
 type-3.display_name=Tionscadal Eagrúcháin
+enter_fullscreen=Lánscáileán
+exit_fullscreen=Scoir Lánscáileáin
 
 [git.filemode]
 changed_filemode=%[1]s → %[2]s
diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
@@ -47,16 +47,20 @@ Search "repo/branch_dropdown" in the template directory to find all occurrences.
 >
 	{{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
 	<div class="ui dropdown custom branch-selector-dropdown ellipsis-text-items">
-		<div class="ui button branch-dropdown-button">
+		<div class="ui compact button branch-dropdown-button">
 			<span class="flex-text-block gt-ellipsis">
-				{{if not .DropdownFixedText}}
-					{{if .ShowTabTags}}
+				{{if .DropdownFixedText}}
+					{{.DropdownFixedText}}
+				{{else}}
+					{{if eq .CurrentRefType "tag"}}
 						{{svg "octicon-tag"}}
-					{{else if .ShowTabBranches}}
+					{{else if eq .CurrentRefType "branch"}}
 						{{svg "octicon-git-branch"}}
+					{{else}}
+						{{svg "octicon-git-commit"}}
 					{{end}}
+					<strong class="tw-inline-block gt-ellipsis">{{.CurrentRefShortName}}</strong>
 				{{end}}
-				<strong class="tw-ml-2 tw-inline-block gt-ellipsis">{{Iif .DropdownFixedText .SelectedRefShortName}}</strong>
 			</span>
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 		</div>
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
diff --git a/tests/integration/pull_status_test.go b/tests/integration/pull_status_test.go
@@ -172,7 +172,6 @@ func TestPullCreate_EmptyChangesWithSameCommits(t *testing.T) {
 
 func TestPullStatusDelayCheck(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		defer test.MockVariableValue(&setting.IsProd)()
 		defer test.MockVariableValue(&setting.Repository.PullRequest.DelayCheckForInactiveDays, 1)()
 		defer test.MockVariableValue(&pull.AddPullRequestToCheckQueue)()
 
@@ -203,11 +202,11 @@ func TestPullStatusDelayCheck(t *testing.T) {
 		issue3, checkedPrID := run(t, func(t *testing.T) {})
 		assert.Equal(t, issues.PullRequestStatusMergeable, issue3.PullRequest.Status)
 		assert.Zero(t, checkedPrID)
-		setting.IsProd = true
 		assertReloadingInterval(t, "") // the PR is mergeable, so no need to reload the merge box
-		setting.IsProd = false
-		assertReloadingInterval(t, "1") // make sure dev mode always do merge box reloading, to make sure the UI logic won't break
-		setting.IsProd = true
+
+		// setting.IsProd = false // it would cause data-race because the queue handlers might be running and reading its value
+		// assertReloadingInterval(t, "1") // make sure dev mode always do merge box reloading, to make sure the UI logic won't break
+		// setting.IsProd = true
 
 		// when base branch changes, PR status should be updated, but it is inactive for long time, so no real check
 		issue3, checkedPrID = run(t, func(t *testing.T) {
diff --git a/web_src/css/base.css b/web_src/css/base.css
@@ -29,6 +29,7 @@
   --checkbox-size: 15px; /* height and width of checkbox and radio inputs */
   --page-spacing: 16px; /* space between page elements */
   --page-margin-x: 32px; /* minimum space on left and right side of page */
+  --page-space-bottom: 64px; /* space between last page element and footer */
 }
 
 @media (min-width: 768px) and (max-width: 1200px) {
@@ -479,7 +480,7 @@ img.ui.avatar,
 
 .full.height {
   flex-grow: 1;
-  padding-bottom: 80px;
+  padding-bottom: var(--page-space-bottom);
 }
 
 .status-page-error {
@@ -1149,6 +1150,7 @@ table th[data-sortt-desc] .svg {
   min-width: 0;
 }
 
+.ui.dropdown > .ui.button,
 .flex-text-block > .ui.button,
 .flex-text-inline > .ui.button {
   margin: 0; /* fomantic buttons have default margin, when we use them in a flex container with gap, we do not need these margins */
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
@@ -222,7 +222,8 @@ export default defineComponent({
         <template v-if="dropdownFixedText">{{ dropdownFixedText }}</template>
         <template v-else>
           <svg-icon v-if="currentRefType === 'tag'" name="octicon-tag"/>
-          <svg-icon v-else name="octicon-git-branch"/>
+          <svg-icon v-else-if="currentRefType === 'branch'" name="octicon-git-branch"/>
+          <svg-icon v-else name="octicon-git-commit"/>
           <strong ref="dropdownRefName" class="tw-inline-block gt-ellipsis">{{ currentRefShortName }}</strong>
         </template>
       </span>
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
@@ -354,7 +354,7 @@ export default defineComponent({
       <div>
         <!-- Contribution type -->
         <div class="ui floating dropdown jump" id="repo-contributors">
-          <div class="ui basic compact button tw-mr-0">
+          <div class="ui basic compact button">
             <span class="not-mobile">{{ locale.filterLabel }}</span> <strong>{{ locale.contributionType[type] }}</strong>
             <svg-icon name="octicon-triangle-down" :size="14"/>
           </div>

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,9 @@ func AddContentVersionToIssueAndComment(x *xorm.Engine) error {`
`14`	`14`	ContentVersion int `xorm:"NOT NULL DEFAULT 0"`
`15`	`15`	`}`
`16`	`16`
`17`		`- return x.Sync(new(Comment), new(Issue))`
	`17`	`+ _, err := x.SyncWithOptions(xorm.SyncOptions{`
	`18`	`+ IgnoreConstrains: true,`
	`19`	`+ IgnoreIndices: true,`
	`20`	`+ }, new(Comment), new(Issue))`
	`21`	`+ return err`
`18`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,9 @@ func AddForcePushBranchProtection(x *xorm.Engine) error {`
`13`	`13`	ForcePushAllowlistTeamIDs []int64 `xorm:"JSON TEXT"`
`14`	`14`	ForcePushAllowlistDeployKeys bool `xorm:"NOT NULL DEFAULT false"`
`15`	`15`	`}`
`16`		`- return x.Sync(new(ProtectedBranch))`
	`16`	`+ _, err := x.SyncWithOptions(xorm.SyncOptions{`
	`17`	`+ IgnoreConstrains: true,`
	`18`	`+ IgnoreIndices: true,`
	`19`	`+ }, new(ProtectedBranch))`
	`20`	`+ return err`
`17`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,9 @@ func AddSkipSecondaryAuthColumnToOAuth2ApplicationTable(x *xorm.Engine) error {`
`10`	`10`	`type oauth2Application struct {`
`11`	`11`	SkipSecondaryAuthorization bool `xorm:"NOT NULL DEFAULT FALSE"`
`12`	`12`	`}`
`13`		`- return x.Sync(new(oauth2Application))`
	`13`	`+ _, err := x.SyncWithOptions(xorm.SyncOptions{`
	`14`	`+ IgnoreConstrains: true,`
	`15`	`+ IgnoreIndices: true,`
	`16`	`+ }, new(oauth2Application))`
	`17`	`+ return err`
`14`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,9 @@ func AddCommentMetaDataColumn(x *xorm.Engine) error {`
`19`	`19`	CommentMetaData *CommentMetaData `xorm:"JSON TEXT"` // put all non-index metadata in a single field
`20`	`20`	`}`
`21`	`21`
`22`		`- return x.Sync(new(Comment))`
	`22`	`+ _, err := x.SyncWithOptions(xorm.SyncOptions{`
	`23`	`+ IgnoreConstrains: true,`
	`24`	`+ IgnoreIndices: true,`
	`25`	`+ }, new(Comment))`
	`26`	`+ return err`
`23`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,9 @@ func AddBlockAdminMergeOverrideBranchProtection(x *xorm.Engine) error {`
`9`	`9`	`type ProtectedBranch struct {`
`10`	`10`	BlockAdminMergeOverride bool `xorm:"NOT NULL DEFAULT false"`
`11`	`11`	`}`
`12`		`- return x.Sync(new(ProtectedBranch))`
	`12`	`+ _, err := x.SyncWithOptions(xorm.SyncOptions{`
	`13`	`+ IgnoreConstrains: true,`
	`14`	`+ IgnoreIndices: true,`
	`15`	`+ }, new(ProtectedBranch))`
	`16`	`+ return err`
`13`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,9 @@ func AddPriorityToProtectedBranch(x *xorm.Engine) error {`
`12`	`12`	Priority int64 `xorm:"NOT NULL DEFAULT 0"`
`13`	`13`	`}`
`14`	`14`
`15`		`- return x.Sync(new(ProtectedBranch))`
	`15`	`+ _, err := x.SyncWithOptions(xorm.SyncOptions{`
	`16`	`+ IgnoreConstrains: true,`
	`17`	`+ IgnoreIndices: true,`
	`18`	`+ }, new(ProtectedBranch))`
	`19`	`+ return err`
`16`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ func AddTimeEstimateColumnToIssueTable(x *xorm.Engine) error {`
`11`	`11`	`type Issue struct {`
`12`	`12`	TimeEstimate int64 `xorm:"NOT NULL DEFAULT 0"`
`13`	`13`	`}`
`14`		`-`
`15`		`- return x.Sync(new(Issue))`
	`14`	`+ _, err := x.SyncWithOptions(xorm.SyncOptions{`
	`15`	`+ IgnoreConstrains: true,`
	`16`	`+ IgnoreIndices: true,`
	`17`	`+ }, new(Issue))`
	`18`	`+ return err`
`16`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,9 @@ func (pullAutoMerge) TableName() string {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`func AddDeleteBranchAfterMergeForAutoMerge(x *xorm.Engine) error {`
`20`		`- return x.Sync(new(pullAutoMerge))`
	`20`	`+ _, err := x.SyncWithOptions(xorm.SyncOptions{`
	`21`	`+ IgnoreConstrains: true,`
	`22`	`+ IgnoreIndices: true,`
	`23`	`+ }, new(pullAutoMerge))`
	`24`	`+ return err`
`21`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ func AddEphemeralToActionRunner(x *xorm.Engine) error {`
`11`	`11`	`type ActionRunner struct {`
`12`	`12`	Ephemeral bool `xorm:"ephemeral NOT NULL DEFAULT false"`
`13`	`13`	`}`
`14`		`-`
`15`		`- return x.Sync(new(ActionRunner))`
	`14`	`+ _, err := x.SyncWithOptions(xorm.SyncOptions{`
	`15`	`+ IgnoreConstrains: true,`
	`16`	`+ IgnoreIndices: true,`
	`17`	`+ }, new(ActionRunner))`
	`18`	`+ return err`
`16`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,9 @@ func AddDescriptionForSecretsAndVariables(x *xorm.Engine) error {`
`16`	`16`	Description string `xorm:"TEXT"`
`17`	`17`	`}`
`18`	`18`
`19`		`- return x.Sync(new(Secret), new(ActionVariable))`
	`19`	`+ _, err := x.SyncWithOptions(xorm.SyncOptions{`
	`20`	`+ IgnoreConstrains: true,`
	`21`	`+ IgnoreIndices: true,`
	`22`	`+ }, new(Secret), new(ActionVariable))`
	`23`	`+ return err`
`20`	`24`	`}`