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
..
fixtures	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	2021-03-01 01:47:30 +01:00
migrations	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
access.go
access_test.go
action.go	Heatmap days clickable (#13935)	2021-02-20 17:08:58 -05:00
action_list.go
action_test.go	Clarify the suffices and prefixes of setting.AppSubURL and setting.AppURL (#12999)	2021-02-19 22:36:43 +01:00
admin.go	Enhance Ghost comment mitigation Settings (#14392)	2021-01-21 21:56:19 -05:00
admin_test.go
attachment.go	[Refactor] Move APIFormat functions into convert package (#12856)	2020-10-17 00:23:08 -04:00
attachment_test.go
avatar.go	Fix frontpage avatars (#13853)	2020-12-09 01:12:15 +01:00
avatar_test.go	Direct avatar rendering (#13649)	2020-12-03 19:46:11 +01:00
branches.go	Add dismiss review feature (#12674)	2021-02-11 18:32:25 +01:00
branches_test.go
commit_status.go	Show dropdown with all statuses for commit (#13977)	2020-12-20 11:13:12 +08:00
commit_status_test.go	Fix bug about ListOptions and stars/watchers pagnation (#14556)	2021-02-04 11:23:46 -06:00
consistency.go	Prevent adding nil label to .AddedLabels or .RemovedLabels (#14623)	2021-02-10 10:50:44 +08:00
context.go
convert.go	Whilst changing the character set to utf8mb4 we should set ROW_FORMAT=dynamic too (#12804)	2020-09-11 09:25:06 +01:00
error.go	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	2021-03-01 01:47:30 +01:00
error_oauth2.go
external_login_user.go
fixture_generation.go
fixture_test.go
gpg_key.go	Fix gpg key deletion (#14561)	2021-02-04 17:16:21 +08:00
gpg_key_test.go
helper.go
helper_directory.go
helper_environment.go	Set setting.AppURL as GITEA_ROOT_URL environment variable during pushes (#12752)	2020-09-06 23:53:42 -04:00
issue.go	Make searching issues by keyword case insensitive on DB (#14848)	2021-03-02 14:07:01 +01:00
issue_assignees.go	Enhance Ghost comment mitigation Settings (#14392)	2021-01-21 21:56:19 -05:00
issue_assignees_test.go
issue_comment.go	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
issue_comment_list.go
issue_comment_test.go
issue_dependency.go
issue_dependency_test.go
issue_label.go	Check if label template exist first (#14384)	2021-01-18 21:00:50 +01:00
issue_label_test.go	Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124)	2020-10-12 20:01:57 -04:00
issue_list.go	Add dismiss review feature (#12674)	2021-02-11 18:32:25 +01:00
issue_list_test.go
issue_lock.go
issue_milestone.go	Add Created & Updated to Milestone (#12662)	2020-09-05 13:38:54 -04:00
issue_milestone_test.go
issue_reaction.go	Enhance Ghost comment mitigation Settings (#14392)	2021-01-21 21:56:19 -05:00
issue_reaction_test.go
issue_stopwatch.go	Add UI to delete tracked times (#14100)	2021-02-19 12:52:11 +02:00
issue_stopwatch_test.go
issue_test.go	Sort issue search results by revelance (#14353)	2021-01-16 12:55:17 +08:00
issue_tracked_time.go	Add UI to delete tracked times (#14100)	2021-02-19 12:52:11 +02:00
issue_tracked_time_test.go
issue_user.go
issue_user_test.go
issue_watch.go
issue_watch_test.go
issue_xref.go	migrate from com.* to alternatives (#14103)	2020-12-25 11:59:32 +02:00
issue_xref_test.go
lfs.go	LFS support to be stored on minio (#12518)	2020-09-08 23:45:10 +08:00
lfs_lock.go	Move LFSLock APIFormat into convert package (#13808)	2020-12-03 16:05:48 +02:00
list_options.go	Fix bug about ListOptions and stars/watchers pagnation (#14556)	2021-02-04 11:23:46 -06:00
log.go	Refactor Logger (#13294)	2020-10-31 01:36:46 -04:00
login_source.go	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
main_test.go
migrate.go
models.go	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	2021-03-01 01:47:30 +01:00
models_test.go	gitea dump: include version & Check InstallLock (#12760)	2020-09-07 23:27:17 +01:00
notification.go	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	2021-03-01 01:47:30 +01:00
notification_test.go
oauth2.go	Disable broken OAuth2 providers at startup (#14802)	2021-02-25 22:20:58 -05:00
oauth2_application.go	Minimal OpenID Connect implementation (#14139)	2021-01-02 00:33:27 +08:00
oauth2_application_test.go	Minimal OpenID Connect implementation (#14139)	2021-01-02 00:33:27 +08:00
org.go	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	2021-03-01 01:47:30 +01:00
org_team.go
org_team_test.go
org_test.go	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	2021-03-01 01:47:30 +01:00
project.go
project_board.go	Add v171 (addSortingColToProjectBoard) migration for #14634 (#14652)	2021-02-12 13:01:26 +02:00
project_issue.go
project_test.go
pull.go	Make manual merge autodetection optional and add manual merge as merge method (#12543)	2021-03-03 22:41:23 -05:00
pull_list.go
pull_sign.go	Add configurable Trust Models (#11712)	2020-09-20 00:44:55 +08:00
pull_test.go
release.go	Add the tag list page to the release page (#12096)	2020-11-02 18:10:22 -05:00
repo.go	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	2021-03-01 01:47:30 +01:00
repo_activity.go
repo_avatar.go	Avatars and Repo avatars support storing in minio (#12516)	2020-10-14 21:07:51 +08:00
repo_branch.go
repo_collaboration.go	Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124)	2020-10-12 20:01:57 -04:00
repo_collaboration_test.go
repo_generate.go	Fix broken migration on webhook (#13911)	2020-12-09 17:20:13 +00:00
repo_generate_test.go
repo_indexer.go
repo_issue.go
repo_language_stats.go
repo_list.go	Team dashboards (#14159)	2020-12-27 21:58:03 +02:00
repo_list_test.go	Issues overview should not show issues from archived repos (#13220)	2021-01-12 23:19:17 -05:00
repo_mirror.go
repo_permission.go	ui: show 'owner' tag for real owner (#13689)	2020-11-28 17:52:29 +02:00
repo_permission_test.go
repo_redirect.go	Redirect on changed user and org name (#11649)	2021-01-24 16:23:05 +01:00
repo_redirect_test.go	Redirect on changed user and org name (#11649)	2021-01-24 16:23:05 +01:00
repo_sign.go	Add configurable Trust Models (#11712)	2020-09-20 00:44:55 +08:00
repo_test.go	Add team support for review request (#12039)	2020-10-12 20:55:13 +01:00
repo_transfer.go	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	2021-03-01 01:47:30 +01:00
repo_transfer_test.go	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	2021-03-01 01:47:30 +01:00
repo_unit.go	Make manual merge autodetection optional and add manual merge as merge method (#12543)	2021-03-03 22:41:23 -05:00
repo_watch.go	Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124)	2020-10-12 20:01:57 -04:00
repo_watch_test.go
review.go	Add dismiss review feature (#12674)	2021-02-11 18:32:25 +01:00
review_test.go	Add dismiss review feature (#12674)	2021-02-11 18:32:25 +01:00
session.go	Create DB session provider(based on xorm) (#13031)	2021-02-15 00:33:31 -05:00
sql_postgres_with_schema.go	Ensure that schema search path is set with every connection on postgres (#14131)	2021-01-02 10:07:43 +08:00
ssh_key.go	Allow ssh-keygen on Windows to detect ssh key type (#14413)	2021-01-21 21:10:36 +01:00
ssh_key_test.go	Add support for ed25519_sk and ecdsa_sk SSH keys (#13462)	2021-01-20 20:36:55 +00:00
star.go	Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124)	2020-10-12 20:01:57 -04:00
star_test.go
task.go	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
test_fixtures.go
token.go	[API] Delete Token accept names too (#12366)	2020-08-28 11:09:33 +03:00
token_test.go	[API] Delete Token accept names too (#12366)	2020-08-28 11:09:33 +03:00
topic.go	Change topic name size from 25 to 50 (#14150)	2020-12-26 23:28:47 +00:00
topic_test.go
twofactor.go	Attachments: Add extension support, allow all types for releases (#12465)	2020-10-05 01:49:33 -04:00
u2f.go
u2f_test.go
unit.go
unit_tests.go	migrate from com.* to alternatives (#14103)	2020-12-25 11:59:32 +02:00
update.go
upload.go	Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186)	2020-11-27 21:42:08 -05:00
user.go	Add Password Algorithm option to install page (#14701)	2021-02-16 23:37:20 +01:00
user_avatar.go	Clarify the suffices and prefixes of setting.AppSubURL and setting.AppURL (#12999)	2021-02-19 22:36:43 +01:00
user_follow.go	Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124)	2020-10-12 20:01:57 -04:00
user_follow_test.go
user_heatmap.go	Team dashboards (#14159)	2020-12-27 21:58:03 +02:00
user_heatmap_test.go	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
user_mail.go	skip email validation on empty string (#13627)	2020-11-20 23:45:55 +02:00
user_mail_test.go
user_openid.go
user_openid_test.go
user_redirect.go	Redirect on changed user and org name (#11649)	2021-01-24 16:23:05 +01:00
user_redirect_test.go	Redirect on changed user and org name (#11649)	2021-01-24 16:23:05 +01:00
user_test.go	Issues overview should not show issues from archived repos (#13220)	2021-01-12 23:19:17 -05:00
userlist.go	[Refactor] Move APIFormat functions into convert package (#12856)	2020-10-17 00:23:08 -04:00
userlist_test.go
webhook.go	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
webhook_test.go	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
wiki.go	Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186)	2020-11-27 21:42:08 -05:00
wiki_test.go