upstream/kallithea Files · rhodecode/templates/email_templates/changeset_comment.html

compare: show aggregated diff of what will be merged to other repo, using merge ancestor...

compare: show aggregated diff of what will be merged to other repo, using merge ancestor pull_request.get_compare_data will also now return the ancestor that would be used for actual merging. Showing a diff from that ancestor instead of the first 'new' changeset will give a more realistic diff that doesn't include merges.

Mads Kiilerich - - Load All Authors

File last commit:

r3270:81397bd3 beta


                r3323:a0729656

beta

Download file

             changeset_comment.html
        
                    12 lines
            
             | 184 B
            
                | text/html
            
             |
                HtmlLexer
            
             / rhodecode / templates / email_templates / changeset_comment.html
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      ## -*- coding: utf-8 -*-

      <%inherit file="main.html"/>

      <h4>${subject}</h4>

      ${body}

      % if status_change is not None:

      <div>

          ${_('New status')} -&gt; ${status_change}

      </div>

      % endif

	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

				## -- coding: utf-8 --
				<%inherit file="main.html"/>

				<h4>${subject}</h4>

				${body}

				% if status_change is not None:
				<div>
				${_('New status')} -> ${status_change}
				</div>
				% endif