u/pc/rhodecode-enterprise-ce-fork-pc Files · rhodecode/templates/admin/settings/settings_system_update.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:

r2431:61a0f874 default


                r2784:e8c62649

default

Download file

             settings_system_update.mako
        
                    26 lines
            
             | 674 B
            
                | application/x-mako
            
             |
                MakoHtmlLexer
            
             / rhodecode / templates / admin / settings / settings_system_update.mako
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      ## upgrade block rendered afte on-click check

      <div class="alert ${'alert-warning' if c.should_upgrade else 'alert-success'}">

      <p>

      %if c.should_upgrade:

          A <b>new version</b> is available:

          %if c.latest_data.get('title'):

              <b>${h.literal(c.latest_data['title'])}</b>

          %else:

              <b>${c.latest_ver}</b>

          %endif

      %else:

          This instance is already running the <b>latest</b> stable version ${c.latest_ver}.

      %endif

      </p>

      % if c.should_upgrade and c.important_notices:

      <div>Important notes for this release:</div>

          <ul>

          % for notice in c.important_notices:

              <li>- ${notice}</li>

          % endfor

          </ul>

      % endif

      </div>

	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 --
				## upgrade block rendered afte on-click check

				<div class="alert ${'alert-warning' if c.should_upgrade else 'alert-success'}">
				<p>
				%if c.should_upgrade:
				A <b>new version</b> is available:
				%if c.latest_data.get('title'):
				<b>${h.literal(c.latest_data['title'])}</b>
				%else:
				<b>${c.latest_ver}</b>
				%endif
				%else:
				This instance is already running the <b>latest</b> stable version ${c.latest_ver}.
				%endif
				</p>

				% if c.should_upgrade and c.important_notices:
				<div>Important notes for this release:</div>
				<ul>
				% for notice in c.important_notices:
				<li>- ${notice}</li>
				% endfor
				</ul>
				% endif
				</div>