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

r2014:b776c5e0 default


                r2784:e8c62649

default

Download file

             repo_add.mako
        
                    37 lines
            
             | 818 B
            
                | application/x-mako
            
             |
                MakoHtmlLexer
            
             / rhodecode / templates / admin / repos / repo_add.mako
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      <%inherit file="/base/base.mako"/>

      <%def name="title()">

          ${_('Add repository')}

          %if c.rhodecode_name:

              &middot; ${h.branding(c.rhodecode_name)}

          %endif

      </%def>

      <%def name="breadcrumbs_links()">

          %if c.rhodecode_user.is_admin:

          ${h.link_to(_('Admin'), h.route_path('admin_home'))}

          &raquo;

          ${h.link_to(_('Repositories'), h.route_path('repos'))}

          %else:

          ${_('Admin')}

          &raquo;

          ${_('Repositories')}

          %endif

          &raquo;

          ${_('Add Repository')}

      </%def>

      <%def name="menu_bar_nav()">

          ${self.menu_items(active='admin')}

      </%def>

      <%def name="main()">

          <div class="box">

              <!-- box / title -->

              <div class="title">

                  ${self.breadcrumbs()}

              </div>

              <%include file="repo_add_base.mako"/>

          </div>

      </%def>

	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="/base/base.mako"/>

				<%def name="title()">
				${_('Add repository')}
				%if c.rhodecode_name:
				· ${h.branding(c.rhodecode_name)}
				%endif
				</%def>

				<%def name="breadcrumbs_links()">
				%if c.rhodecode_user.is_admin:
				${h.link_to(_('Admin'), h.route_path('admin_home'))}
				»
				${h.link_to(_('Repositories'), h.route_path('repos'))}
				%else:
				${_('Admin')}
				»
				${_('Repositories')}
				%endif
				»
				${_('Add Repository')}
				</%def>

				<%def name="menu_bar_nav()">
				${self.menu_items(active='admin')}
				</%def>

				<%def name="main()">
				<div class="box">
				<!-- box / title -->
				<div class="title">
				${self.breadcrumbs()}
				</div>
				<%include file="repo_add_base.mako"/>
				</div>
				</%def>