rhodecode-enterprise-ce Files · rhodecode/templates/summary/base.html

vcs: Return merge reference in merge response....

vcs: Return merge reference in merge response. Previously we returned only the merge commit id. Now we set a bookmark(hg) or branch reference(git) to point to the merge commit. By returning a merge reference we have both informations available (id and name)

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r1051:668a5e47

default

Download file

             base.html
        
                    29 lines
            
             | 857 B
            
                | text/html
            
             |
                HtmlLexer
            
             / rhodecode / templates / summary / base.html
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      <%def name="title()">

          ## represents page title

          ${_('%s Summary') % c.repo_name}

          %if c.rhodecode_name:

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

          %endif

      </%def>

      <%def name="head_extra()">

          <link href="${h.url('atom_feed_home',repo_name=c.rhodecode_db_repo.repo_name,auth_token=c.rhodecode_user.feed_token)}" rel="alternate" title="${_('%s ATOM feed') % c.repo_name}" type="application/atom+xml" />

          <link href="${h.url('rss_feed_home',repo_name=c.rhodecode_db_repo.repo_name,auth_token=c.rhodecode_user.feed_token)}" rel="alternate" title="${_('%s RSS feed') % c.repo_name}" type="application/rss+xml" />

      </%def>

      <%def name="menu_bar_nav()">

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

      </%def>

      <%def name="breadcrumbs_links()">

      </%def>

      <%def name="main()">

          ${next.main()}

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

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

				<%def name="title()">
				## represents page title
				${_('%s Summary') % c.repo_name}
				%if c.rhodecode_name:
				· ${h.branding(c.rhodecode_name)}
				%endif
				</%def>


				<%def name="head_extra()">
				<link href="${h.url('atom_feed_home',repo_name=c.rhodecode_db_repo.repo_name,auth_token=c.rhodecode_user.feed_token)}" rel="alternate" title="${_('%s ATOM feed') % c.repo_name}" type="application/atom+xml" />
				<link href="${h.url('rss_feed_home',repo_name=c.rhodecode_db_repo.repo_name,auth_token=c.rhodecode_user.feed_token)}" rel="alternate" title="${_('%s RSS feed') % c.repo_name}" type="application/rss+xml" />
				</%def>


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


				<%def name="breadcrumbs_links()">
				</%def>


				<%def name="main()">
				${next.main()}
				</%def>