This repository has been archived on 2023-02-01. You can view files and clone it, but cannot push or open issues or pull requests.
gitea/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>
2021-03-03 22:41:23 -05:00
..
admin_user.go [API] Add Restricted Field to User (#14630) 2021-02-18 16:25:35 +08:00
attachment.go Fix wrong hint when status checking is running on pull request view (#9886) 2020-01-22 11:46:04 +08:00
commit_status.go [Refactor] CombinedStatus and CommitStatus related functions & structs (#14026) 2020-12-18 11:33:32 +08:00
cron.go Add cron running API (#12421) 2020-08-24 11:48:15 -04:00
doc.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
fork.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
git_blob.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
git_hook.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
hook.go Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
issue.go rm gogs relict (#14665) 2021-02-14 00:07:17 +08:00
issue_comment.go Display original author and URL information when showing migrated issues/comments (#7352) 2019-07-08 10:14:12 +08:00
issue_label.go [API] Fix inconsistent label color format (#10129) 2020-02-09 14:33:03 +00:00
issue_milestone.go Add Created & Updated to Milestone (#12662) 2020-09-05 13:38:54 -04:00
issue_reaction.go [API] Fix 9544 | return 200 when reaction already exist (#9550) 2019-12-31 03:21:21 -05:00
issue_stopwatch.go Display current stopwatch in navbar (#14122) 2021-01-21 15:51:52 +01:00
issue_tracked_time.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
lfs_lock.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
miscellaneous.go API method to list all commits of a repository (#6408) 2019-08-26 16:09:10 +02:00
notifications.go API: NotificationSubject show Issue/Pull State (#12901) 2020-09-20 19:10:53 -04:00
org.go Add teams to repo on collaboration page. (#8045) 2019-09-23 23:08:03 +03:00
org_member.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
org_team.go Add missing repo.projects unit into swagger (#14876) 2021-03-03 23:44:30 +01:00
org_type.go Fixes #7023 - API Org Visibility (#7028) 2019-05-30 13:57:55 -04:00
pull.go Add option to API to update PullRequest base branch (#11666) 2020-06-07 20:13:40 +01:00
pull_review.go Add dismiss review feature (#12674) 2021-02-11 18:32:25 +01:00
release.go Add single release page and latest redirect (#11102) 2020-04-18 11:47:15 -03:00
repo.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
repo_branch.go Add block on official review requests branch protection (#13705) 2020-11-28 21:30:46 +02:00
repo_collaborator.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
repo_commit.go [API] Add affected files of commits to commit struct (#14579) 2021-02-07 15:43:40 +01:00
repo_file.go enhancement: add signoff option in commit form (#14516) 2021-01-29 16:57:45 +08:00
repo_key.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
repo_refs.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
repo_tag.go Fixes #2738 - Adds the /git/tags API endpoint (#7138) 2019-06-08 17:31:11 +03:00
repo_topic.go Add API endpoint for accessing repo topics (#7963) 2019-09-03 23:46:24 +08:00
repo_tree.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
repo_watch.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
settings.go Export LFS & TimeTracking function status (#14753) 2021-02-20 11:17:51 +01:00
status.go [Refactor] CombinedStatus and CommitStatus related functions & structs (#14026) 2020-12-18 11:33:32 +08:00
task.go Move migrating repository from frontend to backend (#6200) 2019-10-13 21:23:14 +08:00
user.go Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
user_app.go Remove Unused Functions (#10516) 2020-03-02 00:05:44 +02:00
user_email.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
user_gpgkey.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
user_key.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00