0c759fd4de 
								
							 
						 
						
							
							
								
								feat: add DEFAULT_MERGE_STYLE to `repository.pull-request` section for repo init ( #19751 )  
							
							
							
						 
						
							2022-06-02 23:45:54 -04:00  
				
					
						
							
							
								 
						
							
								fd7d83ace6 
								
							 
						 
						
							
							
								
								Move almost all functions' parameter db.Engine to context.Context ( #19748 )  
							
							... 
							
							
							
							* Move almost all functions' parameter db.Engine to context.Context
* remove some unnecessary wrap functions 
							
						 
						
							2022-05-20 22:08:52 +08:00  
				
					
						
							
							
								 
						
							
								368baf9e77 
								
							 
						 
						
							
							
								
								Use Vue to refactor pull merge UI ( #19650 )  
							
							... 
							
							
							
							* Use Vue to refactor pull merge UI
* add comments
* fix comments
* small fine tune
* fix tests
* adopt new pull default messages
* clean up
Co-authored-by: 6543 <6543@obermui.de> 
							
						 
						
							2022-05-12 21:39:02 +08:00  
				
					
						
							
							
								 
						
							
								d4834071da 
								
							 
						 
						
							
							
								
								Repository level enable package or disable ( #19323 )  
							
							
							
						 
						
							2022-05-08 17:51:50 +02:00  
				
					
						
							
							
								 
						
							
								4344a64107 
								
							 
						 
						
							
							
								
								Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md ( #18177 )  
							
							... 
							
							
							
							* Allow custom default merge message with .gitea/MERGE_MESSAGE_<merge_style>_TEMPLATE.md
* Some improvements
* Follow some advices
* Fix bug
* Fix bug
* Fix lint
* Fix close comment
* Fix test
* Fix and docs
* Improve codes
* Update docs and remove unnecessary variables
* return error for GetDefaultMergeMessage
* Fix test
* improve code
* ignore unknow unit type
* return error for GetDefaultMergeMessage
* Update services/pull/merge.go
* Some improvements
* Follow some advices
* Fix bug
* Fix lint
* Improve codes
* Update docs and remove unnecessary variables
* return error for GetDefaultMergeMessage
* improve code
* Handle deleted HeadRepo in GetDefaultMergeMessage
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix test
* Fix test
Co-authored-by: zeripath <art27@cantab.net> 
							
						 
						
							2022-05-08 20:32:45 +08:00  
				
					
						
							
							
								 
						
							
								5184c83f6b 
								
							 
						 
						
							
							
								
								Add config option to disable "Update branch by rebase" ( #18745 )  
							
							
							
						 
						
							2022-03-04 03:30:49 -05:00  
				
					
						
							
							
								 
						
							
								de8e3948a5 
								
							 
						 
						
							
							
								
								Refactor auth package ( #17962 )  
							
							
							
						 
						
							2022-01-02 21:12:35 +08:00  
				
					
						
							
							
								 
						
							
								5723240490 
								
							 
						 
						
							
							
								
								Some repository refactors ( #17950 )  
							
							... 
							
							
							
							* some repository refactors
* remove unnecessary code
* Fix test
* Remove unnecessary banner 
							
						 
						
							2021-12-12 23:48:20 +08:00  
				
					
						
							
							
								 
						
							
								719bddcd76 
								
							 
						 
						
							
							
								
								Move repository model into models/repo ( #17933 )  
							
							... 
							
							
							
							* Some refactors related repository model
* Move more methods out of repository
* Move repository into models/repo
* Fix test
* Fix test
* some improvements
* Remove unnecessary function 
							
						 
						
							2021-12-10 09:27:50 +08:00