Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,813 Commits 17 Branches 214 Tags 801 MiB
Commit Graph

9 Commits

Author SHA1 Message Date
zeripath 5c3863c319 Restore functionality for early gits (#7775) (#8476) 
* Change tests to make it possible to run TestGit with 1.7.2

* Make merge run on 1.7.2

* Fix tracking and staging branch name problem

* Ensure that git 1.7.2 works on tests

* ensure that there is no chance for conflicts

* Fix-up missing merge issues

* Final rm

* Ensure LFS filters run on the tests

* Do not sign commits from temp repo

* Apply suggestions from code review

* Update modules/repofiles/temp_repo.go
 2019-10-13 12:40:13 +08:00
Mura Li 9e8df4b838 Fix pull merge 500 error caused by git-fetch breaking behaviors (#8194) 2019-09-16 13:27:05 -04:00
Mura Li e7f6da386f Avoid ambiguity of branch/directory names for the git-diff-tree command (#8066) (#8070) 2019-09-03 22:58:19 +03:00
Antoine GIRARD 89915ca8a0 Fix duplicate call of webhook (#7821) (#7824) 2019-08-12 09:53:26 +08:00
Lunny Xiao 4c69e158e5 Fix bug create/edit wiki pages when code master branch protected (#7580) (#7623) 
* fix bug create/edit wiki pages when code master branch protected

* improve FullPushingEnvironment function
 2019-07-26 04:22:20 +03:00
zeripath b7e41f7b8f
Fix panic on push at #7611 (#7615) (#7618) 
* Fix panic in #7611

Use pr.IssueID instead of pr.Issue.ID as Issue may not be loaded and is unnecessary

* Only fetch the head branch from the remote
 2019-07-25 22:23:52 +01:00
Lunny Xiao 3fd07a0be6
remove duplicated webhook trigger (#7511) (#7516) 2019-07-18 21:20:35 +08:00
zeripath 3563650bdb #6946 Run hooks on merge/edit and cope with protected branches (#6961) 
* Fix #6946 by checking PullRequest ID on pushing

* Ensure we have the owner name, the pr attributes and the the issue

* Fix TestSearchRepo by waiting till indexing is done

* Update integrations/repo_search_test.go

* changes as per @mrsdizzie

* missing comma

* Spelling mistake

* Fix full pushing environment
 2019-07-01 09:18:13 +08:00
zeripath baefea311f
Fix #732: Add LFS objects to base repository on merging (#7082) 
On merge we walk the merge history and ensure that all lfs objects pointed to in
the history are added to the base repository. This switches from relying on having git-lfs installed on the server, (and in fact .gitattributes being correctly installed.)
 2019-06-22 18:35:34 +01:00