You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
forgejo/modules/structs
a1012112796 a5279b74b6
Make manual merge autodetection optional and add manual merge as merge method (#12543)
* Make auto check manual merge as a chooseable mod and add manual merge way on ui

as title, Before this pr, we use same way with GH to check manually merge.
It good, but in some special cases, misjudgments can occur. and it's hard
to fix this bug. So I add option to allow repo manager block "auto check manual merge"
function, Then it will have same style like gitlab(allow empty pr). and to compensate for
not being able to detect THE PR merge automatically, I added a manual approach.

Signed-off-by: a1012112796 <1012112796@qq.com>

* make swager

* api support

* ping ci

* fix TestPullCreate_EmptyChangesWithCommits

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* Apply review suggestions and add test

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* fix build

* test error message

* make fmt

* Fix indentation issues identified by @silverwind

Co-authored-by: silverwind <me@silverwind.io>

* Fix tests and make manually merged disabled error on API the same

Signed-off-by: Andrew Thornton <art27@cantab.net>

* a small nit

* fix wrong commit id error

* fix bug

* simple test

* fix test

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
3 years ago
..
admin_user.go [API] Add Restricted Field to User (#14630) 3 years ago
attachment.go Fix wrong hint when status checking is running on pull request view (#9886) 5 years ago
commit_status.go [Refactor] CombinedStatus and CommitStatus related functions & structs (#14026) 4 years ago
cron.go Add cron running API (#12421) 4 years ago
doc.go Move sdk structs to modules/structs (#6905) 5 years ago
fork.go Move sdk structs to modules/structs (#6905) 5 years ago
git_blob.go Move sdk structs to modules/structs (#6905) 5 years ago
git_hook.go Move sdk structs to modules/structs (#6905) 5 years ago
hook.go Migrate to use jsoniter instead of encoding/json (#14841) 3 years ago
issue.go rm gogs relict (#14665) 3 years ago
issue_comment.go Display original author and URL information when showing migrated issues/comments (#7352) 5 years ago
issue_label.go [API] Fix inconsistent label color format (#10129) 4 years ago
issue_milestone.go Add Created & Updated to Milestone (#12662) 4 years ago
issue_reaction.go [API] Fix 9544 | return 200 when reaction already exist (#9550) 5 years ago
issue_stopwatch.go Display current stopwatch in navbar (#14122) 3 years ago
issue_tracked_time.go [API] Extend times API (#9200) 5 years ago
lfs_lock.go Move sdk structs to modules/structs (#6905) 5 years ago
miscellaneous.go API method to list all commits of a repository (#6408) 5 years ago
notifications.go API: NotificationSubject show Issue/Pull State (#12901) 4 years ago
org.go Add teams to repo on collaboration page. (#8045) 5 years ago
org_member.go Move sdk structs to modules/structs (#6905) 5 years ago
org_team.go Add missing repo.projects unit into swagger (#14876) 3 years ago
org_type.go Fixes #7023 - API Org Visibility (#7028) 5 years ago
pull.go Add option to API to update PullRequest base branch (#11666) 4 years ago
pull_review.go Add dismiss review feature (#12674) 3 years ago
release.go Add single release page and latest redirect (#11102) 4 years ago
repo.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 3 years ago
repo_branch.go Add block on official review requests branch protection (#13705) 4 years ago
repo_collaborator.go Move sdk structs to modules/structs (#6905) 5 years ago
repo_commit.go [API] Add affected files of commits to commit struct (#14579) 3 years ago
repo_file.go enhancement: add signoff option in commit form (#14516) 3 years ago
repo_key.go Move sdk structs to modules/structs (#6905) 5 years ago
repo_refs.go Move sdk structs to modules/structs (#6905) 5 years ago
repo_tag.go Fixes #2738 - Adds the /git/tags API endpoint (#7138) 5 years ago
repo_topic.go Add API endpoint for accessing repo topics (#7963) 5 years ago
repo_tree.go Move sdk structs to modules/structs (#6905) 5 years ago
repo_watch.go Move sdk structs to modules/structs (#6905) 5 years ago
settings.go Export LFS & TimeTracking function status (#14753) 3 years ago
status.go [Refactor] CombinedStatus and CommitStatus related functions & structs (#14026) 4 years ago
task.go Move migrating repository from frontend to backend (#6200) 5 years ago
user.go Migrate to use jsoniter instead of encoding/json (#14841) 3 years ago
user_app.go Remove Unused Functions (#10516) 4 years ago
user_email.go Move sdk structs to modules/structs (#6905) 5 years ago
user_gpgkey.go Move sdk structs to modules/structs (#6905) 5 years ago
user_key.go Move sdk structs to modules/structs (#6905) 5 years ago