1
1
mirror of https://github.com/go-gitea/gitea synced 2024-11-16 15:14:24 +00:00
gitea/modules/repofiles
zeripath 7cd47046ea
Handle push rejection in branch and upload (#10854)
* Handle push rejections and push out-of-date in branch creation and
file upload.
* Remove the duplicated sanitize from services/pull/merge
* Move the errors Err(Merge)PushOutOfDate and ErrPushRejected to
modules/git
* Handle errors better in the upload file dialogs

Fix #10460

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
2020-03-28 01:13:18 -03:00
..
action_test.go Improve push update options (#10105) 2020-02-02 15:27:34 -05:00
action.go Improve push update options (#10105) 2020-02-02 15:27:34 -05:00
blob_test.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
blob.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
commit_status.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
commit.go Number of commits ahead/behind in branch overview (#6695) 2019-05-05 19:25:25 +03:00
content_test.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
content.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
delete.go Allow to set protected file patterns that can not be changed under no conditions (#10806) 2020-03-27 00:26:34 +02:00
diff_test.go Expand/Collapse Files and Blob Excerpt while Reviewing/Comparing code (#8924) 2019-11-15 10:52:59 +08:00
diff.go Move git diff codes from models to services/gitdiff (#7889) 2019-09-05 22:20:09 -04:00
file_test.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
file.go File Edit: Author/Committer interchanged [BugFix] (#9297) 2019-12-09 21:11:24 +08:00
repofiles_test.go Fixes 4762 - Content API for Creating, Updating, Deleting Files (#6314) 2019-04-17 12:06:35 -04:00
repofiles.go Fixes 4762 - Content API for Creating, Updating, Deleting Files (#6314) 2019-04-17 12:06:35 -04:00
temp_repo.go Handle push rejection in branch and upload (#10854) 2020-03-28 01:13:18 -03:00
tree_test.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
tree.go fixed bug in GitTreeBySHA where pulling items from a page other than page 1 would fail because the wrong var was used to set the entries to return (#9459) 2019-12-22 00:16:21 +00:00
update.go Handle push rejection in branch and upload (#10854) 2020-03-28 01:13:18 -03:00
upload.go Prevent upload (overwrite) of lfs locked file (#8769) 2019-11-02 15:37:05 +08:00
verification.go Sign merges, CRUD, Wiki and Repository initialisation with gpg key (#7631) 2019-10-16 14:42:42 +01:00