mirror of
https://github.com/go-gitea/gitea.git
synced 2024-11-30 05:50:50 +01:00
66ee9b87f9
* Add require signed commit for protected branch * Fix fmt * Make editor show if they will be signed * bugfix * Add basic merge check and better information for CRUD * linting comment * Add descriptors to merge signing * Slight refactor * Slight improvement to appearances * Handle Merge API * manage CRUD API * Move error to error.go * Remove fix to delete.go * prep for merge * need to tolerate \r\n in message * check protected branch before trying to load it * Apply suggestions from code review Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com> * fix commit-reader Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
67 lines
4.1 KiB
Cheetah
67 lines
4.1 KiB
Cheetah
<div class="commit-form-wrapper">
|
|
<img width="48" height="48" class="ui image commit-avatar" src="{{.SignedUser.RelAvatarLink}}">
|
|
<div class="commit-form">
|
|
<h3>{{- if .CanCommitToBranch.WillSign}}
|
|
<i title="{{.i18n.Tr "repo.signing.will_sign" .CanCommitToBranch.SigningKey}}" class="lock green icon"></i>{{.i18n.Tr "repo.editor.commit_signed_changes"}}
|
|
{{- else}}
|
|
<i title="{{.i18n.Tr (printf "repo.signing.wont_sign.%s" .CanCommitToBranch.WontSignReason)}}" class="unlock grey icon"></i>{{.i18n.Tr "repo.editor.commit_changes"}}
|
|
{{- end}}</h3>
|
|
<div class="field">
|
|
<input name="commit_summary" placeholder="{{if .PageIsDelete}}{{.i18n.Tr "repo.editor.delete" .TreePath}}{{else if .PageIsUpload}}{{.i18n.Tr "repo.editor.upload_files_to_dir" .TreePath}}{{else if .IsNewFile}}{{.i18n.Tr "repo.editor.add_tmpl"}}{{else}}{{.i18n.Tr "repo.editor.update" .TreePath}}{{end}}" value="{{.commit_summary}}" autofocus>
|
|
</div>
|
|
<div class="field">
|
|
<textarea name="commit_message" placeholder="{{.i18n.Tr "repo.editor.commit_message_desc"}}" rows="5">{{.commit_message}}</textarea>
|
|
</div>
|
|
<div class="quick-pull-choice js-quick-pull-choice">
|
|
<div class="field">
|
|
<div class="ui radio checkbox {{if not .CanCommitToBranch.CanCommitToBranch}}disabled{{end}}">
|
|
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" button_text="{{.i18n.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "direct"}}checked{{end}}>
|
|
<label>
|
|
<i class="octicon octicon-git-commit" height="16" width="14"></i>
|
|
{{.i18n.Tr "repo.editor.commit_directly_to_this_branch" (.BranchName|Escape) | Safe}}
|
|
{{if not .CanCommitToBranch.CanCommitToBranch}}
|
|
<div class="ui visible small warning message">
|
|
{{.i18n.Tr "repo.editor.no_commit_to_branch"}}
|
|
<ul>
|
|
{{if not .CanCommitToBranch.UserCanPush}}<li>{{.i18n.Tr "repo.editor.user_no_push_to_branch"}}</li>{{end}}
|
|
{{if and .CanCommitToBranch.RequireSigned (not .CanCommitToBranch.WillSign)}}<li>{{.i18n.Tr "repo.editor.require_signed_commit"}}</li>{{end}}
|
|
</ul>
|
|
</div>
|
|
{{end}}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
<div class="field">
|
|
{{$pullRequestEnabled := .Repository.UnitEnabled $.UnitTypePullRequests}}
|
|
{{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}}
|
|
<div class="ui radio checkbox">
|
|
{{if $pullRequestEnabled}}
|
|
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{.i18n.Tr "repo.editor.propose_file_change"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
|
|
{{else}}
|
|
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{.i18n.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
|
|
{{end}}
|
|
<label>
|
|
<i class="octicon octicon-git-pull-request" height="16" width="12"></i>
|
|
{{if $pullRequestEnabled}}
|
|
{{.i18n.Tr "repo.editor.create_new_branch" | Safe}}
|
|
{{else}}
|
|
{{.i18n.Tr "repo.editor.create_new_branch_np" | Safe}}
|
|
{{end}}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
<div class="quick-pull-branch-name {{if not (eq .commit_choice "commit-to-new-branch")}}hide{{end}}">
|
|
<div class="new-branch-name-input field {{if .Err_NewBranchName}}error{{end}}">
|
|
<i class="octicon octicon-git-branch" height="16" width="10"></i>
|
|
<input type="text" name="new_branch_name" value="{{.new_branch_name}}" class="input-contrast mr-2 js-quick-pull-new-branch-name" placeholder="{{.i18n.Tr "repo.editor.new_branch_name_desc"}}" {{if eq .commit_choice "commit-to-new-branch"}}required{{end}}>
|
|
<span class="text-muted js-quick-pull-normalization-info"></span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<button id="commit-button" type="submit" class="ui green button">
|
|
{{if eq .commit_choice "commit-to-new-branch"}}{{.i18n.Tr "repo.editor.propose_file_change"}}{{else}}{{.i18n.Tr "repo.editor.commit_changes"}}{{end}}
|
|
</button>
|
|
<a class="ui button red" href="{{EscapePound $.BranchLink}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.editor.cancel"}}</a>
|
|
</div>
|