gitea

Commit Graph

Author	SHA1	Message	Date
zeripath	3563650bdb	#6946 An error occurred Run hooks on merge/edit and cope with protected branches (#6961 An error occurred ) * Fix #6946 An error occurred 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	6 years ago
zeripath	baefea311f	Fix #732 An error occurred : Add LFS objects to base repository on merging (#7082 An error occurred ) 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.)	6 years ago

Author

SHA1

Message

Date

zeripath

3563650bdb

#6946 Run hooks on merge/edit and cope with protected branches (#6961)

* Fix #6946  An error occurred
  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

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.)

2 Commits (7166629d9c2b71fe29a717a121bc080ba656cda2)