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 '889a8c268c'
${ noResults }
forgejo/models
History
zeripath 1eebbf23f0
When conflicts have been previously detected ensure that they can be resolved (#19247) 
There is yet another problem with conflicted files not being reset when
the test patch resolves them.

This PR adjusts the code for checkConflicts to reset the ConflictedFiles
field immediately at the top. It also adds a reset to conflictedFiles
for the manuallyMerged and a shortcut for the empty status in
protectedfiles.

Signed-off-by: Andrew Thornton <art27@cantab.net>
 		2 years ago
..
admin New cron task: delete old system notices (#19219) 2 years ago
appstate Sync gitea app path for git hooks and authorized keys when starting (#17335) 3 years ago
asymkey Fix the bug: deploy key with write access can not push (#19010) 2 years ago
auth Attempt to fix the webauthn migration again - part 3 (#18770) 2 years ago
avatars format with gofumpt (#18184) 2 years ago
db Move deletebeans into models/db (#18781) 2 years ago
fixtures Move organization related structs into sub package (#18518) 2 years ago
foreignreference Store the foreign ID of issues during migration (#18446) 2 years ago
issues Show fullname on issue edits and gpg/ssh signing info (#18827) 2 years ago
migrations nit fix (#19116) 2 years ago
organization Move organization related structs into sub package (#18518) 2 years ago
perm Team permission allow different unit has different permission (#17811) 3 years ago
project Move project files into models/project sub package (#17704) 2 years ago
repo Move organization related structs into sub package (#18518) 2 years ago
unit Let `MinUnitAccessMode` return correct perm (#18675) 2 years ago
unittest Add separate SSH_USER config option (#17584) 2 years ago
user Move organization related structs into sub package (#18518) 2 years ago
webhook Only send webhook events to active system webhooks and only deliver to active hooks (#19234) 2 years ago
access.go Move organization related structs into sub package (#18518) 2 years ago
access_test.go Move organization related structs into sub package (#18518) 2 years ago
action.go Move organization related structs into sub package (#18518) 2 years ago
action_list.go RSS/Atom support for Repos (#19055) 2 years ago
action_test.go RSS/Atom support for Repos (#19055) 2 years ago
branches.go Move organization related structs into sub package (#18518) 2 years ago
branches_test.go Move repository model into models/repo (#17933) 3 years ago
commit.go Collaborator trust model should trust collaborators (#18539) 2 years ago
commit_status.go Add missing `X-Total-Count` and fix some related bugs (#17968) 3 years ago
commit_status_test.go Move repository model into models/repo (#17933) 3 years ago
consistency.go format with gofumpt (#18184) 2 years ago
consistency_test.go A better go code formatter, and now `make fmt` can run in Windows (#17684) 3 years ago
engine_test.go Refactor install page (db type) (#17919) 3 years ago
error.go Move project files into models/project sub package (#17704) 2 years ago
fixture_generation.go Move repository model into models/repo (#17933) 3 years ago
fixture_test.go Decouple unit test code from business code (#17623) 3 years ago
helper.go Move repository model into models/repo (#17933) 3 years ago
helper_directory.go refactor: move from io/ioutil to io and os package (#17109) 3 years ago
helper_environment.go Fix the bug: deploy key with write access can not push (#19010) 2 years ago
issue.go Move some issue methods as functions (#19255) 2 years ago
issue_assignees.go Move some issue methods as functions (#19255) 2 years ago
issue_assignees_test.go Move some issue methods as functions (#19255) 2 years ago
issue_comment.go Move some issue methods as functions (#19255) 2 years ago
issue_comment_list.go Move repository model into models/repo (#17933) 3 years ago
issue_comment_test.go Propagate context and ensure git commands run in request context (#17868) 2 years ago
issue_dependency.go Move repository model into models/repo (#17933) 3 years ago
issue_dependency_test.go Move some issue methods as functions (#19255) 2 years ago
issue_label.go Move init repository related functions to modules (#19159) 2 years ago
issue_label_test.go Move init repository related functions to modules (#19159) 2 years ago
issue_list.go Use conditions but not repo ids as query condition (#16839) 3 years ago
issue_list_test.go Decouple unit test, remove intermediate `unittestbridge` package (#17662) 3 years ago
issue_lock.go Fix CheckRepoStats and reuse it during migration (#18264) 2 years ago
issue_milestone.go Only view milestones from current repo (#18414) 2 years ago
issue_milestone_test.go Fix CheckRepoStats and reuse it during migration (#18264) 2 years ago
issue_project.go Move project files into models/project sub package (#17704) 2 years ago
issue_reaction.go add test coverage for original author conversion during migrations (#18506) 2 years ago
issue_reaction_test.go Move repository model into models/repo (#17933) 3 years ago
issue_stopwatch.go Fix display time of milestones (#18753) 2 years ago
issue_stopwatch_test.go Move user related model into models/user (#17781) 3 years ago
issue_test.go Move some issue methods as functions (#19255) 2 years ago
issue_tracked_time.go Fix display time of milestones (#18753) 2 years ago
issue_tracked_time_test.go Refactor SecToTime() function (#18863) 2 years ago
issue_user.go Move repository model into models/repo (#17933) 3 years ago
issue_user_test.go Move repository model into models/repo (#17933) 3 years ago
issue_watch.go Add missing `X-Total-Count` and fix some related bugs (#17968) 3 years ago
issue_watch_test.go A better go code formatter, and now `make fmt` can run in Windows (#17684) 3 years ago
issue_xref.go Lock gofumpt to v0.3.0 and run it (#18866) 2 years ago
issue_xref_test.go Move some issue methods as functions (#19255) 2 years ago
lfs.go Improve SyncMirrors logging (#19045) 2 years ago
lfs_lock.go Move repository model into models/repo (#17933) 3 years ago
main_test.go Move organization related structs into sub package (#18518) 2 years ago
migrate.go Store the foreign ID of issues during migration (#18446) 2 years ago
migrate_test.go Store the foreign ID of issues during migration (#18446) 2 years ago
notification.go Move organization related structs into sub package (#18518) 2 years ago
notification_test.go Move user related model into models/user (#17781) 3 years ago
org.go Move organization related structs into sub package (#18518) 2 years ago
org_team.go Move organization related structs into sub package (#18518) 2 years ago
org_team_test.go Move organization related structs into sub package (#18518) 2 years ago
org_test.go Move organization related structs into sub package (#18518) 2 years ago
protected_tag.go Move organization related structs into sub package (#18518) 2 years ago
protected_tag_test.go Move repository model into models/repo (#17933) 3 years ago
pull.go When conflicts have been previously detected ensure that they can be resolved (#19247) 2 years ago
pull_list.go Don't delete branch if other PRs with this branch are open (#18164) 3 years ago
pull_test.go Don't delete branch if other PRs with this branch are open (#18164) 3 years ago
release.go add test coverage for original author conversion during migrations (#18506) 2 years ago
repo.go Move project files into models/project sub package (#17704) 2 years ago
repo_activity.go Propagate context and ensure git commands run in request context (#17868) 2 years ago
repo_collaboration.go Move organization related structs into sub package (#18518) 2 years ago
repo_collaboration_test.go Move repository model into models/repo (#17933) 3 years ago
repo_generate.go Move init repository related functions to modules (#19159) 2 years ago
repo_generate_test.go Fixed assert statements. (#16089) 3 years ago
repo_list.go Allow to filter repositories by language in explore, user and organization repositories lists (#18430) 2 years ago
repo_list_test.go Decouple unit test, remove intermediate `unittestbridge` package (#17662) 3 years ago
repo_permission.go Move organization related structs into sub package (#18518) 2 years ago
repo_permission_test.go Move organization related structs into sub package (#18518) 2 years ago
repo_test.go Allow users to self-request a PR review (#19030) 2 years ago
repo_transfer.go Move organization related structs into sub package (#18518) 2 years ago
repo_transfer_test.go Move repository model into models/repo (#17933) 3 years ago
review.go Move organization related structs into sub package (#18518) 2 years ago
review_test.go format with gofumpt (#18184) 2 years ago
statistic.go Move project files into models/project sub package (#17704) 2 years ago
task.go Move repository model into models/repo (#17933) 3 years ago
token.go Use base32 for 2FA scratch token (#18384) 2 years ago
token_test.go A better go code formatter, and now `make fmt` can run in Windows (#17684) 3 years ago
upload.go Remove NewSession method from db.Engine interface (#17577) 3 years ago
user.go Move organization related structs into sub package (#18518) 2 years ago
user_heatmap.go Move organization related structs into sub package (#18518) 2 years ago
user_heatmap_test.go RSS/Atom support for Repos (#19055) 2 years ago
user_test.go Move organization related structs into sub package (#18518) 2 years ago
userlist.go Move organization related structs into sub package (#18518) 2 years ago
userlist_test.go Move organization related structs into sub package (#18518) 2 years ago