Merge remote-tracking branch 'upstream/main'

* upstream/main: [skip ci] Updated translations via Crowdin File header tweaks (go-gitea#21175) Keep path when creating a new branch (go-gitea#21153)
zjjhot · Sep 16, 2022 · f729e8e · f729e8e
2 parents 46e0597 + bdc4c4c
commit f729e8e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -3092,6 +3092,7 @@ container.details.platform=Plataforma
 container.details.repository_site=Página web do repositório
 container.details.documentation_site=Página web da documentação
 container.pull=Puxar a imagem usando a linha de comandos:
+container.digest=Resumo:
 container.documentation=Para obter mais informações sobre o registo do Container, consulte <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/container/">a documentação</a>.
 container.multi_arch=S.O. / Arquit.
 container.layers=Camadas de imagem

diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go
@@ -427,5 +427,5 @@ func CreateBranch(ctx *context.Context) {
 	}
 
 	ctx.Flash.Success(ctx.Tr("repo.branch.create_success", form.NewBranchName))
-	ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(form.NewBranchName))
+	ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(form.NewBranchName) + "/" + util.PathEscapeSegments(form.CurrentPath))
 }
diff --git a/services/forms/repo_branch_form.go b/services/forms/repo_branch_form.go
@@ -16,6 +16,7 @@ import (
 // NewBranchForm form for creating a new branch
 type NewBranchForm struct {
 	NewBranchName string `binding:"Required;MaxSize(100);GitRefName"`
+	CurrentPath   string
 	CreateTag     bool
 }
 

diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
@@ -94,6 +94,9 @@
 						{{.root.CsrfTokenHtml}}
 						<input type="hidden" name="new_branch_name" v-model="searchTerm">
 						<input type="hidden" name="create_tag" v-model="createTag">
+						{{if $.root.TreePath}}
+							<input type="hidden" name="current_path" value="{{.root.TreePath}}">
+						{{end}}
 					</form>
 				</div>
 			</div>

diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
@@ -409,10 +409,6 @@
           font-size: .5em;
         }
 
-        .file-info {
-          font-size: 13px;
-        }
-
         .file-actions {
           .btn-octicon {
             line-height: 1;
@@ -3051,7 +3047,8 @@ td.blob-excerpt {
   display: flex;
   justify-content: space-between;
   overflow-x: auto;
-  padding: 8px 12px !important;
+  padding: 6px 12px !important;
+  font-size: 13px !important;
 }
 
 .file-info {