rhodecode-enterprise-ce Files · rhodecode/templates/feed/atom_feed_entry.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.

idlsoft - - Load All Authors

File last commit:

r2618:940ad8b4 default


                r2784:e8c62649

default

Download file

             atom_feed_entry.mako
        
                    38 lines
            
             | 999 B
            
                | application/x-mako
            
             |
                MakoHtmlLexer
            
             / rhodecode / templates / feed / atom_feed_entry.mako
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
project: added all source files and assets

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

      ${_('%(user)s commited on %(date)s UTC') % {

      'user': h.person(commit.author),

      'date': h.format_date(commit.date)

      }}

      <br/>

      % if commit.branch:

          branch: ${commit.branch} <br/>

      % endif

      % for bookmark in getattr(commit, 'bookmarks', []):

          bookmark: ${bookmark} <br/>

      % endfor

      % for tag in commit.tags:

          tag: ${tag} <br/>

      % endfor

        idlsoft
    
path-permissions: Initial support for path-based permissions

              r2618
            
      % if has_hidden_changes:

          Has hidden changes<br/>

      % endif

        marcink
    
repo-commits: ported changeset code into pyramid views....

              r1951
            
      commit: <a href="${h.route_url('repo_commit', repo_name=c.rhodecode_db_repo.repo_name, commit_id=commit.raw_id)}">${h.show_id(commit)}</a>

        marcink
    
project: added all source files and assets

              r1
            
      <pre>

      ${h.urlify_commit_message(commit.message)}

      % for change in parsed_diff:

        % if limited_diff:

        ${_('Commit was too big and was cut off...')}

        % endif

        ${change['operation']} ${change['filename']} ${'(%(added)s lines added, %(removed)s lines removed)' % {'added': change['stats']['added'], 'removed': change['stats']['deleted']}}

      % endfor

      % if feed_include_diff:

        idlsoft
    
path-permissions: Initial support for path-based permissions

              r2618
            
      ${c.path_filter.get_raw_patch(diff_processor)}

        marcink
    
project: added all source files and assets

              r1
            
      % endif

      </pre>

	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

marcink project: added all source files and assets	r1	## -- coding: utf-8 --

		${_('%(user)s commited on %(date)s UTC') % {
		'user': h.person(commit.author),
		'date': h.format_date(commit.date)
		}}
		<br/>
		% if commit.branch:
		branch: ${commit.branch} <br/>
		% endif

		% for bookmark in getattr(commit, 'bookmarks', []):
		bookmark: ${bookmark} <br/>
		% endfor

		% for tag in commit.tags:
		tag: ${tag} <br/>
		% endfor

idlsoft path-permissions: Initial support for path-based permissions	r2618	% if has_hidden_changes:
		Has hidden changes<br/>
		% endif

marcink repo-commits: ported changeset code into pyramid views....	r1951	commit: <a href="${h.route_url('repo_commit', repo_name=c.rhodecode_db_repo.repo_name, commit_id=commit.raw_id)}">${h.show_id(commit)}</a>
marcink project: added all source files and assets	r1	<pre>
		${h.urlify_commit_message(commit.message)}

		% for change in parsed_diff:
		% if limited_diff:
		${_('Commit was too big and was cut off...')}
		% endif
		${change['operation']} ${change['filename']} ${'(%(added)s lines added, %(removed)s lines removed)' % {'added': change['stats']['added'], 'removed': change['stats']['deleted']}}
		% endfor

		% if feed_include_diff:
idlsoft path-permissions: Initial support for path-based permissions	r2618	${c.path_filter.get_raw_patch(diff_processor)}
marcink project: added all source files and assets	r1	% endif
		</pre>