u/ewong/rhodecode-enterprise-ce-fork Files · rhodecode/templates/changeset/changeset_comment_block.mako

git: use force fetch and update for target ref. This solves a case...

git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

marcink - - Load All Authors

File last commit:

r1792:a62f3dac default


                r2784:e8c62649

default

Download file

             changeset_comment_block.mako
        
                    4 lines
            
             | 252 B
            
                | application/x-mako
            
             |
                MakoHtmlLexer
            
             / rhodecode / templates / changeset / changeset_comment_block.mako
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      ## this is a dummy html file for partial rendering on server and sending

      ## generated output via ajax after comment submit

      <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>

      ${comment.comment_block(c.co, inline=c.co.is_inline)}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				## this is a dummy html file for partial rendering on server and sending
				## generated output via ajax after comment submit
				<%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
				${comment.comment_block(c.co, inline=c.co.is_inline)}