commitfor-closed-social0afcb843d7
Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 17:13:29 2016 -0600 Removed Upload stats as the upload table is just a temporary table commit7ecd73ff55
Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 08:42:41 2016 -0600 Fix for CodeMirror mode commitc29b9ab531
Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 08:03:33 2016 -0600 Made tabbing in editor use spaces commit23af384c53
Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:56:46 2016 -0600 Fix for data-url commitcfb8a97591
Merge: 7fc8a89 991ce42 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:42:53 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit 7fc8a89cb495478225b02d613e647f99a1489634 Merge: fd3d86c c03d040 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:40:00 2016 -0600 Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:39:44 2016 -0600 Code cleanup commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 29 15:38:23 2016 -0600 Code cleanup commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 18:36:01 2016 -0600 Code cleanup and fixes commit c2895dc742f25f8412879c9fa15e18f27f42f194 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 18:24:04 2016 -0600 Fixes per Unknwon's requests commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef Merge: 889e9fa ad7ea88 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 17:13:43 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go modules/setting/setting.go commit 889e9faf1bd8559a4979c8f46005d488c1a234d4 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:09:18 2016 -0600 Fix in gogs.js commit 47603edf223f147b114be65f3bd27bc1e88827a5 Merge: bb57912 cf85e9e Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:07:36 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit bb5791255867a71c11a77b639db050ad09c597a4 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:02:18 2016 -0600 Update for using CodeMirror mode addon commit d10d128c51039be19e2af9c66c63db66a9f2ec6d Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Tue Jul 19 16:12:57 2016 -0600 Update for Edit commit 34a34982025144e3225e389f7849eb6273c1d576 Merge: fa1b752 1c7dcdd Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Tue Jul 19 11:52:02 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go commit fa1b752be29cd455c5184ddac2ffe80b3489763e Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 15 18:35:42 2016 -0600 Feature for editing, creating, uploading and deleting files
@ -0,0 +1,47 @@ | |||
// Copyright 2015 The Gogs Authors. All rights reserved. | |||
// Use of this source code is governed by a MIT-style | |||
// license that can be found in the LICENSE file. | |||
package models | |||
import ( | |||
"sync" | |||
) | |||
// workingPool represents a pool of working status which makes sure | |||
// that only one instance of same task is performing at a time. | |||
// However, different type of tasks can performing at the same time. | |||
type workingPool struct { | |||
lock sync.Mutex | |||
pool map[string]*sync.Mutex | |||
count map[string]int | |||
} | |||
// CheckIn checks in a task and waits if others are running. | |||
func (p *workingPool) CheckIn(name string) { | |||
p.lock.Lock() | |||
lock, has := p.pool[name] | |||
if !has { | |||
lock = &sync.Mutex{} | |||
p.pool[name] = lock | |||
} | |||
p.count[name]++ | |||
p.lock.Unlock() | |||
lock.Lock() | |||
} | |||
// CheckOut checks out a task to let other tasks run. | |||
func (p *workingPool) CheckOut(name string) { | |||
p.lock.Lock() | |||
defer p.lock.Unlock() | |||
p.pool[name].Unlock() | |||
if p.count[name] == 1 { | |||
delete(p.pool, name) | |||
delete(p.count, name) | |||
} else { | |||
p.count[name]-- | |||
} | |||
} |
@ -0,0 +1,54 @@ | |||
// Copyright 2016 The Gogs Authors. All rights reserved. | |||
// Use of this source code is governed by a MIT-style | |||
// license that can be found in the LICENSE file. | |||
package repo | |||
import ( | |||
"github.com/gogits/gogs/models" | |||
"github.com/gogits/gogs/modules/auth" | |||
"github.com/gogits/gogs/modules/context" | |||
"github.com/gogits/gogs/modules/log" | |||
) | |||
func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) { | |||
branchName := ctx.Repo.BranchName | |||
treeName := ctx.Repo.TreeName | |||
if ctx.HasError() { | |||
ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName) | |||
return | |||
} | |||
if err := ctx.Repo.Repository.DeleteRepoFile(ctx.User, branchName, treeName, form.CommitSummary); err != nil { | |||
ctx.Handle(500, "DeleteRepoFile", err) | |||
return | |||
} | |||
// Was successful, so now need to call models.CommitRepoAction() with the new commitID for webhooks and watchers | |||
if branch, err := ctx.Repo.Repository.GetBranch(branchName); err != nil { | |||
log.Error(4, "repo.Repository.GetBranch(%s): %v", branchName, err) | |||
} else if commit, err := branch.GetCommit(); err != nil { | |||
log.Error(4, "branch.GetCommit(): %v", err) | |||
} else { | |||
pc := &models.PushCommits{ | |||
Len: 1, | |||
Commits: []*models.PushCommit{&models.PushCommit{ | |||
commit.ID.String(), | |||
commit.Message(), | |||
commit.Author.Email, | |||
commit.Author.Name, | |||
}}, | |||
} | |||
oldCommitID := ctx.Repo.CommitID | |||
newCommitID := commit.ID.String() | |||
if err := models.CommitRepoAction(ctx.User.ID, ctx.Repo.Owner.ID, ctx.User.LowerName, ctx.Repo.Owner.Email, | |||
ctx.Repo.Repository.ID, ctx.Repo.Owner.LowerName, ctx.Repo.Repository.Name, "refs/heads/"+branchName, pc, | |||
oldCommitID, newCommitID); err != nil { | |||
log.Error(4, "models.CommitRepoAction(branch = %s): %v", branchName, err) | |||
} | |||
models.HookQueue.Add(ctx.Repo.Repository.ID) | |||
} | |||
ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName) | |||
} |
@ -0,0 +1,359 @@ | |||
// Copyright 2016 The Gogs Authors. All rights reserved. | |||
// Use of this source code is governed by a MIT-style | |||
// license that can be found in the LICENSE file. | |||
package repo | |||
import ( | |||
"io/ioutil" | |||
"path" | |||
"strings" | |||
"github.com/gogits/git-module" | |||
"github.com/gogits/gogs/models" | |||
"github.com/gogits/gogs/modules/auth" | |||
"github.com/gogits/gogs/modules/base" | |||
"github.com/gogits/gogs/modules/context" | |||
"github.com/gogits/gogs/modules/log" | |||
"github.com/gogits/gogs/modules/setting" | |||
"github.com/gogits/gogs/modules/template" | |||
) | |||
const ( | |||
EDIT base.TplName = "repo/edit" | |||
DIFF_PREVIEW base.TplName = "repo/diff_preview" | |||
DIFF_PREVIEW_NEW base.TplName = "repo/diff_preview_new" | |||
) | |||
func EditFile(ctx *context.Context) { | |||
editFile(ctx, false) | |||
} | |||
func NewFile(ctx *context.Context) { | |||
editFile(ctx, true) | |||
} | |||
func editFile(ctx *context.Context, isNewFile bool) { | |||
ctx.Data["PageIsEdit"] = true | |||
ctx.Data["IsNewFile"] = isNewFile | |||
ctx.Data["RequireHighlightJS"] = true | |||
userName := ctx.Repo.Owner.Name | |||
repoName := ctx.Repo.Repository.Name | |||
branchName := ctx.Repo.BranchName | |||
branchLink := ctx.Repo.RepoLink + "/src/" + branchName | |||
treeName := ctx.Repo.TreeName | |||
var treeNames []string | |||
if len(treeName) > 0 { | |||
treeNames = strings.Split(treeName, "/") | |||
} | |||
if !isNewFile { | |||
entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treeName) | |||
if err != nil && git.IsErrNotExist(err) { | |||
ctx.Handle(404, "GetTreeEntryByPath", err) | |||
return | |||
} | |||
if (ctx.Repo.IsViewCommit) || entry == nil || entry.IsDir() { | |||
ctx.Handle(404, "repo.Home", nil) | |||
return | |||
} | |||
blob := entry.Blob() | |||
dataRc, err := blob.Data() | |||
if err != nil { | |||
ctx.Handle(404, "blob.Data", err) | |||
return | |||
} | |||
ctx.Data["FileSize"] = blob.Size() | |||
ctx.Data["FileName"] = blob.Name() | |||
buf := make([]byte, 1024) | |||
n, _ := dataRc.Read(buf) | |||
if n > 0 { | |||
buf = buf[:n] | |||
} | |||
_, isTextFile := base.IsTextFile(buf) | |||
if !isTextFile { | |||
ctx.Handle(404, "repo.Home", nil) | |||
return | |||
} | |||
d, _ := ioutil.ReadAll(dataRc) | |||
buf = append(buf, d...) | |||
if err, content := template.ToUtf8WithErr(buf); err != nil { | |||
if err != nil { | |||
log.Error(4, "Convert content encoding: %s", err) | |||
} | |||
ctx.Data["FileContent"] = string(buf) | |||
} else { | |||
ctx.Data["FileContent"] = content | |||
} | |||
} else { | |||
treeNames = append(treeNames, "") | |||
} | |||
ctx.Data["RequireSimpleMDE"] = true | |||
ctx.Data["UserName"] = userName | |||
ctx.Data["RepoName"] = repoName | |||
ctx.Data["BranchName"] = branchName | |||
ctx.Data["TreeName"] = treeName | |||
ctx.Data["TreeNames"] = treeNames | |||
ctx.Data["BranchLink"] = branchLink | |||
ctx.Data["CommitSummary"] = "" | |||
ctx.Data["CommitMessage"] = "" | |||
ctx.Data["CommitChoice"] = "direct" | |||
ctx.Data["NewBranchName"] = "" | |||
ctx.Data["CommitDirectlyToThisBranch"] = ctx.Tr("repo.commit_directly_to_this_branch", "<strong class=\"branch-name\">"+branchName+"</strong>") | |||
ctx.Data["CreateNewBranch"] = ctx.Tr("repo.create_new_branch", "<strong>"+ctx.Tr("repo.new_branch")+"</strong>") | |||
ctx.Data["LastCommit"] = ctx.Repo.Commit.ID | |||
ctx.Data["MdFileExtensions"] = strings.Join(setting.Markdown.MdFileExtensions, ",") | |||
ctx.Data["LineWrapExtensions"] = strings.Join(setting.Editor.LineWrapExtensions, ",") | |||
ctx.Data["PreviewTabApis"] = strings.Join(setting.Editor.PreviewTabApis, ",") | |||
ctx.Data["PreviewDiffUrl"] = ctx.Repo.RepoLink + "/preview/" + branchName + "/" + treeName | |||
ctx.HTML(200, EDIT) | |||
} | |||
func EditFilePost(ctx *context.Context, form auth.EditRepoFileForm) { | |||
editFilePost(ctx, form, false) | |||
} | |||
func NewFilePost(ctx *context.Context, form auth.EditRepoFileForm) { | |||
editFilePost(ctx, form, true) | |||
} | |||
func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bool) { | |||
ctx.Data["PageIsEdit"] = true | |||
ctx.Data["IsNewFile"] = isNewFile | |||
ctx.Data["RequireHighlightJS"] = true | |||
userName := ctx.Repo.Owner.Name | |||
repoName := ctx.Repo.Repository.Name | |||
oldBranchName := ctx.Repo.BranchName | |||
branchName := oldBranchName | |||
branchLink := ctx.Repo.RepoLink + "/src/" + branchName | |||
oldTreeName := ctx.Repo.TreeName | |||
content := form.Content | |||
commitChoice := form.CommitChoice | |||
lastCommit := form.LastCommit | |||
if commitChoice == "commit-to-new-branch" { | |||
branchName = form.NewBranchName | |||
} | |||
treeName := form.TreeName | |||
treeName = strings.Trim(treeName, " ") | |||
treeName = strings.Trim(treeName, "/") | |||
var treeNames []string | |||
if len(treeName) > 0 { | |||
treeNames = strings.Split(treeName, "/") | |||
} | |||
ctx.Data["RequireSimpleMDE"] = true | |||
ctx.Data["UserName"] = userName | |||
ctx.Data["RepoName"] = repoName | |||
ctx.Data["BranchName"] = branchName | |||
ctx.Data["TreeName"] = treeName | |||
ctx.Data["TreeNames"] = treeNames | |||
ctx.Data["BranchLink"] = branchLink | |||
ctx.Data["FileContent"] = content | |||
ctx.Data["CommitSummary"] = form.CommitSummary | |||
ctx.Data["CommitMessage"] = form.CommitMessage | |||
ctx.Data["CommitChoice"] = commitChoice | |||
ctx.Data["NewBranchName"] = branchName | |||
ctx.Data["CommitDirectlyToThisBranch"] = ctx.Tr("repo.commit_directly_to_this_branch", "<strong class=\"branch-name\">"+oldBranchName+"</strong>") | |||
ctx.Data["CreateNewBranch"] = ctx.Tr("repo.create_new_branch", "<strong>"+ctx.Tr("repo.new_branch")+"</strong>") | |||
ctx.Data["LastCommit"] = ctx.Repo.Commit.ID | |||
ctx.Data["MdFileExtensions"] = strings.Join(setting.Markdown.MdFileExtensions, ",") | |||
ctx.Data["LineWrapExtensions"] = strings.Join(setting.Editor.LineWrapExtensions, ",") | |||
ctx.Data["PreviewTabApis"] = strings.Join(setting.Editor.PreviewTabApis, ",") | |||
ctx.Data["PreviewDiffUrl"] = ctx.Repo.RepoLink + "/preview/" + branchName + "/" + treeName | |||
if ctx.HasError() { | |||
ctx.HTML(200, EDIT) | |||
return | |||
} | |||
if len(treeName) == 0 { | |||
ctx.Data["Err_Filename"] = true | |||
ctx.RenderWithErr(ctx.Tr("repo.filename_cannot_be_empty"), EDIT, &form) | |||
log.Error(4, "%s: %s", "EditFile", "Filename can't be empty") | |||
return | |||
} | |||
if oldBranchName != branchName { | |||
if _, err := ctx.Repo.Repository.GetBranch(branchName); err == nil { | |||
ctx.Data["Err_Branchname"] = true | |||
ctx.RenderWithErr(ctx.Tr("repo.branch_already_exists"), EDIT, &form) | |||
log.Error(4, "%s: %s - %s", "BranchName", branchName, "Branch already exists") | |||
return | |||
} | |||
} | |||
treepath := "" | |||
for index, part := range treeNames { | |||
treepath = path.Join(treepath, part) | |||
entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treepath) | |||
if err != nil { | |||
// Means there is no item with that name, so we're good | |||
break | |||
} | |||
if index != len(treeNames)-1 { | |||
if !entry.IsDir() { | |||
ctx.Data["Err_Filename"] = true | |||
ctx.RenderWithErr(ctx.Tr("repo.directory_is_a_file"), EDIT, &form) | |||
log.Error(4, "%s: %s - %s", "EditFile", treeName, "Directory given is a file") | |||
return | |||
} | |||
} else { | |||
if entry.IsDir() { | |||
ctx.Data["Err_Filename"] = true | |||
ctx.RenderWithErr(ctx.Tr("repo.filename_is_a_directory"), EDIT, &form) | |||
log.Error(4, "%s: %s - %s", "EditFile", treeName, "Filename given is a dirctory") | |||
return | |||
} | |||
} | |||
} | |||
if !isNewFile { | |||
_, err := ctx.Repo.Commit.GetTreeEntryByPath(oldTreeName) | |||
if err != nil && git.IsErrNotExist(err) { | |||
ctx.Data["Err_Filename"] = true | |||
ctx.RenderWithErr(ctx.Tr("repo.file_editing_no_longer_exists"), EDIT, &form) | |||
log.Error(4, "%s: %s / %s - %s", "EditFile", branchName, oldTreeName, "File doesn't exist for editing") | |||
return | |||
} | |||
if lastCommit != ctx.Repo.CommitID { | |||
if files, err := ctx.Repo.Commit.GetFilesChangedSinceCommit(lastCommit); err == nil { | |||
for _, file := range files { | |||
if file == treeName { | |||
name := ctx.Repo.Commit.Author.Name | |||
if u, err := models.GetUserByEmail(ctx.Repo.Commit.Author.Email); err == nil { | |||
name = `<a href="` + setting.AppSubUrl + "/" + u.Name + `" target="_blank">` + u.Name + `</a>` | |||
} | |||
message := ctx.Tr("repo.user_has_committed_since_you_started_editing", name) + | |||
` <a href="` + ctx.Repo.RepoLink + "/commit/" + ctx.Repo.CommitID + `" target="_blank">` + ctx.Tr("repo.see_what_changed") + `</a>` + | |||
" " + ctx.Tr("repo.pressing_commit_again_will_overwrite_those_changes", "<em>"+ctx.Tr("repo.commit_changes")+"</em>") | |||
log.Error(4, "%s: %s / %s - %s", "EditFile", branchName, oldTreeName, "File updated by another user") | |||
ctx.RenderWithErr(message, EDIT, &form) | |||
return | |||
} | |||
} | |||
} | |||
} | |||
} | |||
if oldTreeName != treeName { | |||
// We have a new filename (rename or completely new file) so we need to make sure it doesn't already exist, can't clobber | |||
_, err := ctx.Repo.Commit.GetTreeEntryByPath(treeName) | |||
if err == nil { | |||
ctx.Data["Err_Filename"] = true | |||
ctx.RenderWithErr(ctx.Tr("repo.file_already_exists"), EDIT, &form) | |||
log.Error(4, "%s: %s - %s", "NewFile", treeName, "File already exists, can't create new") | |||
return | |||
} | |||
} | |||
message := "" | |||
if form.CommitSummary != "" { | |||
message = strings.Trim(form.CommitSummary, " ") | |||
} else { | |||
if isNewFile { | |||
message = ctx.Tr("repo.add") + " '" + treeName + "'" | |||
} else { | |||
message = ctx.Tr("repo.update") + " '" + treeName + "'" | |||
} | |||
} | |||
if strings.Trim(form.CommitMessage, " ") != "" { | |||
message += "\n\n" + strings.Trim(form.CommitMessage, " ") | |||
} | |||
if err := ctx.Repo.Repository.UpdateRepoFile(ctx.User, oldBranchName, branchName, oldTreeName, treeName, content, message, isNewFile); err != nil { | |||
ctx.Data["Err_Filename"] = true | |||
ctx.RenderWithErr(ctx.Tr("repo.unable_to_update_file"), EDIT, &form) | |||
log.Error(4, "%s: %v", "EditFile", err) | |||
return | |||
} | |||
if branch, err := ctx.Repo.Repository.GetBranch(branchName); err != nil { | |||
log.Error(4, "repo.Repository.GetBranch(%s): %v", branchName, err) | |||
} else if commit, err := branch.GetCommit(); err != nil { | |||
log.Error(4, "branch.GetCommit(): %v", err) | |||
} else { | |||
pc := &models.PushCommits{ | |||
Len: 1, | |||
Commits: []*models.PushCommit{&models.PushCommit{ | |||
commit.ID.String(), | |||
commit.Message(), | |||
commit.Author.Email, | |||
commit.Author.Name, | |||
}}, | |||
} | |||
oldCommitID := ctx.Repo.CommitID | |||
newCommitID := commit.ID.String() | |||
if branchName != oldBranchName { | |||
oldCommitID = "0000000000000000000000000000000000000000" // New Branch so we use all 0s | |||
} | |||
if err := models.CommitRepoAction(ctx.User.ID, ctx.Repo.Owner.ID, ctx.User.LowerName, ctx.Repo.Owner.Email, | |||
ctx.Repo.Repository.ID, ctx.Repo.Owner.LowerName, ctx.Repo.Repository.Name, "refs/heads/"+branchName, pc, | |||
oldCommitID, newCommitID); err != nil { | |||
log.Error(4, "models.CommitRepoAction(branch = %s): %v", branchName, err) | |||
} | |||
models.HookQueue.Add(ctx.Repo.Repository.ID) | |||
} | |||
// Leaving this off until forked repos that get a branch can compare with forks master and not upstream | |||
//if oldBranchName != branchName { | |||
// ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/compare/" + oldBranchName + "..." + branchName)) | |||
//} else { | |||
ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName)) | |||
//} | |||
} | |||
func DiffPreviewPost(ctx *context.Context, form auth.EditPreviewDiffForm) { | |||
userName := ctx.Repo.Owner.Name | |||
repoName := ctx.Repo.Repository.Name | |||
branchName := ctx.Repo.BranchName | |||
treeName := ctx.Repo.TreeName | |||
content := form.Content | |||
entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treeName) | |||
if (err != nil && git.IsErrNotExist(err)) || entry.IsDir() { | |||
ctx.Data["FileContent"] = content | |||
ctx.HTML(200, DIFF_PREVIEW_NEW) | |||
return | |||
} | |||
diff, err := ctx.Repo.Repository.GetPreviewDiff(models.RepoPath(userName, repoName), branchName, treeName, content, setting.Git.MaxGitDiffLines, setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles) | |||
if err != nil { | |||
ctx.Error(404, err.Error()) | |||
log.Error(4, "%s: %v", "GetPreviewDiff", err) | |||
return | |||
} | |||
if diff.NumFiles() == 0 { | |||
ctx.Error(200, ctx.Tr("repo.no_changes_to_show")) | |||
return | |||
} | |||
ctx.Data["IsSplitStyle"] = ctx.Query("style") == "split" | |||
ctx.Data["File"] = diff.Files[0] | |||
ctx.HTML(200, DIFF_PREVIEW) | |||
} | |||
func EscapeUrl(str string) string { | |||
return strings.NewReplacer("?", "%3F", "%", "%25", "#", "%23", " ", "%20", "^", "%5E", "\\", "%5C", "{", "%7B", "}", "%7D", "|", "%7C").Replace(str) | |||
} |
@ -0,0 +1,257 @@ | |||
// Copyright 2016 The Gogs Authors. All rights reserved. | |||
// Use of this source code is governed by a MIT-style | |||
// license that can be found in the LICENSE file. | |||
package repo | |||
import ( | |||
"strings" | |||
"fmt" | |||
"github.com/gogits/gogs/models" | |||
"github.com/gogits/gogs/modules/auth" | |||
"github.com/gogits/gogs/modules/base" | |||
"github.com/gogits/gogs/modules/context" | |||
"github.com/gogits/gogs/modules/log" | |||
"github.com/gogits/gogs/modules/setting" | |||
"net/http" | |||
"path" | |||
) | |||
const ( | |||
UPLOAD base.TplName = "repo/upload" | |||
) | |||
func renderUploadSettings(ctx *context.Context) { | |||
ctx.Data["RequireDropzone"] = true | |||
ctx.Data["IsUploadEnabled"] = setting.UploadEnabled | |||
ctx.Data["UploadAllowedTypes"] = setting.UploadAllowedTypes | |||
ctx.Data["UploadMaxSize"] = setting.UploadMaxSize | |||
ctx.Data["UploadMaxFiles"] = setting.UploadMaxFiles | |||
} | |||
func UploadFile(ctx *context.Context) { | |||
ctx.Data["PageIsUpload"] = true | |||
userName := ctx.Repo.Owner.Name | |||
repoName := ctx.Repo.Repository.Name | |||
branchName := ctx.Repo.BranchName | |||
branchLink := ctx.Repo.RepoLink + "/src/" + branchName | |||
treeName := ctx.Repo.TreeName | |||
treeNames := []string{""} | |||
if len(treeName) > 0 { | |||
treeNames = strings.Split(treeName, "/") | |||
} | |||
ctx.Data["UserName"] = userName | |||
ctx.Data["RepoName"] = repoName | |||
ctx.Data["BranchName"] = branchName | |||
ctx.Data["TreeName"] = treeName | |||
ctx.Data["TreeNames"] = treeNames | |||
ctx.Data["BranchLink"] = branchLink | |||
ctx.Data["CommitSummary"] = "" | |||
ctx.Data["CommitMessage"] = "" | |||
ctx.Data["CommitChoice"] = "direct" | |||
ctx.Data["NewBranchName"] = "" | |||
ctx.Data["CommitDirectlyToThisBranch"] = ctx.Tr("repo.commit_directly_to_this_branch", "<strong class=\"branch-name\">"+branchName+"</strong>") | |||
ctx.Data["CreateNewBranch"] = ctx.Tr("repo.create_new_branch", "<strong>"+ctx.Tr("repo.new_branch")+"</strong>") | |||
renderUploadSettings(ctx) | |||
ctx.HTML(200, UPLOAD) | |||
} | |||
func UploadFilePost(ctx *context.Context, form auth.UploadRepoFileForm) { | |||
ctx.Data["PageIsUpload"] = true | |||
renderUploadSettings(ctx) | |||
userName := ctx.Repo.Owner.Name | |||
repoName := ctx.Repo.Repository.Name | |||
oldBranchName := ctx.Repo.BranchName | |||
branchName := oldBranchName | |||
branchLink := ctx.Repo.RepoLink + "/src/" + branchName | |||
commitChoice := form.CommitChoice | |||
files := form.Files | |||
if commitChoice == "commit-to-new-branch" { | |||
branchName = form.NewBranchName | |||
} | |||
treeName := form.TreeName | |||
treeName = strings.Trim(treeName, " ") | |||
treeName = strings.Trim(treeName, "/") | |||
treeNames := []string{""} | |||
if len(treeName) > 0 { | |||
treeNames = strings.Split(treeName, "/") | |||
} | |||
ctx.Data["UserName"] = userName | |||
ctx.Data["RepoName"] = repoName | |||
ctx.Data["BranchName"] = branchName | |||
ctx.Data["TreeName"] = treeName | |||
ctx.Data["TreeNames"] = treeNames | |||
ctx.Data["BranchLink"] = branchLink | |||
ctx.Data["CommitSummary"] = form.CommitSummary | |||
ctx.Data["CommitMessage"] = form.CommitMessage | |||
ctx.Data["CommitChoice"] = commitChoice | |||
ctx.Data["NewBranchName"] = branchName | |||
ctx.Data["CommitDirectlyToThisBranch"] = ctx.Tr("repo.commit_directly_to_this_branch", "<strong class=\"branch-name\">"+oldBranchName+"</strong>") | |||
ctx.Data["CreateNewBranch"] = ctx.Tr("repo.create_new_branch", "<strong>"+ctx.Tr("repo.new_branch")+"</strong>") | |||
if ctx.HasError() { | |||
ctx.HTML(200, UPLOAD) | |||
return | |||
} | |||
if oldBranchName != branchName { | |||
if _, err := ctx.Repo.Repository.GetBranch(branchName); err == nil { | |||
ctx.Data["Err_Branchname"] = true | |||
ctx.RenderWithErr(ctx.Tr("repo.branch_already_exists"), UPLOAD, &form) | |||
log.Error(4, "%s: %s - %s", "BranchName", branchName, "Branch already exists") | |||
return | |||
} | |||
} | |||
treepath := "" | |||
for _, part := range treeNames { | |||
treepath = path.Join(treepath, part) | |||
entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treepath) | |||
if err != nil { | |||
// Means there is no item with that name, so we're good | |||
break | |||
} | |||
if !entry.IsDir() { | |||
ctx.Data["Err_Filename"] = true | |||
ctx.RenderWithErr(ctx.Tr("repo.directory_is_a_file"), UPLOAD, &form) | |||
log.Error(4, "%s: %s - %s", "UploadFile", treeName, "Directory given is a file") | |||
return | |||
} | |||
} | |||
message := "" | |||
if form.CommitSummary != "" { | |||
message = strings.Trim(form.CommitSummary, " ") | |||
} else { | |||
message = ctx.Tr("repo.add_files_to_dir", "'"+treeName+"'") | |||
} | |||
if strings.Trim(form.CommitMessage, " ") != "" { | |||
message += "\n\n" + strings.Trim(form.CommitMessage, " ") | |||
} | |||
if err := ctx.Repo.Repository.UploadRepoFiles(ctx.User, oldBranchName, branchName, treeName, message, files); err != nil { | |||
ctx.Data["Err_Directory"] = true | |||
ctx.RenderWithErr(ctx.Tr("repo.unable_to_upload_files"), UPLOAD, &form) | |||
log.Error(4, "%s: %v", "UploadFile", err) | |||
return | |||
} | |||
// Was successful, so now need to call models.CommitRepoAction() with the new commitID for webhooks and watchers | |||
if branch, err := ctx.Repo.Repository.GetBranch(branchName); err != nil { | |||
log.Error(4, "repo.Repository.GetBranch(%s): %v", branchName, err) | |||
} else if commit, err := branch.GetCommit(); err != nil { | |||
log.Error(4, "branch.GetCommit(): %v", err) | |||
} else { | |||
pc := &models.PushCommits{ | |||
Len: 1, | |||
Commits: []*models.PushCommit{&models.PushCommit{ | |||
commit.ID.String(), | |||
commit.Message(), | |||
commit.Author.Email, | |||
commit.Author.Name, | |||
}}, | |||
} | |||
oldCommitID := ctx.Repo.CommitID | |||
newCommitID := commit.ID.String() | |||
if branchName != oldBranchName { | |||
oldCommitID = "0000000000000000000000000000000000000000" // New Branch so we use all 0s | |||
} | |||
if err := models.CommitRepoAction(ctx.User.ID, ctx.Repo.Owner.ID, ctx.User.LowerName, ctx.Repo.Owner.Email, | |||
ctx.Repo.Repository.ID, ctx.Repo.Owner.LowerName, ctx.Repo.Repository.Name, "refs/heads/"+branchName, pc, | |||
oldCommitID, newCommitID); err != nil { | |||
log.Error(4, "models.CommitRepoAction(branch = %s): %v", branchName, err) | |||
} | |||
models.HookQueue.Add(ctx.Repo.Repository.ID) | |||
} | |||
// Leaving this off until forked repos that get a branch can compare with forks master and not upstream | |||
//if oldBranchName != branchName { | |||
// ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/compare/" + oldBranchName + "..." + branchName)) | |||
//} else { | |||
ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName)) | |||
//} | |||
} | |||
func UploadFileToServer(ctx *context.Context) { | |||
if !setting.UploadEnabled { | |||
ctx.Error(404, "upload is not enabled") | |||
return | |||
} | |||
file, header, err := ctx.Req.FormFile("file") | |||
if err != nil { | |||
ctx.Error(500, fmt.Sprintf("FormFile: %v", err)) | |||
return | |||
} | |||
defer file.Close() | |||
buf := make([]byte, 1024) | |||
n, _ := file.Read(buf) | |||
if n > 0 { | |||
buf = buf[:n] | |||
} | |||
fileType := http.DetectContentType(buf) | |||
if len(setting.UploadAllowedTypes) > 0 { | |||
allowedTypes := strings.Split(setting.UploadAllowedTypes, ",") | |||
allowed := false | |||
for _, t := range allowedTypes { | |||
t := strings.Trim(t, " ") | |||
if t == "*/*" || t == fileType { | |||
allowed = true | |||
break | |||
} | |||
} | |||
if !allowed { | |||
ctx.Error(400, ErrFileTypeForbidden.Error()) | |||
return | |||
} | |||
} | |||
up, err := models.NewUpload(header.Filename, buf, file, ctx.User.ID, ctx.Repo.Repository.ID) | |||
if err != nil { | |||
ctx.Error(500, fmt.Sprintf("NewUpload: %v", err)) | |||
return | |||
} | |||
log.Trace("New file uploaded: %s", up.UUID) | |||
ctx.JSON(200, map[string]string{ | |||
"uuid": up.UUID, | |||
}) | |||
} | |||
func RemoveUploadFileFromServer(ctx *context.Context, form auth.RemoveUploadFileForm) { | |||
if !setting.UploadEnabled { | |||
ctx.Error(404, "upload is not enabled") | |||
return | |||
} | |||
if len(form.File) == 0 { | |||
ctx.Error(404, "invalid params") | |||
return | |||
} | |||
uuid := form.File | |||
if err := models.RemoveUpload(uuid, ctx.User.ID, ctx.Repo.Repository.ID); err != nil { | |||
ctx.Error(500, fmt.Sprintf("RemoveUpload: %v", err)) | |||
return | |||
} | |||
log.Trace("Upload file removed: %s", uuid) | |||
ctx.JSON(200, map[string]string{ | |||
"uuid": uuid, | |||
}) | |||
} |
@ -1,15 +1,15 @@ | |||
{{if .Flash.ErrorMsg}} | |||
<div class="ui negative message"> | |||
<p>{{.Flash.ErrorMsg}}</p> | |||
<p>{{.Flash.ErrorMsg | Safe}}</p> | |||
</div> | |||
{{end}} | |||
{{if .Flash.SuccessMsg}} | |||
<div class="ui positive message"> | |||
<p>{{.Flash.SuccessMsg}}</p> | |||
<p>{{.Flash.SuccessMsg | Safe}}</p> | |||
</div> | |||
{{end}} | |||
{{if .Flash.InfoMsg}} | |||
<div class="ui info message"> | |||
<p>{{.Flash.InfoMsg}}</p> | |||
<p>{{.Flash.InfoMsg| Safe}}</p> | |||
</div> | |||
{{end}} |
@ -0,0 +1,32 @@ | |||
{{$highlightClass := .File.GetHighlightClass}} | |||
<div class="diff-file-box diff-box file-content" id="diff-{{.Index}}"> | |||
<div class="ui attached table segment"> | |||
<div class="file-body file-code code-view code-diff"> | |||
<table> | |||
<tbody> | |||
{{range $j, $section := .File.Sections}} | |||
{{range $k, $line := $section.Lines}} | |||
<tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}"> | |||
{{if eq .GetType 4}} | |||
<td colspan="2" class="lines-num"> | |||
{{/* {{if gt $j 0}}<span class="fold octicon octicon-fold"></span>{{end}} */}} | |||
</td> | |||
{{else}} | |||
<td class="lines-num lines-num-old"> | |||
<span rel="{{if $line.LeftIdx}}diff-{{Sha1 $.File.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span> | |||
</td> | |||
<td class="lines-num lines-num-new"> | |||
<span rel="{{if $line.RightIdx}}diff-{{Sha1 $.File.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span> | |||
</td> | |||
{{end}} | |||
<td class="lines-code"> | |||
<pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre> | |||
</td> | |||
</tr> | |||
{{end}} | |||
{{end}} | |||
</tbody> | |||
</table> | |||
</div> | |||
</div> | |||
</div> |
@ -0,0 +1,12 @@ | |||
<div id="file-content" class="ui attached table segment"> | |||
<div class="file-view code-view has-emoji"> | |||
<table> | |||
<tbody> | |||
<tr> | |||
<td class="lines-num"></td> | |||
<td class="lines-code"><pre><code><ol class="linenums">{{.FileContent}}</ol></code></pre></td> | |||
</tr> | |||
</tbody> | |||
</table> | |||
</div> | |||
</div> |
@ -0,0 +1,97 @@ | |||
{{template "base/head" .}} | |||
<div class="repository file edit"> | |||
{{template "repo/header" .}} | |||
<div class="ui container"> | |||
{{.branchName}} | |||
{{template "base/alert" .}} | |||
<form class="ui edit form" action="{{EscapePound $.Link}}" method="post"> | |||
{{.CsrfTokenHtml}} | |||
<input type="hidden" name="last_commit" value="{{.LastCommit}}"> | |||
<div class="ui secondary menu"> | |||
<div class="item fitted" style="width:100%;"> | |||
<div class="ui breadcrumb field{{if .Err_Filename}} error{{end}}"> | |||
<a class="section" href="{{EscapePound $.BranchLink}}">{{.Repository.Name}}</a> | |||
{{ $n := len .TreeNames}} | |||
{{ $l := Subtract $n 1}} | |||
{{range $i, $v := .TreeNames}} | |||
<div class="divider"> / </div> | |||
{{if eq $i $l}} | |||
<input type="text" id="file-name" value="{{$v}}" placeholder="{{$.i18n.Tr "repo.name_your_file"}}" required> <span class="octicon octicon-info poping up" data-content="{{$.i18n.Tr "repo.filename_help"}}" data-position="bottom center" data-variation="tiny"></span> | |||
{{else}} | |||
<span class="section"><a href="{{EscapePound $.BranchLink}}/{{EscapePound $v}}">{{$v}}</a></span> | |||
{{end}} | |||
{{end}} | |||
<button class="clipboard-tree-name octicon octicon-clippy poping up" type="button" data-content="{{.i18n.Tr "repo.copy_file_path_to_clipboard"}}" data-position="bottom center" data-variation="tiny inverted"></button> | |||
<span class="repo-edit-file-cancel">{{.i18n.Tr "repo.or"}} <a href="{{EscapePound $.BranchLink}}/{{EscapePound $.TreeName}}">{{.i18n.Tr "repo.cancel_lower"}}</a></span> | |||
<input type="hidden" id="tree-name" name="tree_name" value="{{.TreeName}}" required> | |||
</div> | |||
</div> | |||
</div> | |||
<div class="field"> | |||
<div class="ui top attached tabular menu" data-write="write" data-preview="preview" data-diff="diff"> | |||
<a class="active item" data-tab="write"><i class="octicon octicon-code"></i> {{.i18n.Tr "repo.edit_file"}}</a> | |||
<a class="item" data-tab="preview" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.RepoLink}}" data-preview-apis="{{.PreviewTabApis}}"><i class="octicon octicon-eye"></i> {{.i18n.Tr "repo.release.preview"}}</a> | |||
<a class="item" data-tab="diff" data-url="{{.PreviewDiffUrl}}" data-context="{{.BranchLink}}"><i class="octicon octicon-diff"></i> {{.i18n.Tr "repo.preview_changes"}}</a> | |||
</div> | |||
<div class="ui bottom attached active tab segment" data-tab="write"> | |||
<textarea id="edit_area" name="content" data-id="repo-{{.Repository.Name}}-{{.TreeName}}" | |||
data-url="{{AppSubUrl}}/api/v1/markdown" | |||
data-context="{{.RepoLink}}" | |||
data-md-file-extensions="{{.MdFileExtensions}}" | |||
data-line-wrap-extensions="{{.LineWrapExtensions}}"> | |||
{{.FileContent}}</textarea required> | |||
</div> | |||
<div class="ui bottom attached tab segment markdown" data-tab="preview"> | |||
{{.i18n.Tr "repo.release.loading"}} | |||
</div> | |||
<div class="ui bottom attached tab segment diff" data-tab="diff"> | |||
{{.i18n.Tr "repo.release.loading"}} | |||
</div> | |||
</div> | |||
<div class="commit-form-wrapper"> | |||
<img width="48" height="48" class="ui rounded image commit-form-avatar" src="{{.SignedUser.AvatarLink}}"> | |||
<div class="commit-form"> | |||
<h3>{{.i18n.Tr "repo.commit_changes"}}</h3> | |||
<div class="field"> | |||
<input name="commit_summary" placeholder="{{if .IsNewFile}}{{.i18n.Tr "repo.add"}} '{{.TreeName}}/<filename>'{{else}}{{.i18n.Tr "repo.update"}} '{{.TreeName}}'{{end}}" value="{{.CommitSummary}}"> | |||
</div> | |||
<div class="field"> | |||
<textarea name="commit_message" placeholder="{{.i18n.Tr "repo.default_commit_message"}}">{{.CommitMessage}}</textarea> | |||
</div> | |||
<div class="quick-pull-choice js-quick-pull-choice "> | |||
<dl class="form-group"> | |||
<dd> | |||
<div class="form-checkbox"> | |||
<label> | |||
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct"{{if eq .CommitChoice "direct"}} checked="checked"{{end}}> | |||
<i class="octicon octicon-git-commit" height="16" width="14"></i> | |||
{{.CommitDirectlyToThisBranch | Safe}} | |||
</label> | |||
</div> | |||
<div class="form-checkbox"> | |||
<label> | |||
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch"{{if eq .CommitChoice "commit-to-new-branch"}} checked="checked"{{end}}> | |||
<i class="octicon octicon-git-pull-request" height="16" width="12"></i> | |||
{{.CreateNewBranch | Safe}} | |||
</label> | |||
</div> | |||
</dd> | |||
</dl> | |||
<div class="quick-pull-branch-name"> | |||
<div class="new-branch-name-input{{if .Err_Branchname}} error{{end}}"> | |||
<i class="octicon octicon-git-branch quick-pull-new-branch-icon" height="16" width="10"></i> | |||
<input type="text" name="new_branch_name" value="{{.NewBranchName}}" class="form-control input-contrast mr-2 js-quick-pull-new-branch-name" placeholder="New branch name…"> | |||
<span class="text-muted js-quick-pull-normalization-info"></span> | |||
</div> | |||
</div> | |||
</div> | |||
</div> | |||
<button type="submit" class="ui green button"> | |||
{{.i18n.Tr "repo.commit_changes"}} | |||
</button> | |||
<a class="ui button red" href="{{EscapePound $.BranchLink}}/{{EscapePound $.TreeName}}">{{.i18n.Tr "repo.cancel"}}</a> | |||
</div> | |||
</form> | |||
</div> | |||
</div> | |||
{{template "base/footer" .}} |
@ -0,0 +1,79 @@ | |||
{{template "base/head" .}} | |||
<div class="repository file upload"> | |||
{{template "repo/header" .}} | |||
<div class="ui container"> | |||
{{.branchName}} | |||
{{template "base/alert" .}} | |||
<form class="ui comment form" action="{{EscapePound $.Link}}" method="post"> | |||
{{.CsrfTokenHtml}} | |||
<div class="ui secondary menu"> | |||
<div class="item fitted" style="width:100%;"> | |||
<div class="ui breadcrumb field{{if .Err_Directory}} error{{end}}"> | |||
<a class="section" href="{{EscapePound $.BranchLink}}">{{.Repository.Name}}</a> | |||
{{ $n := len .TreeNames}} | |||
{{ $l := Subtract $n 1}} | |||
{{range $i, $v := .TreeNames}} | |||
<div class="divider"> / </div> | |||
{{if eq $i $l}} | |||
<input type="text" id="file-name" value="{{$v}}" placeholder="{{$.i18n.Tr "repo.add_subdir"}}"> | |||
{{else}} | |||
<span class="section"><a href="{{EscapePound $.BranchLink}}/{{EscapePound $v}}">{{$v}}</a></span> | |||
{{end}} | |||
{{end}} | |||
<button class="clipboard-tree-name icon octicon octicon-clippy poping up" type="button" data-content="{{.i18n.Tr "repo.copy_file_path_to_clipboard"}}" data-position="bottom center" data-variation="tiny inverted"></button> | |||
<span class="repo-edit-file-cancel">{{.i18n.Tr "repo.or"}} <a href="{{EscapePound $.BranchLink}}/{{EscapePound $.TreeName}}">{{.i18n.Tr "repo.cancel_lower"}}</a></span> | |||
<input type="hidden" id="tree-name" name="tree_name" value="{{.TreeName}}"> | |||
</div> | |||
</div> | |||
</div> | |||
<div class="field ui upload"> | |||
<div class="files"></div> | |||
<div class="ui basic button dropzone" id="dropzone" data-upload-url="{{.RepoLink}}/upload-file" data-remove-url="{{.RepoLink}}/upload-remove" data-csrf="{{.CsrfToken}}" data-accepts="{{.UploadAllowedTypes}}" data-max-file="{{.UploadMaxFiles}}" data-max-size="{{.UploadMaxSize}}" data-default-message="{{.i18n.Tr "dropzone.default_message"}}" data-invalid-input-type="{{.i18n.Tr "dropzone.invalid_input_type"}}" data-file-too-big="{{.i18n.Tr "dropzone.file_too_big"}}" data-remove-file="{{.i18n.Tr "dropzone.remove_file"}}"></div> | |||
</div> | |||
<div class="commit-form-wrapper"> | |||
<img width="48" height="48" class="ui rounded image commit-form-avatar" src="{{.SignedUser.AvatarLink}}"> | |||
<div class="commit-form"> | |||
<h3>{{.i18n.Tr "repo.commit_changes"}}</h3> | |||
<div class="field"> | |||
<input name="commit_summary" placeholder="{{.i18n.Tr "repo.add_files_to_dir" .TreeName}}" value="{{.CommitSummary}}"> | |||
</div> | |||
<div class="field"> | |||
<textarea name="commit_message" placeholder="{{.i18n.Tr "repo.default_commit_message"}}">{{.CommitMessage}}</textarea> | |||
</div> | |||
<div class="quick-pull-choice js-quick-pull-choice "> | |||
<dl class="form-group"> | |||
<dd> | |||
<div class="form-checkbox"> | |||
<label> | |||
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct"{{if eq .CommitChoice "direct"}} checked="checked"{{end}}> | |||
<i class="octicon octicon-git-commit" height="16" width="14"></i> | |||
{{.CommitDirectlyToThisBranch | Safe}} | |||
</label> | |||
</div> | |||
<div class="form-checkbox"> | |||
<label> | |||
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch"{{if eq .CommitChoice "commit-to-new-branch"}} checked="checked"{{end}}> | |||
<i class="octicon octicon-git-pull-request" height="16" width="12"></i> | |||
{{.CreateNewBranch | Safe}} | |||
</label> | |||
</div> | |||
</dd> | |||
</dl> | |||
<div class="quick-pull-branch-name"> | |||
<div class="new-branch-name-input{{if .Err_Branchname}} error{{end}}"> | |||
<i class="octicon octicon-git-branch quick-pull-new-branch-icon" height="16" width="10"></i> | |||
<input type="text" name="new_branch_name" value="{{.NewBranchName}}" class="form-control input-contrast mr-2 js-quick-pull-new-branch-name" placeholder="New branch name…"> | |||
<span class="text-muted js-quick-pull-normalization-info"></span> | |||
</div> | |||
</div> | |||
</div> | |||
</div> | |||
<button type="submit" class="ui green button"> | |||
{{.i18n.Tr "repo.commit_changes"}} | |||
</button> | |||
<a class="ui button red" href="{{EscapePound $.BranchLink}}/{{EscapePound $.TreeName}}">{{.i18n.Tr "repo.cancel"}}</a> | |||
</div> | |||
</form> | |||
</div> | |||
</div> | |||
{{template "base/footer" .}} |