meissa
/
forgejo
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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-federated-star
forgejo
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '11229ca539'
${ noResults }
forgejo/models
History
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
..
fixtures Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 3 years ago
migrations Migrate to use jsoniter instead of encoding/json (#14841) 3 years ago
access.go Upgrade xorm to v1.0.0 (#10646) 4 years ago
access_test.go Fix "access" fixtures and tests (#10247) 4 years ago
action.go Heatmap days clickable (#13935) 3 years ago
action_list.go refactor: reduce sql query in retrieveFeeds (#3547) 6 years ago
action_test.go Clarify the suffices and prefixes of setting.AppSubURL and setting.AppURL (#12999) 3 years ago
admin.go Enhance Ghost comment mitigation Settings (#14392) 3 years ago
admin_test.go Fix tests code to prevent some runtime errors (#2381) 7 years ago
attachment.go [Refactor] Move APIFormat functions into convert package (#12856) 4 years ago
attachment_test.go Reading pull attachments should depend on read UnitTypePullRequests (#10346) 4 years ago
avatar.go Fix frontpage avatars (#13853) 4 years ago
avatar_test.go Direct avatar rendering (#13649) 4 years ago
branches.go Add dismiss review feature (#12674) 3 years ago
branches_test.go Add deleted_branch table fixture (#2832) 7 years ago
commit_status.go Show dropdown with all statuses for commit (#13977) 4 years ago
commit_status_test.go Fix bug about ListOptions and stars/watchers pagnation (#14556) 3 years ago
consistency.go Prevent adding nil label to .AddedLabels or .RemovedLabels (#14623) 3 years ago
context.go Upgrade xorm to v1.0.2 (#11900) 4 years ago
convert.go Whilst changing the character set to utf8mb4 we should set ROW_FORMAT=dynamic too (#12804) 4 years ago
error.go Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 3 years ago
error_oauth2.go gofmt (#1662) 7 years ago
external_login_user.go Migrate reviews when migrating repository from github (#9463) 5 years ago
fixture_generation.go Move fixture generation to contrib and add test (#10277) 4 years ago
fixture_test.go Move fixture generation to contrib and add test (#10277) 4 years ago
gpg_key.go Fix gpg key deletion (#14561) 3 years ago
gpg_key_test.go Allow addition of gpg keyring with multiple keys (#12487) 4 years ago
helper.go Add reactions to issues/PR and comments (#2856) 7 years ago
helper_directory.go Re-attempt to delete temporary upload if the file is locked by another process (#12447) 4 years ago
helper_environment.go Set setting.AppURL as GITEA_ROOT_URL environment variable during pushes (#12752) 4 years ago
issue.go Make searching issues by keyword case insensitive on DB (#14848) 3 years ago
issue_assignees.go Enhance Ghost comment mitigation Settings (#14392) 3 years ago
issue_assignees_test.go Fix API Bug (fail on empty assignees) (#8873) 5 years ago
issue_comment.go Migrate to use jsoniter instead of encoding/json (#14841) 3 years ago
issue_comment_list.go Fixed repo link in generated comment for cross repository dependency (#9863) 5 years ago
issue_comment_test.go Pull request review/approval and comment on code (#3748) 6 years ago
issue_dependency.go Display ui time with customize time location (#7792) 5 years ago
issue_dependency_test.go Refactor comment (#9330) 5 years ago
issue_label.go Check if label template exist first (#14384) 3 years ago
issue_label_test.go Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124) 4 years ago
issue_list.go Add dismiss review feature (#12674) 3 years ago
issue_list_test.go Add Organization Wide Labels (#10814) 4 years ago
issue_lock.go remove unused method and rename createcommentWithNoAction (#9367) 5 years ago
issue_milestone.go Add Created & Updated to Milestone (#12662) 4 years ago
issue_milestone_test.go Add name filter to API for GetMilestoneList (#12336) 4 years ago
issue_reaction.go Enhance Ghost comment mitigation Settings (#14392) 3 years ago
issue_reaction_test.go Migrate reactions when migrating repository from github (#9599) 5 years ago
issue_stopwatch.go Add UI to delete tracked times (#14100) 3 years ago
issue_stopwatch_test.go Add gitea-vet (#10948) 4 years ago
issue_test.go Sort issue search results by revelance (#14353) 4 years ago
issue_tracked_time.go Add UI to delete tracked times (#14100) 3 years ago
issue_tracked_time_test.go [API] Extend times API (#9200) 5 years ago
issue_user.go Mail assignee when issue/pull request is assigned (#8546) 5 years ago
issue_user_test.go Add "Update Branch" button to Pull Requests (#9784) 5 years ago
issue_watch.go Add issue subscription check to API (#10967) 4 years ago
issue_watch_test.go API add/generalize pagination (#9452) 4 years ago
issue_xref.go migrate from com.* to alternatives (#14103) 4 years ago
issue_xref_test.go Refactor comment (#9330) 5 years ago
lfs.go LFS support to be stored on minio (#12518) 4 years ago
lfs_lock.go Move LFSLock APIFormat into convert package (#13808) 4 years ago
list_options.go Fix bug about ListOptions and stars/watchers pagnation (#14556) 3 years ago
log.go Refactor Logger (#13294) 4 years ago
login_source.go Migrate to use jsoniter instead of encoding/json (#14841) 3 years ago
main_test.go Add gitea-vet (#10948) 4 years ago
migrate.go [BugFix] remove nil inserts in models (#11096) 4 years ago
models.go Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 3 years ago
models_test.go gitea dump: include version & Check InstallLock (#12760) 4 years ago
notification.go Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 3 years ago
notification_test.go add request review from specific reviewers feature in pull request (#10756) 4 years ago
oauth2.go Disable broken OAuth2 providers at startup (#14802) 3 years ago
oauth2_application.go Minimal OpenID Connect implementation (#14139) 4 years ago
oauth2_application_test.go Minimal OpenID Connect implementation (#14139) 4 years ago
org.go Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 3 years ago
org_team.go Automatically remove Watches, Assignments, etc if user loses access due to being removed as collaborator or from a team (#10997) 4 years ago
org_team_test.go API add/generalize pagination (#9452) 4 years ago
org_test.go Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 3 years ago
project.go Kanban board (#8346) 4 years ago
project_board.go Add v171 (addSortingColToProjectBoard) migration for #14634 (#14652) 3 years ago
project_issue.go Kanban board (#8346) 4 years ago
project_test.go Kanban board (#8346) 4 years ago
pull.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 3 years ago
pull_list.go API add/generalize pagination (#9452) 4 years ago
pull_sign.go Add configurable Trust Models (#11712) 4 years ago
pull_test.go Display pull request head branch even the branch deleted or repository deleted (#10413) 4 years ago
release.go Add the tag list page to the release page (#12096) 4 years ago
repo.go Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 3 years ago
repo_activity.go Add top author stats to activity page (#9615) 5 years ago
repo_avatar.go Avatars and Repo avatars support storing in minio (#12516) 4 years ago
repo_branch.go Move newbranch to standalone package (#9627) 5 years ago
repo_collaboration.go Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124) 4 years ago
repo_collaboration_test.go API add/generalize pagination (#9452) 4 years ago
repo_generate.go Fix broken migration on webhook (#13911) 4 years ago
repo_generate_test.go Variable expansion in repository templates (#9163) 5 years ago
repo_indexer.go Index code and stats only for non-empty repositories (#10251) 4 years ago
repo_issue.go Add EnableTimetracking option to app settings (#3719) 6 years ago
repo_language_stats.go Increase size of the language column in language_stat (#12396) 4 years ago
repo_list.go Team dashboards (#14159) 4 years ago
repo_list_test.go Issues overview should not show issues from archived repos (#13220) 4 years ago
repo_mirror.go Move some repository methods from models to modules/repository (#9353) 5 years ago
repo_permission.go ui: show 'owner' tag for real owner (#13689) 4 years ago
repo_permission_test.go fix bug when update owner team then visit team's repo return 404 (#6119) 5 years ago
repo_redirect.go Redirect on changed user and org name (#11649) 3 years ago
repo_redirect_test.go Redirect on changed user and org name (#11649) 3 years ago
repo_sign.go Add configurable Trust Models (#11712) 4 years ago
repo_test.go Add team support for review request (#12039) 4 years ago
repo_transfer.go Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 3 years ago
repo_transfer_test.go Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 3 years ago
repo_unit.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 3 years ago
repo_watch.go Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124) 4 years ago
repo_watch_test.go API add/generalize pagination (#9452) 4 years ago
review.go Add dismiss review feature (#12674) 3 years ago
review_test.go Add dismiss review feature (#12674) 3 years ago
session.go Create DB session provider(based on xorm) (#13031) 3 years ago
sql_postgres_with_schema.go Ensure that schema search path is set with every connection on postgres (#14131) 4 years ago
ssh_key.go Allow ssh-keygen on Windows to detect ssh key type (#14413) 3 years ago
ssh_key_test.go Add support for ed25519_sk and ecdsa_sk SSH keys (#13462) 3 years ago
star.go Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124) 4 years ago
star_test.go API add/generalize pagination (#9452) 4 years ago
task.go Migrate to use jsoniter instead of encoding/json (#14841) 3 years ago
test_fixtures.go upgrade to use testfixtures v3 (#11904) 4 years ago
token.go [API] Delete Token accept names too (#12366) 4 years ago
token_test.go [API] Delete Token accept names too (#12366) 4 years ago
topic.go Change topic name size from 25 to 50 (#14150) 4 years ago
topic_test.go API add/generalize pagination (#9452) 4 years ago
twofactor.go Attachments: Add extension support, allow all types for releases (#12465) 4 years ago
u2f.go Display ui time with customize time location (#7792) 5 years ago
u2f_test.go Add gitea-vet (#10948) 4 years ago
unit.go Kanban board (#8346) 4 years ago
unit_tests.go migrate from com.* to alternatives (#14103) 4 years ago
update.go Remove Unused Functions (#10516) 4 years ago
upload.go Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186) 4 years ago
user.go Add Password Algorithm option to install page (#14701) 3 years ago
user_avatar.go Clarify the suffices and prefixes of setting.AppSubURL and setting.AppURL (#12999) 3 years ago
user_follow.go Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124) 4 years ago
user_follow_test.go Add gitea-vet (#10948) 4 years ago
user_heatmap.go Team dashboards (#14159) 4 years ago
user_heatmap_test.go Migrate to use jsoniter instead of encoding/json (#14841) 3 years ago
user_mail.go skip email validation on empty string (#13627) 4 years ago
user_mail_test.go Admin page for managing user e-mail activation (#10557) 4 years ago
user_openid.go Use ID or Where to instead directly use Get when load object from database (#11925) 4 years ago
user_openid_test.go Add golangci (#6418) 5 years ago
user_redirect.go Redirect on changed user and org name (#11649) 3 years ago
user_redirect_test.go Redirect on changed user and org name (#11649) 3 years ago
user_test.go Issues overview should not show issues from archived repos (#13220) 4 years ago
userlist.go [Refactor] Move APIFormat functions into convert package (#12856) 4 years ago
userlist_test.go Team permission to create repository in organization (#8312) 5 years ago
webhook.go Migrate to use jsoniter instead of encoding/json (#14841) 3 years ago
webhook_test.go Migrate to use jsoniter instead of encoding/json (#14841) 3 years ago
wiki.go Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186) 4 years ago
wiki_test.go Move wiki related funtions from models to services/wiki (#9355) 5 years ago