forks/forgejo
1
0
Fork 0
Code Releases Activity
forgejo/models
History
Gusted ebe569a268
Set correct PR status on 3way on conflict checking (#19457) 
* Set correct PR status on 3way on conflict checking

- When 3-way merge is enabled for conflict checking, it has a new
interesting behavior that it doesn't return any error when it found a
conflict, so we change the condition to not check for the error, but
instead check if conflictedfiles is populated, this fixes a issue
whereby PR status wasn't correctly on conflicted PR's.
- Refactor the mergeable property(which was incorrectly set and lead me this
bug) to be more maintainable.
- Add a dedicated test for conflicting checking, so it should prevent
future issues with this.

* Fix linter
2022-04-21 22:55:45 +01:00
..
admin Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
appstate Sync gitea app path for git hooks and authorized keys when starting (#17335) 2021-10-21 17:22:43 +08:00
asymkey Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
auth Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
avatars format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
db Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
fixtures Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
foreignreference Store the foreign ID of issues during migration (#18446) 2022-03-17 18:08:35 +01:00
issues Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
migrations Remove legacy unknwon/com package (#19298) 2022-04-02 00:34:57 +08:00
organization Fix panic in team repos API (#19431) 2022-04-20 18:43:26 +08:00
packages Add Helm Chart registry (#19406) 2022-04-19 12:55:35 -04:00
perm Team permission allow different unit has different permission (#17811) 2022-01-05 11:37:00 +08:00
project Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
repo Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
unit Let MinUnitAccessMode return correct perm (#18675) 2022-02-08 21:16:17 +00:00
unittest Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
user Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
webhook Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
access.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
access_test.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
action.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
action_list.go Move reaction to models/issues/ (#19264) 2022-03-31 17:20:39 +08:00
action_test.go RSS/Atom support for Repos (#19055) 2022-03-13 17:40:47 +01:00
branches.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
branches_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
commit.go Collaborator trust model should trust collaborators (#18539) 2022-02-02 11:10:06 +01:00
commit_status.go Add missing X-Total-Count and fix some related bugs (#17968) 2021-12-15 13:39:34 +08:00
commit_status_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
consistency.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
consistency_test.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
engine_test.go Refactor install page (db type) (#17919) 2021-12-07 13:44:08 +08:00
error.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
fixture_generation.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
fixture_test.go Decouple unit test code from business code (#17623) 2021-11-12 22:36:47 +08:00
helper.go Move reaction to models/issues/ (#19264) 2022-03-31 17:20:39 +08:00
helper_directory.go refactor: move from io/ioutil to io and os package (#17109) 2021-09-22 13:38:34 +08:00
helper_environment.go Fix the bug: deploy key with write access can not push (#19010) 2022-03-22 17:29:07 +08:00
issue.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
issue_assignees.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
issue_assignees_test.go Move some issue methods as functions (#19255) 2022-03-29 16:57:33 +02:00
issue_comment.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
issue_comment_list.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
issue_comment_test.go Propagate context and ensure git commands run in request context (#17868) 2022-01-19 23:26:57 +00:00
issue_dependency.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
issue_dependency_test.go Move some issue methods as functions (#19255) 2022-03-29 16:57:33 +02:00
issue_label.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
issue_label_test.go Move init repository related functions to modules (#19159) 2022-03-29 15:23:45 +08:00
issue_list.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
issue_list_test.go Decouple unit test, remove intermediate unittestbridge package (#17662) 2021-11-16 16:53:21 +08:00
issue_lock.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
issue_project.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
issue_stopwatch.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
issue_stopwatch_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
issue_test.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
issue_tracked_time.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
issue_tracked_time_test.go Refactor SecToTime() function (#18863) 2022-02-28 23:57:20 +01:00
issue_user.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
issue_user_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
issue_watch.go Add missing X-Total-Count and fix some related bugs (#17968) 2021-12-15 13:39:34 +08:00
issue_watch_test.go A better go code formatter, and now make fmt can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
issue_xref.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
issue_xref_test.go Move some issue methods as functions (#19255) 2022-03-29 16:57:33 +02:00
lfs.go Improve SyncMirrors logging (#19045) 2022-03-10 10:09:48 +00:00
lfs_lock.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
main_test.go Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
migrate.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
migrate_test.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
notification.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
notification_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
org.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
org_team.go Performance improvement for add team user when org has more than 1000 repositories (#19227) 2022-04-01 09:53:18 +08:00
org_team_test.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
org_test.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
protected_tag.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
protected_tag_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
pull.go Set correct PR status on 3way on conflict checking (#19457) 2022-04-21 22:55:45 +01:00
pull_list.go Don't delete branch if other PRs with this branch are open (#18164) 2022-01-03 20:45:58 +01:00
pull_test.go Move checks for pulls before merge into own function (#19271) 2022-03-31 16:53:08 +02:00
release.go add test coverage for original author conversion during migrations (#18506) 2022-02-01 13:20:28 -05:00
repo.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
repo_activity.go Propagate context and ensure git commands run in request context (#17868) 2022-01-19 23:26:57 +00:00
repo_collaboration.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
repo_collaboration_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
repo_generate.go Move init repository related functions to modules (#19159) 2022-03-29 15:23:45 +08:00
repo_generate_test.go Fixed assert statements. (#16089) 2021-06-07 07:27:09 +02:00
repo_list.go Move reaction to models/issues/ (#19264) 2022-03-31 17:20:39 +08:00
repo_list_test.go Decouple unit test, remove intermediate unittestbridge package (#17662) 2021-11-16 16:53:21 +08:00
repo_permission.go Fix broken of team create (#19288) 2022-04-01 14:05:31 +08:00
repo_permission_test.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
repo_test.go Allow users to self-request a PR review (#19030) 2022-03-08 22:48:47 +01:00
repo_transfer.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
repo_transfer_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
review.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
review_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
statistic.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
task.go Use a more general (and faster) method to sanitize URLs with credentials (#19239) 2022-03-31 10:25:40 +08:00
token.go Use base32 for 2FA scratch token (#18384) 2022-01-26 12:10:10 +08:00
token_test.go A better go code formatter, and now make fmt can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
upload.go Remove NewSession method from db.Engine interface (#17577) 2021-11-21 23:41:00 +08:00
user.go Move reaction to models/issues/ (#19264) 2022-03-31 17:20:39 +08:00
user_heatmap.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
user_heatmap_test.go RSS/Atom support for Repos (#19055) 2022-03-13 17:40:47 +01:00
user_test.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
userlist.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00
userlist_test.go Move organization related structs into sub package (#18518) 2022-03-29 14:29:02 +08:00