options/locale/locale_en-US.ini

@@ -91,7 +91,6 @@ remove = Remove
 remove_all = Remove All
 remove_label_str = Remove item "%s"
 edit = Edit
-view = View
 
 enabled = Enabled
 disabled = Disabled
@@ -356,6 +355,7 @@ code_last_indexed_at = Last indexed %s
 relevant_repositories_tooltip = Repositories that are forks or that have no topic, no icon, and no description are hidden.
 relevant_repositories = Only relevant repositories are being shown, <a href="%s">show unfiltered results</a>.
 
+
 [auth]
 create_new_account = Register Account
 register_helper_msg = Already have an account? Sign in now!
@@ -858,7 +858,7 @@ oauth2_client_secret_hint = The secret will not be shown again after you leave o
 oauth2_application_edit = Edit
 oauth2_application_create_description = OAuth2 applications gives your third-party application access to user accounts on this instance.
 oauth2_application_remove_description = Removing an OAuth2 application will prevent it from accessing authorized user accounts on this instance. Continue?
-oauth2_application_locked = Gitea pre-registers some OAuth2 applications on startup if enabled in config. To prevent unexpected behavior, these can neither be edited nor removed. Please refer to the OAuth2 documentation for more information.
+oauth2_application_locked = Gitea pre-registers some OAuth2 applications on startup if enabled in config. To prevent unexpected bahavior, these can neither be edited nor removed. Please refer to the OAuth2 documentation for more information.
 
 authorized_oauth2_applications = Authorized OAuth2 Applications
 authorized_oauth2_applications_description = You have granted access to your personal Gitea account to these third party applications. Please revoke access for applications you no longer need.
@@ -2507,6 +2507,7 @@ release.releases_for = Releases for %s
 release.tags_for = Tags for %s
 
 branch.name = Branch Name
+branch.search = Search branches
 branch.already_exists = A branch named "%s" already exists.
 branch.delete_head = Delete
 branch.delete = Delete Branch "%s"
@@ -3564,7 +3565,7 @@ type-3.display_name = Organization Project
 
 [git.filemode]
 changed_filemode = %[1]s → %[2]s
-; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", …
+# Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", …
 directory = Directory
 normal_file = Normal file
 executable_file = Executable file

services/task/migrate.go

@@ -42,11 +42,13 @@ func handleCreateError(owner *user_model.User, err error) error {
 }
 
 func runMigrateTask(ctx context.Context, t *admin_model.Task) (err error) {
-	defer func(ctx context.Context) {
+	defer func() {
 		if e := recover(); e != nil {
 			err = fmt.Errorf("PANIC whilst trying to do migrate task: %v", e)
 			log.Critical("PANIC during runMigrateTask[%d] by DoerID[%d] to RepoID[%d] for OwnerID[%d]: %v\nStacktrace: %v", t.ID, t.DoerID, t.RepoID, t.OwnerID, e, log.Stack(2))
 		}
+		// fixme: Because ctx is canceled here, so the db.DefaultContext is needed.
+		ctx := db.DefaultContext
 		if err == nil {
 			err = admin_model.FinishMigrateTask(ctx, t)
 			if err == nil {
@@ -67,7 +69,7 @@ func runMigrateTask(ctx context.Context, t *admin_model.Task) (err error) {
 		}
 
 		// then, do not delete the repository, otherwise the users won't be able to see the last error
-	}(graceful.GetManager().ShutdownContext()) // even if the parent ctx is canceled, this defer-function still needs to update the task record in database
+	}()
 
 	if err = t.LoadRepo(ctx); err != nil {
 		return err

templates/org/team/teams.tmpl

@@ -16,7 +16,6 @@
 					<div class="ui top attached header">
 						<a class="text black" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.Name}}</strong></a>
 						<div class="ui right">
-							<a class="ui primary tiny button" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{ctx.Locale.Tr "view"}}</a>
 							{{if .IsMember ctx $.SignedUser.ID}}
 								<form>
 									<button class="ui red tiny button delete-button" data-modal-id="leave-team"

templates/repo/sub_menu.tmpl

@@ -38,7 +38,7 @@
 	</div>
 	<a class="ui segment language-stats show-panel toggle" data-panel=".repository-summary > .sub-menu">
 		{{range .LanguageStats}}
-		<div class="bar" style="width: {{.Percentage}}%; background-color: {{.Color}}" data-tooltip-placement="top" data-tooltip-content={{.Language}} data-tooltip-follow-cursor="horizontal"></div>
+		<div class="bar" style="width: {{.Percentage}}%; background-color: {{.Color}}" data-tooltip-placement="top" data-tooltip-content={{.Language}}></div>
 		{{end}}
 	</a>
 	{{end}}

web_src/js/modules/tippy.js

@@ -1,4 +1,4 @@
-import tippy, {followCursor} from 'tippy.js';
+import tippy from 'tippy.js';
 
 const visibleInstances = new Set();
 
@@ -35,7 +35,6 @@ export function createTippy(target, opts = {}) {
     arrow: `<svg width="16" height="7"><path d="m0 7 8-7 8 7Z" class="tippy-svg-arrow-outer"/><path d="m0 8 8-7 8 7Z" class="tippy-svg-arrow-inner"/></svg>`,
     role: 'menu', // HTML role attribute, only tooltips should use "tooltip"
     theme: other.role || 'menu', // CSS theme, we support either "tooltip" or "menu"
-    plugins: [followCursor],
     ...other,
   });
 
@@ -79,7 +78,6 @@ function attachTooltip(target, content = null) {
     theme: 'tooltip',
     hideOnClick,
     placement: target.getAttribute('data-tooltip-placement') || 'top-start',
-    followCursor: target.getAttribute('data-tooltip-follow-cursor') || false,
     ...(target.getAttribute('data-tooltip-interactive') === 'true' ? {interactive: true, aria: {content: 'describedby', expanded: false}} : {}),
   };