mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 09:31:53 +01:00 
			
		
		
		
	Backport #32949 by wxiaoguang * Fix #32871 * Fix #32948 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		
							parent
							
								
									57868c2315
								
							
						
					
					
						commit
						c442c682ef
					
				| @ -1,4 +1,4 @@ | ||||
| <button class="ui green button js-btn-clone-panel"> | ||||
| <button class="ui primary button js-btn-clone-panel"> | ||||
| 	<span>{{svg "octicon-code" 16}} Code</span> | ||||
| 	{{svg "octicon-triangle-down" 14 "dropdown icon"}} | ||||
| </button> | ||||
|  | ||||
| @ -10,7 +10,7 @@ | ||||
| 		{{end}} | ||||
| 	</div> | ||||
| 	{{if .CanWriteCode}} | ||||
| 	<button class="ui compact green button tw-m-0 link-action" data-url="{{.Repository.Link}}/branches/merge-upstream?branch={{.BranchName}}"> | ||||
| 	<button class="ui compact primary button tw-m-0 link-action" data-url="{{.Repository.Link}}/branches/merge-upstream?branch={{.BranchName}}"> | ||||
| 		{{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge"}} | ||||
| 	</button> | ||||
| 	{{end}} | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user