rhodecode-enterprise-ce Files · rhodecode/templates/admin/repos/repo_edit_automation.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:

r2565:d8fc1e62 default


                r2784:e8c62649

default

Download file

             repo_edit_automation.mako
        
                    9 lines
            
             | 508 B
            
                | application/x-mako
            
             |
                MakoHtmlLexer
            
             / rhodecode / templates / admin / repos / repo_edit_automation.mako
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <div class="panel panel-default">

          <div class="panel-heading">

              <h3 class="panel-title">${_('Repo Automation')}</h3>

          </div>

          <div class="panel-body">

              <h4>${_('This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license.').format(sales_email='<a href="mailto:sales@rhodecode.com">sales@rhodecode.com</a>')|n}</h4>

              <img style="width: 100%; height: 100%" src="${h.asset('images/ee_features/repo_automation.png')}"/>

          </div>

      </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

				<div class="panel panel-default">
				<div class="panel-heading">
				<h3 class="panel-title">${_('Repo Automation')}</h3>
				</div>
				<div class="panel-body">
				<h4>${_('This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license.').format(sales_email='<a href="mailto:sales@rhodecode.com">sales@rhodecode.com</a>')\|n}</h4>
				<img style="width: 100%; height: 100%" src="${h.asset('images/ee_features/repo_automation.png')}"/>
				</div>
				</div>