Merge branch 'main' into feature/check_ssh_permission

go-gitea · Jul 6, 2023 · 5db4e3c · 5db4e3c
2 parents 69c6ce1 + 45ac90e
commit 5db4e3c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/modules/git/git.go b/modules/git/git.go
@@ -188,7 +188,6 @@ func InitFull(ctx context.Context) (err error) {
 	if CheckGitVersionAtLeast("2.9") == nil {
 		globalCommandArgs = append(globalCommandArgs, "-c", "credential.helper=")
 	}
-
 	SupportProcReceive = CheckGitVersionAtLeast("2.29") == nil
 
 	if setting.LFS.StartServer {

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -224,7 +224,7 @@ repo_path_helper = Remote Git repositories will be saved to this directory.
 lfs_path = Git LFS Root Path
 lfs_path_helper = Files tracked by Git LFS will be stored in this directory. Leave empty to disable.
 run_user = Run As Username
-run_user_helper = Enter the operating system username that Gitea runs as. Note that this user must have access to the repository root path.
+run_user_helper = The operating system username that Gitea runs as. Note that this user must have access to the repository root path.
 domain = Server Domain
 domain_helper = Domain or host address for the server.
 ssh_port = SSH Server Port

diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go
@@ -307,6 +307,11 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
 		return nil, false
 	}
 
+	log.Trace("SyncMirrors [repo: %-v]: syncing branches...", m.Repo)
+	if _, err = repo_module.SyncRepoBranchesWithRepo(ctx, m.Repo, gitRepo, 0); err != nil {
+		log.Error("SyncMirrors [repo: %-v]: failed to synchronize branches: %v", m.Repo, err)
+	}
+
 	log.Trace("SyncMirrors [repo: %-v]: syncing releases with tags...", m.Repo)
 	if err = repo_module.SyncReleasesWithTags(m.Repo, gitRepo); err != nil {
 		log.Error("SyncMirrors [repo: %-v]: failed to synchronize tags to releases: %v", m.Repo, err)

diff --git a/templates/install.tmpl b/templates/install.tmpl
@@ -119,7 +119,7 @@
 					</div>
 					<div class="inline required field {{if .Err_RunUser}}error{{end}}">
 						<label for="run_user">{{.locale.Tr "install.run_user"}}</label>
-						<input id="run_user" name="run_user" value="{{.run_user}}" required>
+						<input id="run_user" name="run_user" value="{{.run_user}}" readonly>
 						<span class="help">{{.locale.Tr "install.run_user_helper"}}</span>
 					</div>
 					<div class="inline required field">