mirror of
https://github.com/go-gitea/gitea.git
synced 2025-07-15 00:01:25 -04:00
Compare commits
No commits in common. "b833ce49644022cff14ef6add69c2baed8c67e41" and "151b1a9508d9a407163edbf3d726b4785afef5ce" have entirely different histories.
b833ce4964
...
151b1a9508
@ -468,9 +468,7 @@ func (g *GiteaLocalUploader) CreateComments(comments ...*base.Comment) error {
|
|||||||
|
|
||||||
switch cm.Type {
|
switch cm.Type {
|
||||||
case issues_model.CommentTypeAssignees:
|
case issues_model.CommentTypeAssignees:
|
||||||
if assigneeID, ok := comment.Meta["AssigneeID"].(int); ok {
|
cm.AssigneeID = comment.Meta["AssigneeID"].(int64)
|
||||||
cm.AssigneeID = int64(assigneeID)
|
|
||||||
}
|
|
||||||
if comment.Meta["RemovedAssigneeID"] != nil {
|
if comment.Meta["RemovedAssigneeID"] != nil {
|
||||||
cm.RemovedAssignee = true
|
cm.RemovedAssignee = true
|
||||||
}
|
}
|
||||||
|
|||||||
@ -595,25 +595,19 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode
|
|||||||
headUser = pr.HeadRepo.Owner
|
headUser = pr.HeadRepo.Owner
|
||||||
}
|
}
|
||||||
|
|
||||||
|
env = repo_module.FullPushingEnvironment(
|
||||||
|
headUser,
|
||||||
|
doer,
|
||||||
|
pr.BaseRepo,
|
||||||
|
pr.BaseRepo.Name,
|
||||||
|
pr.ID,
|
||||||
|
)
|
||||||
|
|
||||||
var pushCmd *git.Command
|
var pushCmd *git.Command
|
||||||
if mergeStyle == repo_model.MergeStyleRebaseUpdate {
|
if mergeStyle == repo_model.MergeStyleRebaseUpdate {
|
||||||
// force push the rebase result to head branch
|
// force push the rebase result to head branch
|
||||||
env = repo_module.FullPushingEnvironment(
|
|
||||||
headUser,
|
|
||||||
doer,
|
|
||||||
pr.HeadRepo,
|
|
||||||
pr.HeadRepo.Name,
|
|
||||||
pr.ID,
|
|
||||||
)
|
|
||||||
pushCmd = git.NewCommand(ctx, "push", "-f", "head_repo").AddDynamicArguments(stagingBranch + ":" + git.BranchPrefix + pr.HeadBranch)
|
pushCmd = git.NewCommand(ctx, "push", "-f", "head_repo").AddDynamicArguments(stagingBranch + ":" + git.BranchPrefix + pr.HeadBranch)
|
||||||
} else {
|
} else {
|
||||||
env = repo_module.FullPushingEnvironment(
|
|
||||||
headUser,
|
|
||||||
doer,
|
|
||||||
pr.BaseRepo,
|
|
||||||
pr.BaseRepo.Name,
|
|
||||||
pr.ID,
|
|
||||||
)
|
|
||||||
pushCmd = git.NewCommand(ctx, "push", "origin").AddDynamicArguments(baseBranch + ":" + git.BranchPrefix + pr.BaseBranch)
|
pushCmd = git.NewCommand(ctx, "push", "origin").AddDynamicArguments(baseBranch + ":" + git.BranchPrefix + pr.BaseBranch)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -103,8 +103,6 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
|
|||||||
var pusher *user_model.User
|
var pusher *user_model.User
|
||||||
|
|
||||||
for _, opts := range optsList {
|
for _, opts := range optsList {
|
||||||
log.Trace("pushUpdates: %-v %s %s %s", repo, opts.OldCommitID, opts.NewCommitID, opts.RefFullName)
|
|
||||||
|
|
||||||
if opts.IsNewRef() && opts.IsDelRef() {
|
if opts.IsNewRef() && opts.IsDelRef() {
|
||||||
return fmt.Errorf("old and new revisions are both %s", git.EmptySHA)
|
return fmt.Errorf("old and new revisions are both %s", git.EmptySHA)
|
||||||
}
|
}
|
||||||
@ -130,7 +128,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
|
|||||||
} else { // is new tag
|
} else { // is new tag
|
||||||
newCommit, err := gitRepo.GetCommit(opts.NewCommitID)
|
newCommit, err := gitRepo.GetCommit(opts.NewCommitID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("gitRepo.GetCommit(%s) in %s/%s[%d]: %w", opts.NewCommitID, repo.OwnerName, repo.Name, repo.ID, err)
|
return fmt.Errorf("gitRepo.GetCommit: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
commits := repo_module.NewPushCommits()
|
commits := repo_module.NewPushCommits()
|
||||||
@ -163,7 +161,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
|
|||||||
|
|
||||||
newCommit, err := gitRepo.GetCommit(opts.NewCommitID)
|
newCommit, err := gitRepo.GetCommit(opts.NewCommitID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("gitRepo.GetCommit(%s) in %s/%s[%d]: %w", opts.NewCommitID, repo.OwnerName, repo.Name, repo.ID, err)
|
return fmt.Errorf("gitRepo.GetCommit: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
refName := opts.RefName()
|
refName := opts.RefName()
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
||||||
{{.OriginalAuthor}}
|
{{.OriginalAuthor}}
|
||||||
</span>
|
</span>
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}} {{if $.Repository.OriginalURL}}
|
{{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}} {{if $.Repository.OriginalURL}}
|
||||||
</span>
|
</span>
|
||||||
<span class="text migrate">
|
<span class="text migrate">
|
||||||
@ -41,7 +41,7 @@
|
|||||||
{{avatar .Poster}}
|
{{avatar .Poster}}
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
@ -95,7 +95,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge bg-green text-white">{{svg "octicon-dot-fill"}}</span>
|
<span class="badge bg-green text-white">{{svg "octicon-dot-fill"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{if .Issue.IsPull}}
|
{{if .Issue.IsPull}}
|
||||||
{{$.locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr | Safe}}
|
{{$.locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr | Safe}}
|
||||||
@ -108,7 +108,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge bg-red text-white">{{svg "octicon-circle-slash"}}</span>
|
<span class="badge bg-red text-white">{{svg "octicon-circle-slash"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{if .Issue.IsPull}}
|
{{if .Issue.IsPull}}
|
||||||
{{$.locale.Tr "repo.pulls.closed_at" .EventTag $createdStr | Safe}}
|
{{$.locale.Tr "repo.pulls.closed_at" .EventTag $createdStr | Safe}}
|
||||||
@ -121,7 +121,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge bg-purple text-white">{{svg "octicon-git-merge"}}</span>
|
<span class="badge bg-purple text-white">{{svg "octicon-git-merge"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$link := printf "%s/commit/%s" $.Repository.HTMLURL ($.Issue.PullRequest.MergedCommitID|PathEscape)}}
|
{{$link := printf "%s/commit/%s" $.Repository.HTMLURL ($.Issue.PullRequest.MergedCommitID|PathEscape)}}
|
||||||
{{if eq $.Issue.PullRequest.Status 3}}
|
{{if eq $.Issue.PullRequest.Status 3}}
|
||||||
@ -156,20 +156,20 @@
|
|||||||
{{if eq .RefAction 3}}</del>{{end}}
|
{{if eq .RefAction 3}}</del>{{end}}
|
||||||
|
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span class="text grey muted-links"><a href="{{.RefIssueHTMLURL}}"><b>{{.RefIssueTitle}}</b> {{.RefIssueIdent}}</a></span>
|
<span class="text grey"><a class="muted" href="{{.RefIssueHTMLURL}}"><b>{{.RefIssueTitle}}</b> {{.RefIssueIdent}}</a></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{else if eq .Type 4}}
|
{{else if eq .Type 4}}
|
||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-bookmark"}}</span>
|
<span class="badge">{{svg "octicon-bookmark"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
{{svg "octicon-git-commit"}}
|
{{svg "octicon-git-commit"}}
|
||||||
<span class="text grey muted-links">{{.Content | Str2html}}</span>
|
<span class="text grey">{{.Content | Str2html}}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{else if eq .Type 7}}
|
{{else if eq .Type 7}}
|
||||||
@ -177,7 +177,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-tag"}}</span>
|
<span class="badge">{{svg "octicon-tag"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{if and .AddedLabels (not .RemovedLabels)}}
|
{{if and .AddedLabels (not .RemovedLabels)}}
|
||||||
{{$.locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels .AddedLabels $.RepoLink) $createdStr | Safe}}
|
{{$.locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels .AddedLabels $.RepoLink) $createdStr | Safe}}
|
||||||
@ -193,7 +193,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-milestone"}}</span>
|
<span class="badge">{{svg "octicon-milestone"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.change_milestone_at" (.OldMilestone.Name|Escape) (.Milestone.Name|Escape) $createdStr | Safe}}{{else}}{{$.locale.Tr "repo.issues.remove_milestone_at" (.OldMilestone.Name|Escape) $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.add_milestone_at" (.Milestone.Name|Escape) $createdStr | Safe}}{{end}}
|
{{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.change_milestone_at" (.OldMilestone.Name|Escape) (.Milestone.Name|Escape) $createdStr | Safe}}{{else}}{{$.locale.Tr "repo.issues.remove_milestone_at" (.OldMilestone.Name|Escape) $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.add_milestone_at" (.Milestone.Name|Escape) $createdStr | Safe}}{{end}}
|
||||||
</span>
|
</span>
|
||||||
@ -204,7 +204,7 @@
|
|||||||
{{if gt .AssigneeID 0}}
|
{{if gt .AssigneeID 0}}
|
||||||
{{if .RemovedAssignee}}
|
{{if .RemovedAssignee}}
|
||||||
{{template "shared/user/avatarlink" .Assignee}}
|
{{template "shared/user/avatarlink" .Assignee}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Assignee}}
|
{{template "shared/user/authorlink" .Assignee}}
|
||||||
{{if eq .Poster.ID .Assignee.ID}}
|
{{if eq .Poster.ID .Assignee.ID}}
|
||||||
{{$.locale.Tr "repo.issues.remove_self_assignment" $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.remove_self_assignment" $createdStr | Safe}}
|
||||||
@ -214,7 +214,7 @@
|
|||||||
</span>
|
</span>
|
||||||
{{else}}
|
{{else}}
|
||||||
{{template "shared/user/avatarlink" .Assignee}}
|
{{template "shared/user/avatarlink" .Assignee}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Assignee}}
|
{{template "shared/user/authorlink" .Assignee}}
|
||||||
{{if eq .Poster.ID .AssigneeID}}
|
{{if eq .Poster.ID .AssigneeID}}
|
||||||
{{$.locale.Tr "repo.issues.self_assign_at" $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.self_assign_at" $createdStr | Safe}}
|
||||||
@ -229,7 +229,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-pencil"}}</span>
|
<span class="badge">{{svg "octicon-pencil"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji) (.NewTitle|RenderEmoji) $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji) (.NewTitle|RenderEmoji) $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
@ -238,7 +238,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-git-branch"}}</span>
|
<span class="badge">{{svg "octicon-git-branch"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.delete_branch_at" (.OldRef|Escape) $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.delete_branch_at" (.OldRef|Escape) $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
@ -247,7 +247,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-clock"}}</span>
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.start_tracking_history" $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.start_tracking_history" $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
@ -256,35 +256,35 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-clock"}}</span>
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
{{template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" .}}
|
{{template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" .}}
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
{{svg "octicon-clock"}}
|
{{svg "octicon-clock"}}
|
||||||
<span class="text grey muted-links">{{.Content}}</span>
|
<span class="text grey">{{.Content}}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{else if eq .Type 14}}
|
{{else if eq .Type 14}}
|
||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-clock"}}</span>
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.add_time_history" $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.add_time_history" $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
{{template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" .}}
|
{{template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" .}}
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
{{svg "octicon-clock"}}
|
{{svg "octicon-clock"}}
|
||||||
<span class="text grey muted-links">{{.Content}}</span>
|
<span class="text grey">{{.Content}}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{else if eq .Type 15}}
|
{{else if eq .Type 15}}
|
||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-clock"}}</span>
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
@ -293,7 +293,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-clock"}}</span>
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
@ -302,7 +302,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-clock"}}</span>
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$parsedDeadline := .Content | ParseDeadline}}
|
{{$parsedDeadline := .Content | ParseDeadline}}
|
||||||
{{$.locale.Tr "repo.issues.due_date_modified" (index $parsedDeadline 0) (index $parsedDeadline 1) $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.due_date_modified" (index $parsedDeadline 0) (index $parsedDeadline 1) $createdStr | Safe}}
|
||||||
@ -312,7 +312,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-clock"}}</span>
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
@ -321,15 +321,15 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-package-dependents"}}</span>
|
<span class="badge">{{svg "octicon-package-dependents"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.dependency.added_dependency" $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.dependency.added_dependency" $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
{{if .DependentIssue}}
|
{{if .DependentIssue}}
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
{{svg "octicon-plus"}}
|
{{svg "octicon-plus"}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
<a href="{{.DependentIssue.HTMLURL}}">
|
<a class="muted" href="{{.DependentIssue.HTMLURL}}">
|
||||||
{{if eq .DependentIssue.RepoID .Issue.RepoID}}
|
{{if eq .DependentIssue.RepoID .Issue.RepoID}}
|
||||||
#{{.DependentIssue.Index}} {{.DependentIssue.Title}}
|
#{{.DependentIssue.Index}} {{.DependentIssue.Title}}
|
||||||
{{else}}
|
{{else}}
|
||||||
@ -344,15 +344,15 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-package-dependents"}}</span>
|
<span class="badge">{{svg "octicon-package-dependents"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.dependency.removed_dependency" $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.dependency.removed_dependency" $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
{{if .DependentIssue}}
|
{{if .DependentIssue}}
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span class="text grey muted-links">{{svg "octicon-trash"}}</span>
|
<span class="text grey">{{svg "octicon-trash"}}</span>
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
<a href="{{.DependentIssue.HTMLURL}}">
|
<a class="muted" href="{{.DependentIssue.HTMLURL}}">
|
||||||
{{if eq .DependentIssue.RepoID .Issue.RepoID}}
|
{{if eq .DependentIssue.RepoID .Issue.RepoID}}
|
||||||
#{{.DependentIssue.Index}} {{.DependentIssue.Title}}
|
#{{.DependentIssue.Index}} {{.DependentIssue.Title}}
|
||||||
{{else}}
|
{{else}}
|
||||||
@ -373,13 +373,13 @@
|
|||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
<span class="badge{{if eq .Review.Type 1}} bg-green text-white{{else if eq .Review.Type 3}} bg-red text-white{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon)}}</span>
|
<span class="badge{{if eq .Review.Type 1}} bg-green text-white{{else if eq .Review.Type 3}} bg-red text-white{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon)}}</span>
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{if .OriginalAuthor}}
|
{{if .OriginalAuthor}}
|
||||||
<span class="text black">
|
<span class="text black">
|
||||||
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
||||||
{{.OriginalAuthor}}
|
{{.OriginalAuthor}}
|
||||||
</span>
|
</span>
|
||||||
<span class="text grey muted-links"> {{if $.Repository.OriginalURL}}</span>
|
<span class="text grey"> {{if $.Repository.OriginalURL}}</span>
|
||||||
<span class="text migrate">({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}</span>
|
<span class="text migrate">({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}</span>
|
||||||
{{else}}
|
{{else}}
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
@ -404,13 +404,13 @@
|
|||||||
<div class="content comment-container">
|
<div class="content comment-container">
|
||||||
<div class="ui top attached header comment-header df ac sb">
|
<div class="ui top attached header comment-header df ac sb">
|
||||||
<div class="comment-header-left df ac">
|
<div class="comment-header-left df ac">
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{if .OriginalAuthor}}
|
{{if .OriginalAuthor}}
|
||||||
<span class="text black bold">
|
<span class="text black bold">
|
||||||
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
||||||
{{.OriginalAuthor}}
|
{{.OriginalAuthor}}
|
||||||
</span>
|
</span>
|
||||||
<span class="text grey muted-links"> {{if $.Repository.OriginalURL}}</span>
|
<span class="text grey"> {{if $.Repository.OriginalURL}}</span>
|
||||||
<span class="text migrate">({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}</span>
|
<span class="text migrate">({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}</span>
|
||||||
{{else}}
|
{{else}}
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
@ -532,13 +532,13 @@
|
|||||||
{{avatar .Poster}}
|
{{avatar .Poster}}
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{if .OriginalAuthor}}
|
{{if .OriginalAuthor}}
|
||||||
<span class="text black bold">
|
<span class="text black bold">
|
||||||
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
||||||
{{.OriginalAuthor}}
|
{{.OriginalAuthor}}
|
||||||
</span>
|
</span>
|
||||||
<span class="text grey muted-links"> {{if $.Repository.OriginalURL}}</span>
|
<span class="text grey"> {{if $.Repository.OriginalURL}}</span>
|
||||||
<span class="text migrate">({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}</span>
|
<span class="text migrate">({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}</span>
|
||||||
{{else}}
|
{{else}}
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
@ -628,12 +628,12 @@
|
|||||||
<span class="badge">{{svg "octicon-lock"}}</span>
|
<span class="badge">{{svg "octicon-lock"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
{{if .Content}}
|
{{if .Content}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.lock_with_reason" .Content $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.lock_with_reason" .Content $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
{{else}}
|
{{else}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.lock_no_reason" $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.lock_no_reason" $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
@ -643,7 +643,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-key"}}</span>
|
<span class="badge">{{svg "octicon-key"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$.locale.Tr "repo.issues.unlock_comment" $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.unlock_comment" $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
@ -652,7 +652,7 @@
|
|||||||
<div class="timeline-item event">
|
<div class="timeline-item event">
|
||||||
<span class="badge">{{svg "octicon-git-branch"}}</span>
|
<span class="badge">{{svg "octicon-git-branch"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
<a{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.Name}}</a>
|
<a{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.Name}}</a>
|
||||||
{{$.locale.Tr "repo.pulls.change_target_branch_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
|
{{$.locale.Tr "repo.pulls.change_target_branch_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
@ -661,21 +661,21 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-clock"}}</span>
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
|
|
||||||
{{$.locale.Tr "repo.issues.del_time_history" $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.del_time_history" $createdStr | Safe}}
|
||||||
</span>
|
</span>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
{{svg "octicon-clock"}}
|
{{svg "octicon-clock"}}
|
||||||
<span class="text grey muted-links">{{.Content}}</span>
|
<span class="text grey">{{.Content}}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{else if eq .Type 27}}
|
{{else if eq .Type 27}}
|
||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-eye"}}</span>
|
<span class="badge">{{svg "octicon-eye"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{if (gt .AssigneeID 0)}}
|
{{if (gt .AssigneeID 0)}}
|
||||||
{{if .RemovedAssignee}}
|
{{if .RemovedAssignee}}
|
||||||
@ -699,7 +699,7 @@
|
|||||||
{{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}}
|
{{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}}
|
||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-repo-push"}}</span>
|
<span class="badge">{{svg "octicon-repo-push"}}</span>
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{if .IsForcePush}}
|
{{if .IsForcePush}}
|
||||||
{{$.locale.Tr "repo.issues.force_push_codes" ($.Issue.PullRequest.HeadBranch|Escape) (ShortSha .OldCommit) (($.Issue.Repo.CommitLink .OldCommit)|Escape) (ShortSha .NewCommit) (($.Issue.Repo.CommitLink .NewCommit)|Escape) $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.force_push_codes" ($.Issue.PullRequest.HeadBranch|Escape) (ShortSha .OldCommit) (($.Issue.Repo.CommitLink .OldCommit)|Escape) (ShortSha .NewCommit) (($.Issue.Repo.CommitLink .NewCommit)|Escape) $createdStr | Safe}}
|
||||||
@ -716,7 +716,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-project"}}</span>
|
<span class="badge">{{svg "octicon-project"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{if gt .OldProjectID 0}}
|
{{if gt .OldProjectID 0}}
|
||||||
{{if gt .ProjectID 0}}
|
{{if gt .ProjectID 0}}
|
||||||
@ -737,7 +737,7 @@
|
|||||||
<img src="{{.Poster.AvatarLink}}">
|
<img src="{{.Poster.AvatarLink}}">
|
||||||
</a>
|
</a>
|
||||||
<span class="badge grey">{{svg "octicon-x" 16}}</span>
|
<span class="badge grey">{{svg "octicon-x" 16}}</span>
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{$reviewerName := ""}}
|
{{$reviewerName := ""}}
|
||||||
{{if eq .Review.OriginalAuthor ""}}
|
{{if eq .Review.OriginalAuthor ""}}
|
||||||
@ -752,7 +752,7 @@
|
|||||||
<div class="timeline-item comment">
|
<div class="timeline-item comment">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<div class="ui top attached header arrow-top">
|
<div class="ui top attached header arrow-top">
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{$.locale.Tr "action.review_dismissed_reason"}}
|
{{$.locale.Tr "action.review_dismissed_reason"}}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@ -773,7 +773,7 @@
|
|||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-git-branch"}}</span>
|
<span class="badge">{{svg "octicon-git-branch"}}</span>
|
||||||
{{template "shared/user/avatarlink" .Poster}}
|
{{template "shared/user/avatarlink" .Poster}}
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{if and .OldRef .NewRef}}
|
{{if and .OldRef .NewRef}}
|
||||||
{{$.locale.Tr "repo.issues.change_ref_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
|
{{$.locale.Tr "repo.issues.change_ref_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
|
||||||
@ -787,7 +787,7 @@
|
|||||||
{{else if or (eq .Type 34) (eq .Type 35)}}
|
{{else if or (eq .Type 34) (eq .Type 35)}}
|
||||||
<div class="timeline-item event" id="{{.HashTag}}">
|
<div class="timeline-item event" id="{{.HashTag}}">
|
||||||
<span class="badge">{{svg "octicon-git-merge" 16}}</span>
|
<span class="badge">{{svg "octicon-git-merge" 16}}</span>
|
||||||
<span class="text grey muted-links">
|
<span class="text grey">
|
||||||
{{template "shared/user/authorlink" .Poster}}
|
{{template "shared/user/authorlink" .Poster}}
|
||||||
{{if eq .Type 34}}{{$.locale.Tr "repo.pulls.auto_merge_newly_scheduled_comment" $createdStr | Safe}}
|
{{if eq .Type 34}}{{$.locale.Tr "repo.pulls.auto_merge_newly_scheduled_comment" $createdStr | Safe}}
|
||||||
{{else}}{{$.locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr | Safe}}{{end}}
|
{{else}}{{$.locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr | Safe}}{{end}}
|
||||||
|
|||||||
@ -167,21 +167,6 @@ export function initGlobalDropzone() {
|
|||||||
file.uuid = data.uuid;
|
file.uuid = data.uuid;
|
||||||
const input = $(`<input id="${data.uuid}" name="files" type="hidden">`).val(data.uuid);
|
const input = $(`<input id="${data.uuid}" name="files" type="hidden">`).val(data.uuid);
|
||||||
$dropzone.find('.files').append(input);
|
$dropzone.find('.files').append(input);
|
||||||
// Create a "Copy Link" element, to conveniently copy the image
|
|
||||||
// or file link as Markdown to the clipboard
|
|
||||||
const copyLinkElement = document.createElement('a');
|
|
||||||
copyLinkElement.className = 'dz-remove';
|
|
||||||
copyLinkElement.href = '#';
|
|
||||||
copyLinkElement.innerHTML = '<i class="fa fa-copy"></i> Copy link';
|
|
||||||
copyLinkElement.addEventListener('click', (e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
let fileMarkdown = `[${file.name}](/attachments/${file.uuid})`;
|
|
||||||
if (file.type.startsWith('image/')) {
|
|
||||||
fileMarkdown = `!${fileMarkdown}`;
|
|
||||||
}
|
|
||||||
navigator.clipboard.writeText(fileMarkdown);
|
|
||||||
});
|
|
||||||
file.previewTemplate.appendChild(copyLinkElement);
|
|
||||||
});
|
});
|
||||||
this.on('removedfile', (file) => {
|
this.on('removedfile', (file) => {
|
||||||
$(`#${file.uuid}`).remove();
|
$(`#${file.uuid}`).remove();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user