gitea

History

Gusted 09adc26eb6 Set correct PR status on 3way on conflict checking (#19457 ) (#19458 )

- Backport #19457
  - 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.
  - Ref: Fix the latest error for https://gitea.com/gitea/go-sdk/pulls/579

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

2022-04-22 09:11:42 +08:00

admin

Move user/org deletion to services (#17673 )

2021-11-19 01:42:27 +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

Fix the bug: deploy key with write access can not push (#19010 ) (#19182 )

2022-03-23 13:44:41 +00:00

auth

Attempt to fix the webauthn migration again - part 3 (#18770 ) (#18771 )

2022-02-16 21:15:49 +00:00

avatars

slight optimization for default avatar (#18187 )

2022-01-05 07:00:32 +01:00

Refactor auth package (#17962 )

2022-01-02 21:12:35 +08:00

fixtures

Support webauthn (#17957 )

2022-01-14 16:03:31 +01:00

issues

Show fullname on issue edits and gpg/ssh signing info (#18828 )

2022-02-20 21:47:17 +00:00

migrations

Update the webauthn_credential_id_sequence in Postgres (#19048 ) (#19060 )

2022-03-13 12:02:19 +08:00

perm

Team permission allow different unit has different permission (#17811 )

2022-01-05 11:37:00 +08:00

repo

Touch mirrors on even on fail to update (#19217 ) (#19233 )

2022-03-27 23:08:28 +02:00

unit

Let return correct perm (#18675 ) (#18689 )

2022-02-09 20:19:48 +00:00

unittest

tests: s/GITEA_UNIT_TESTS_VERBOSE/GITEA_UNIT_TESTS_LOG_SQL/ (#18142 )

2022-01-01 04:31:24 +01:00

user

Restrict email address validation (#17688 ) (#19085 )

2022-03-14 20:51:58 +01:00

webhook

Only send webhook events to active system webhooks and only deliver to active hooks (#19234 ) (#19248 )

2022-03-29 14:12:56 +02:00

access_test.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

access.go

Team permission allow different unit has different permission (#17811 )

2022-01-05 11:37:00 +08:00

action_list.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

action_test.go

Some repository refactors (#17950 )

2021-12-12 23:48:20 +08:00

action.go

Prevent hang in git cat-file if repository is not a valid repository and other fixes (#17991 )

2021-12-16 19:01:14 +00:00

branches_test.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

branches.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

commit_status_test.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

commit_status.go

Add missing X-Total-Count and fix some related bugs (#17968 )

2021-12-15 13:39:34 +08:00

commit.go

Collaborator trust model should trust collaborators (#18539 ) (#18557 )

2022-02-03 11:20:37 -05:00

consistency_test.go

A better go code formatter, and now make fmt can run in Windows (#17684 )

2021-11-17 20:34:35 +08:00

consistency.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

engine_test.go

Refactor install page (db type) (#17919 )

2021-12-07 13:44:08 +08:00

error.go

Some repository refactors (#17950 )

2021-12-12 23:48:20 +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_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 ) (#19182 )

2022-03-23 13:44:41 +00:00

helper.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

issue_assignees_test.go

Move user related model into models/user (#17781 )

2021-11-24 17:49:20 +08:00

issue_assignees.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

issue_comment_list.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

issue_comment_test.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

issue_comment.go

Fix PR comments UI (#18323 )

2022-01-19 01:28:38 +08:00

issue_dependency_test.go

Move user related model into models/user (#17781 )

2021-11-24 17:49:20 +08:00

issue_dependency.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

issue_label_test.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

issue_label.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

issue_list_test.go

Decouple unit test, remove intermediate unittestbridge package (#17662 )

2021-11-16 16:53:21 +08:00

issue_list.go

Use conditions but not repo ids as query condition (#16839 )

2021-12-29 21:02:12 +08:00

issue_lock.go

Fix CheckRepoStats and reuse it during migration (#18264 )

2022-01-17 19:31:58 +01:00

issue_milestone_test.go

Fix CheckRepoStats and reuse it during migration (#18264 )

2022-01-17 19:31:58 +01:00

issue_milestone.go

Only view milestones from current repo (#18414 ) (#18417 )

2022-01-26 22:09:07 +00:00

issue_reaction_test.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

issue_reaction.go

Add missing X-Total-Count and fix some related bugs (#17968 )

2021-12-15 13:39:34 +08:00

issue_stopwatch_test.go

Move user related model into models/user (#17781 )

2021-11-24 17:49:20 +08:00

issue_stopwatch.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

issue_test.go

Fix CheckRepoStats and reuse it during migration (#18264 )

2022-01-17 19:31:58 +01:00

issue_tracked_time_test.go

Move user related model into models/user (#17781 )

2021-11-24 17:49:20 +08:00

issue_tracked_time.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_user.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +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_watch.go

Add missing X-Total-Count and fix some related bugs (#17968 )

2021-12-15 13:39:34 +08:00

issue_xref_test.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

issue_xref.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

issue.go

API: Search Issues, dont show 500 if filter result in empty list (#19244 ) (#19436 )

2022-04-20 18:30:42 +02:00

lfs_lock.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

lfs.go

Improve SyncMirrors logging (#19045 ) (#19050 )

2022-03-10 16:06:35 +01:00

main_test.go

Move keys to models/asymkey (#17917 )

2021-12-10 16:14:24 +08:00

migrate_test.go

remove redundant call to UpdateRepoStats during migration (#18591 ) (#18794 )

2022-02-17 17:57:05 +00:00

migrate.go

remove redundant call to UpdateRepoStats during migration (#18591 ) (#18794 )

2022-02-17 17:57:05 +00:00

notification_test.go

Move user related model into models/user (#17781 )

2021-11-24 17:49:20 +08:00

notification.go

Ignore missing comment for user notifications (#18954 ) (#19043 )

2022-03-10 01:48:27 -05:00

org_team_test.go

Add GetUserTeams (#18499 ) (#18531 )

2022-02-02 08:40:04 +00:00

org_team.go

Performance improvement for add team user when org has more than 1000 repositories (#19227 ) (#19289 )

2022-04-01 11:36:12 +03:00

org_test.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

org.go

Team permission allow different unit has different permission (#17811 )

2022-01-05 11:37:00 +08:00

project_board.go

Support sorting for project board issuses (#17152 )

2021-12-08 14:57:18 +08:00

project_issue.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

project_test.go

Decouple unit test code from business code (#17623 )

2021-11-12 22:36:47 +08:00

project.go

Remove NewSession method from db.Engine interface (#17577 )

2021-11-21 23:41:00 +08:00

protected_tag_test.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

protected_tag.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08: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 ) (#19277 )

2022-03-31 16:57:13 +02:00

pull.go

Set correct PR status on 3way on conflict checking (#19457 ) (#19458 )

2022-04-22 09:11:42 +08:00

release.go

Some repository refactors (#17950 )

2021-12-12 23:48:20 +08:00

repo_activity.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

repo_collaboration_test.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

repo_collaboration.go

Some repository refactors (#17950 )

2021-12-12 23:48:20 +08:00

repo_generate_test.go

Fixed assert statements. (#16089 )

2021-06-07 07:27:09 +02:00

repo_generate.go

Some repository refactors (#17950 )

2021-12-12 23:48:20 +08:00

repo_list_test.go

Decouple unit test, remove intermediate unittestbridge package (#17662 )

2021-11-16 16:53:21 +08:00

repo_list.go

Prevent ambiguous column error in organizations page (#18314 )

2022-01-18 07:45:14 +00:00

repo_permission_test.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

repo_permission.go

Team permission allow different unit has different permission (#17811 )

2022-01-05 11:37:00 +08:00

repo_test.go

Fix potential assignee query for repo (#18994 ) (#18999 )

2022-03-05 00:12:34 +08:00

repo_transfer_test.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +08:00

repo_transfer.go

Some repository refactors (#17950 )

2021-12-12 23:48:20 +08:00

repo.go

Fix potential assignee query for repo (#18994 ) (#18999 )

2022-03-05 00:12:34 +08:00

review_test.go

Move user related model into models/user (#17781 )

2021-11-24 17:49:20 +08:00

review.go

Fix various typos (#18219 )

2022-01-10 17:32:37 +08:00

statistic.go

Refactor auth package (#17962 )

2022-01-02 21:12:35 +08:00

task.go

Move repository model into models/repo (#17933 )

2021-12-10 09:27:50 +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

token.go

Refactor auth package (#17962 )

2022-01-02 21:12:35 +08:00

upload.go

Remove NewSession method from db.Engine interface (#17577 )

2021-11-21 23:41:00 +08:00

user_heatmap_test.go

Move user related model into models/user (#17781 )

2021-11-24 17:49:20 +08:00

user_heatmap.go

Move user related model into models/user (#17781 )

2021-11-24 17:49:20 +08:00

user_test.go

Use conditions but not repo ids as query condition (#16839 )

2021-12-29 21:02:12 +08:00

user.go

Cleanup protected branches when deleting users & teams (#19158 ) (#19174 )

2022-03-23 13:56:53 +08:00

userlist_test.go

Move more model into models/user (#17826 )

2021-11-28 22:11:58 +08:00

userlist.go

Move more model into models/user (#17826 )

2021-11-28 22:11:58 +08:00