release: merge back stable branch into default

docs/release-notes/release-notes-4.19.1.rst

@@ -0,0 +1,41 b''
+|RCE| 4.19.1 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2020-05-25
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+
+
+Security
+^^^^^^^^
+
+- issue-tracker: fixed XSS inside the newly generated description fields.
+
+
+Performance
+^^^^^^^^^^^
+
+-
+
+
+Fixes
+^^^^^
+
+- HTTP: fixed headers problems in the application.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Un-scheduled release addressing problems in 4.19.X releases.

docs/release-notes/release-notes-4.19.2.rst

@@ -0,0 +1,52 b''
+|RCE| 4.19.2 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2020-06-10
+
+
+New Features
+^^^^^^^^^^^^
+
+- Files: landing refs will be the default for files view, resulting in names of branches instead of hashes.
+  This fixes some problems reported with navigation, and also SVN.
+- Diffs: expose per-file comment counts.
+
+
+General
+^^^^^^^
+
+- Navigation: explicitly link to summary page for summary link.
+- Main Page: simplify footer, and expose docs link.
+- Docs: added mention how to change default integration templates.
+- Files: use ref names in the url, and make usage of default landing refs.
+- Files: report the name of missing commit.
+- Sweet alerts: reduced font size.
+
+
+Security
+^^^^^^^^
+
+- Branch permissions: fix XSS on branch permissions adding screen.
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+Fixes
+^^^^^
+
+- Emails: improved styling, and fixed problems with some email clients rendering.
+- Files: fixed label for copy-path action.
+- Files: use a common function to handle url-by-refs, and fix landing refs for SVN.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Un-scheduled release addressing problems in 4.19.X releases.
+  It brings some added features that weren't ready for 4.19.0.

.hgtags

@@ -62,3 +62,6 b' f37a3126570477543507f0bc9d245ce75546181a'
 71d8791463e87b64c1a18475de330ee600d37561 v4.18.1
 4bd6b75dac1d25c64885d4d49385e5533f21c525 v4.18.2
 12ed92fe57f2e9fc7b71dc0b65e26c2da5c7085f v4.18.3
+ddef396a6567117de531d67d44c739cbbfc3eebb v4.19.0
+c0c65acd73914bf4368222d510afe1161ab8c07c v4.19.1
+7ac623a4a2405917e2af660d645ded662011e40d v4.19.2

docs/integrations/jira.rst

@@ -25,3 +25,10 b' transition status id in the *Workflow* s'
 
 Once you have the transition status id, you can create a JIRA integration
 as outlined in :ref:`creating-integrations`.
+
+
+.. note::
+
+    There's an option to configure integration templates.
+    Please see :ref:`integrations-rcextensions` section.
+    rcextensions examples are here: https://code.rhodecode.com/rhodecode-enterprise-ce/files/default/rhodecode/config/rcextensions/examples/custom_integration_templates.py

docs/integrations/redmine.rst

@@ -26,3 +26,9 b' available.'
 
 Once you have the API key, create a Redmine integration as outlined in
 :ref:`creating-integrations`.
+
+
+.. note::
+
+    There's an option to configure integration templates. Please see :ref:`integrations-rcextensions` section.
+    rcextensions examples are here: https://code.rhodecode.com/rhodecode-enterprise-ce/files/default/rhodecode/config/rcextensions/examples/custom_integration_templates.py
  No newline at end of file

docs/release-notes/release-notes.rst

@@ -9,6 +9,8 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.19.2.rst
+   release-notes-4.19.1.rst
    release-notes-4.19.0.rst
    release-notes-4.18.3.rst
    release-notes-4.18.2.rst

rhodecode/apps/_base/__init__.py

@@ -531,8 +531,6 b' class BaseReferencesView(RepoAppView):'
     """
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-
-
         return c
 
     def load_refs_context(self, ref_items, partials_template):
@@ -562,7 +560,9 b' class BaseReferencesView(RepoAppView):'
                     'repo_files',
                     repo_name=self.db_repo_name,
                     f_path=ref_name if is_svn else '',
-                    commit_id=commit_id)
+                    commit_id=commit_id,
+                    _query=dict(at=ref_name)
+                )
 
             else:
                 files_url = h.route_path(
@@ -570,7 +570,8 b' class BaseReferencesView(RepoAppView):'
                     repo_name=self.db_repo_name,
                     f_path=ref_name if is_svn else '',
                     commit_id=ref_name,
-                    _query=dict(at=ref_name))
+                    _query=dict(at=ref_name)
+                )
 
             data.append({
                 "name": _render('name', ref_name, files_url, closed),

rhodecode/apps/debug_style/views.py

@@ -187,6 +187,7 b' Check if we should use full-topic or min'
 I think something like this would be better
 
 ```py
+// markdown renderer
 
 def db():
    global connection
@@ -226,10 +227,26 b' def db():'
                 'comment_body': '''
 I like this !
 
-But please check this code::
-    
-    def main():
-        print 'ok'
+But please check this code
+
+.. code-block:: javascript
+
+  // THIS IS RST CODE
+
+  this.createResolutionComment = function(commentId) {
+    // hide the trigger text
+    $('#resolve-comment-{0}'.format(commentId)).hide();
+
+    var comment = $('#comment-'+commentId);
+    var commentData = comment.data();
+    if (commentData.commentInline) {
+        this.createComment(comment, commentId)
+    } else {
+        Rhodecode.comments.createGeneralComment('general', "$placeholder", commentId)
+    }
+
+    return false;
+  };
 
 This should work better !
                 ''',

rhodecode/apps/home/tests/test_home.py

@@ -158,7 +158,7 b' class TestHomeController(TestController)'
         ('Enabled', True),
     ])
     def test_index_show_version(self, autologin_user, name, state):
-        version_string = 'RhodeCode Enterprise %s' % rhodecode.__version__
+        version_string = 'RhodeCode %s' % rhodecode.__version__
 
         sett = SettingsModel().create_or_update_setting(
             'show_version', state, 'bool')

rhodecode/apps/repository/tests/test_repo_files.py

@@ -178,10 +178,10 b' class TestFilesViews(object):'
                        commit_id='tip', f_path='/'))
 
         # make sure Files menu url is not tip but new commit
-        landing_rev = backend.repo.landing_rev[1]
+        landing_rev = backend.repo.landing_ref_name
         files_url = route_path('repo_files:default_path',
                                repo_name=backend.repo_name,
-                               commit_id=landing_rev)
+                               commit_id=landing_rev, params={'at': landing_rev})
 
         assert landing_rev != 'tip'
         response.mustcontain(

rhodecode/apps/repository/views/repo_files.py

@@ -125,7 +125,7 b' class RepoFilesView(RepoAppView):'
             self.db_repo_name, branch_name)
         if branch_perm and branch_perm not in ['branch.push', 'branch.push_force']:
             message = _('Branch `{}` changes forbidden by rule {}.').format(
-                branch_name, rule)
+                h.escape(branch_name), rule)
             h.flash(message, 'warning')
 
             if json_mode:
@@ -137,7 +137,7 b' class RepoFilesView(RepoAppView):'
             raise HTTPFound(files_url)
 
     def _get_commit_and_path(self):
-        default_commit_id = self.db_repo.landing_rev[1]
+        default_commit_id = self.db_repo.landing_ref_name
         default_f_path = '/'
 
         commit_id = self.request.matchdict.get(
@@ -181,8 +181,8 b' class RepoFilesView(RepoAppView):'
             raise HTTPFound(
                 h.route_path('repo_summary', repo_name=self.db_repo_name))
 
-        except (CommitDoesNotExistError, LookupError):
-            msg = _('No such commit exists for this repository')
+        except (CommitDoesNotExistError, LookupError) as e:
+            msg = _('No such commit exists for this repository. Commit: {}').format(commit_id)
             h.flash(msg, category='error')
             raise HTTPNotFound()
         except RepositoryError as e:
@@ -589,6 +589,24 b' class RepoFilesView(RepoAppView):'
         raise HTTPFound(compare_url)
 
     @LoginRequired()
+    @view_config(
+        route_name='repo_files:default_commit', request_method='GET',
+        renderer=None)
+    def repo_files_default(self):
+        c = self.load_default_context()
+        ref_name = c.rhodecode_db_repo.landing_ref_name
+        landing_url = h.repo_files_by_ref_url(
+            c.rhodecode_db_repo.repo_name,
+            c.rhodecode_db_repo.repo_type,
+            f_path='',
+            ref_name=ref_name,
+            commit_id='tip',
+            query=dict(at=ref_name)
+        )
+
+        raise HTTPFound(landing_url)
+
+    @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
@@ -598,9 +616,6 b' class RepoFilesView(RepoAppView):'
         route_name='repo_files:default_path', request_method='GET',
         renderer=None)
     @view_config(
-        route_name='repo_files:default_commit', request_method='GET',
-        renderer=None)
-    @view_config(
         route_name='repo_files:rendered', request_method='GET',
         renderer=None)
     @view_config(

rhodecode/apps/repository/views/repo_forks.py

@@ -138,10 +138,10 b' class RepoForksView(RepoAppView, DataGri'
             url_link = h.route_path(
                 'repo_compare',
                 repo_name=fork.repo_name,
-                source_ref_type=self.db_repo.landing_rev[0],
-                source_ref=self.db_repo.landing_rev[1],
-                target_ref_type=self.db_repo.landing_rev[0],
-                target_ref=self.db_repo.landing_rev[1],
+                source_ref_type=self.db_repo.landing_ref_type,
+                source_ref=self.db_repo.landing_ref_name,
+                target_ref_type=self.db_repo.landing_ref_type,
+                target_ref=self.db_repo.landing_ref_name,
                 _query=dict(merge=1, target_repo=f.repo_name))
             return h.link_to(_('Compare fork'), url_link, class_='btn-link')
 

rhodecode/lib/helpers.py

@@ -256,23 +256,34 b' tooltip = _ToolTip()'
 files_icon = u'<i class="file-breadcrumb-copy tooltip icon-clipboard clipboard-action" data-clipboard-text="{}" title="Copy file path"></i>'
 
 
-def files_breadcrumbs(repo_name, commit_id, file_path, at_ref=None, limit_items=False, linkify_last_item=False):
+def files_breadcrumbs(repo_name, repo_type, commit_id, file_path, landing_ref_name=None, at_ref=None,
+                      limit_items=False, linkify_last_item=False, hide_last_item=False,
+                      copy_path_icon=True):
     if isinstance(file_path, str):
         file_path = safe_unicode(file_path)
 
-    route_qry = {'at': at_ref} if at_ref else None
+    if at_ref:
+        route_qry = {'at': at_ref}
+        default_landing_ref = at_ref or landing_ref_name or commit_id
+    else:
+        route_qry = None
+        default_landing_ref = commit_id
 
-    # first segment is a `..` link to repo files
+    # first segment is a `HOME` link to repo files root location
     root_name = literal(u'<i class="icon-home"></i>')
+
     url_segments = [
         link_to(
             root_name,
-            route_path(
-                'repo_files',
-                repo_name=repo_name,
+            repo_files_by_ref_url(
+                repo_name,
+                repo_type,
+                f_path=None,  # None here is a special case for SVN repos,
+                              # that won't prefix with a ref
+                ref_name=default_landing_ref,
                 commit_id=commit_id,
-                f_path='',
-                _query=route_qry),
+                query=route_qry
+            )
         )]
 
     path_segments = file_path.split('/')
@@ -284,6 +295,10 b' def files_breadcrumbs(repo_name, commit_'
 
         last_item = cnt == last_cnt
 
+        if last_item and hide_last_item:
+            # iterate over and hide last element
+            continue
+
         if last_item and linkify_last_item is False:
             # plain version
             url_segments.append(segment_html)
@@ -291,12 +306,14 b' def files_breadcrumbs(repo_name, commit_'
             url_segments.append(
                 link_to(
                     segment_html,
-                    route_path(
-                        'repo_files',
-                        repo_name=repo_name,
+                    repo_files_by_ref_url(
+                        repo_name,
+                        repo_type,
+                        f_path='/'.join(path_segments[:cnt + 1]),
+                        ref_name=default_landing_ref,
                         commit_id=commit_id,
-                        f_path='/'.join(path_segments[:cnt + 1]),
-                        _query=route_qry),
+                        query=route_qry
+                    ),
                 ))
 
     limited_url_segments = url_segments[:1] + ['...'] + url_segments[-5:]
@@ -304,7 +321,11 b' def files_breadcrumbs(repo_name, commit_'
         url_segments = limited_url_segments
 
     full_path = file_path
-    icon = files_icon.format(escape(full_path))
+    if copy_path_icon:
+        icon = files_icon.format(escape(full_path))
+    else:
+        icon = ''
+
     if file_path == '':
         return root_name
     else:
@@ -323,6 +344,54 b' def files_url_data(request):'
     return json.dumps(matchdict)
 
 
+def repo_files_by_ref_url(db_repo_name, db_repo_type, f_path, ref_name, commit_id, query=None, ):
+    _is_svn = is_svn(db_repo_type)
+    final_f_path = f_path
+
+    if _is_svn:
+        """
+        For SVN the ref_name cannot be used as a commit_id, it needs to be prefixed with
+        actually commit_id followed by the ref_name. This should be done only in case
+        This is a initial landing url, without additional paths.
+
+        like: /1000/tags/1.0.0/?at=tags/1.0.0
+        """
+
+        if ref_name and ref_name != 'tip':
+            # NOTE(marcink): for svn the ref_name is actually the stored path, so we prefix it
+            # for SVN we only do this magic prefix if it's root, .eg landing revision
+            # of files link. If we are in the tree we don't need this since we traverse the url
+            # that has everything stored
+            if f_path in ['', '/']:
+                final_f_path = '/'.join([ref_name, f_path])
+
+        # SVN always needs a commit_id explicitly, without a named REF
+        default_commit_id = commit_id
+    else:
+        """
+        For git and mercurial we construct a new URL using the names instead of commit_id
+        like: /master/some_path?at=master
+        """
+        # We currently do not support branches with slashes
+        if '/' in ref_name:
+            default_commit_id = commit_id
+        else:
+            default_commit_id = ref_name
+
+    # sometimes we pass f_path as None, to indicate explicit no prefix,
+    # we translate it to string to not have None
+    final_f_path = final_f_path or ''
+
+    files_url = route_path(
+        'repo_files',
+        repo_name=db_repo_name,
+        commit_id=default_commit_id,
+        f_path=final_f_path,
+        _query=query
+    )
+    return files_url
+
+
 def code_highlight(code, lexer, formatter, use_hl_filter=False):
     """
     Lex ``code`` with ``lexer`` and format it with the formatter ``formatter``.
@@ -1492,7 +1561,7 b' def _process_url_func(match_obj, repo_na'
         'id-repr': issue_id,
         'issue-prefix': entry['pref'],
         'serv': entry['url'],
-        'title': desc,
+        'title': bleach.clean(desc, strip=True),
         'hovercard_url': hovercard_url
     }
 

rhodecode/lib/middleware/utils/scm_app_http.py

@@ -99,7 +99,7 b' class VcsHttpProxy(object):'
             'X-RC-Server-Config-File': self.rc_extras.get('config'),
 
             'X-RC-Auth-User': self.rc_extras.get('username'),
-            'X-RC-Auth-User-Id': self.rc_extras.get('user_id'),
+            'X-RC-Auth-User-Id': str(self.rc_extras.get('user_id')),
             'X-RC-Auth-User-Ip': self.rc_extras.get('ip'),
 
             # TODO: johbo: Avoid encoding and put this into payload?

rhodecode/lib/rc_cache/__init__.py

@@ -47,7 +47,7 b' from .utils import ('
     FreshRegionCache, ActiveRegionCache)
 
 
-FILE_TREE_CACHE_VER = 'v3'
+FILE_TREE_CACHE_VER = 'v4'
 
 
 def configure_dogpile_cache(settings):

rhodecode/model/db.py

@@ -1758,7 +1758,7 b' class Repository(Base, BaseModel):'
 
     @hybrid_property
     def landing_rev(self):
-        # always should return [rev_type, rev]
+        # always should return [rev_type, rev], e.g ['branch', 'master']
         if self._landing_revision:
             _rev_info = self._landing_revision.split(':')
             if len(_rev_info) < 2:
@@ -1766,6 +1766,14 b' class Repository(Base, BaseModel):'
             return [_rev_info[0], _rev_info[1]]
         return [None, None]
 
+    @property
+    def landing_ref_type(self):
+        return self.landing_rev[0]
+
+    @property
+    def landing_ref_name(self):
+        return self.landing_rev[1]
+
     @landing_rev.setter
     def landing_rev(self, val):
         if ':' not in val:
@@ -4954,7 +4962,9 b' class RepoReviewRule(Base, BaseModel):'
             else:
                 file_pattern = glob2re(self.file_pattern)
             file_regex = re.compile(file_pattern)
-            for filename in files_changed:
+            for file_data in files_changed:
+                filename = file_data.get('filename')
+
                 if file_regex.search(filename):
                     files_matches = True
                     break

rhodecode/model/pull_request.py

@@ -186,7 +186,7 b' def get_diff_info('
                     email = commit.author_email
                     user = User.get_from_cs_author(author)
                     if user:
-                        user_counts[user] = user_counts.get(user, 0) + 1
+                        user_counts[user.user_id] = user_counts.get(user.user_id, 0) + 1
                     author_counts[author] = author_counts.get(author, 0) + 1
                     email_counts[email] = email_counts.get(email, 0) + 1
 

rhodecode/public/css/code-block.less

@@ -911,6 +911,11 b' input.filediff-collapse-state {'
     * {
         box-sizing: border-box;
     }
+
+    .on-hover-icon {
+        visibility: hidden;
+    }
+
     .filediff-anchor {
         visibility: hidden;
     }
@@ -918,6 +923,9 b' input.filediff-collapse-state {'
         .filediff-anchor {
             visibility: visible;
         }
+        .on-hover-icon {
+            visibility: visible;
+        }
     }
 
     .filediff-heading {

rhodecode/public/css/main.less

@@ -112,6 +112,13 b' input + .action-link, .action-link.first'
     cursor: inherit;
 }
 
+.grey-link-action {
+  cursor: pointer;
+  &:hover {
+      color: @grey2;
+  }
+  color: @grey4;
+}
 
 .clipboard-action {
   cursor: pointer;

rhodecode/public/css/sweetalert2.less

@@ -307,7 +307,7 b''
   border-radius: 0;
   background: #fff;
   font-family: inherit;
-  font-size: 1rem;
+  font-size: 13px;
 }
 
 .swal2-popup:focus {

rhodecode/public/js/rhodecode/i18n/be.js

@@ -6,14 +6,18 b''
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
+    '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
+    '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ',
     'Add another comment': 'Add another comment',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'Ajax Request Error': 'Ajax Request Error',
     'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
     'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Authentication Token': 'Authentication Token',
     'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Changed files': 'Changed files',
     'Close': 'Close',
@@ -23,13 +27,16 b' var _TM = {'
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Context file: ': 'Context file: ',
+    'Delete': 'Delete',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    'Error during search operation': 'Error during search operation',
     'Expand all files': 'Expand all files',
     'Expand {0} commit': 'Expand {0} commit',
     'Expand {0} commits': 'Expand {0} commits',
     'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.',
     'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
+    'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.',
     'Follow': 'Follow',
     'Force updating...': 'Force updating...',
     'Hide full context diff': 'Hide full context diff',
@@ -40,6 +47,7 b' var _TM = {'
     'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}',
     'Lifetime': 'Lifetime',
     'Loading ...': 'Loading ...',
+    'Loading diff ...': 'Loading diff ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
     'Loading...': 'Loading...',
@@ -68,6 +76,7 b' var _TM = {'
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Please wait creating pull request...': 'Please wait creating pull request...',
     'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
@@ -75,12 +84,14 b' var _TM = {'
     'Send': 'Send',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show': 'Show',
     'Show at Commit ': 'Show at Commit ',
     'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Show this authentication token?': 'Show this authentication token?',
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Start following this repository',
@@ -94,6 +105,10 b' var _TM = {'
     'TODO comment': 'TODO comment',
     'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
+    'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.',
+    'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.',
+    'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
+    'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
     'Unwatch': 'Unwatch',
@@ -101,6 +116,7 b' var _TM = {'
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'Watch': 'Watch',
+    'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -117,6 +133,7 b' var _TM = {'
     'just now': 'just now',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'no commits': 'no commits',
     'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',

rhodecode/public/js/rhodecode/i18n/de.js

@@ -6,14 +6,18 b''
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
+    '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
+    '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ',
     'Add another comment': 'Add another comment',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'Ajax Request Error': 'Ajax Request Error',
     'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
     'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Authentication Token': 'Authentication Token',
     'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Changed files': 'Changed files',
     'Close': 'Close',
@@ -23,13 +27,16 b' var _TM = {'
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Context file: ': 'Context file: ',
+    'Delete': 'Löschen',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    'Error during search operation': 'Error during search operation',
     'Expand all files': 'Expand all files',
     'Expand {0} commit': 'Expand {0} commit',
     'Expand {0} commits': 'Expand {0} commits',
     'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.',
     'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
+    'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.',
     'Follow': 'Follow',
     'Force updating...': 'Force updating...',
     'Hide full context diff': 'Hide full context diff',
@@ -40,6 +47,7 b' var _TM = {'
     'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}',
     'Lifetime': 'Lebensdauer',
     'Loading ...': 'Loading ...',
+    'Loading diff ...': 'Loading diff ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
     'Loading...': 'Loading...',
@@ -68,6 +76,7 b' var _TM = {'
     'Please delete {0} characters': 'Bitte {0} Zeichen löschen',
     'Please enter {0} or more character': 'Bitte {0} oder mehr Zeichen eingeben',
     'Please enter {0} or more characters': 'Bitte {0} oder mehr Zeichen eingeben',
+    'Please wait creating pull request...': 'Please wait creating pull request...',
     'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
@@ -75,12 +84,14 b' var _TM = {'
     'Send': 'Senden',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show': 'Show',
     'Show at Commit ': 'Show at Commit ',
     'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Show this authentication token?': 'Show this authentication token?',
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Start following this repository',
@@ -94,6 +105,10 b' var _TM = {'
     'TODO comment': 'TODO comment',
     'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
+    'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.',
+    'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.',
+    'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
+    'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
     'Unwatch': 'Unwatch',
@@ -101,6 +116,7 b' var _TM = {'
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'Watch': 'Watch',
+    'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -117,6 +133,7 b' var _TM = {'
     'just now': 'jetzt gerade',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'no commits': 'no commits',
     'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',

rhodecode/public/js/rhodecode/i18n/en.js

@@ -6,14 +6,18 b''
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
+    '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
+    '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ',
     'Add another comment': 'Add another comment',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'Ajax Request Error': 'Ajax Request Error',
     'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
     'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Authentication Token': 'Authentication Token',
     'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Changed files': 'Changed files',
     'Close': 'Close',
@@ -23,13 +27,16 b' var _TM = {'
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Context file: ': 'Context file: ',
+    'Delete': 'Delete',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    'Error during search operation': 'Error during search operation',
     'Expand all files': 'Expand all files',
     'Expand {0} commit': 'Expand {0} commit',
     'Expand {0} commits': 'Expand {0} commits',
     'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.',
     'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
+    'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.',
     'Follow': 'Follow',
     'Force updating...': 'Force updating...',
     'Hide full context diff': 'Hide full context diff',
@@ -40,6 +47,7 b' var _TM = {'
     'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}',
     'Lifetime': 'Lifetime',
     'Loading ...': 'Loading ...',
+    'Loading diff ...': 'Loading diff ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
     'Loading...': 'Loading...',
@@ -68,6 +76,7 b' var _TM = {'
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Please wait creating pull request...': 'Please wait creating pull request...',
     'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
@@ -75,12 +84,14 b' var _TM = {'
     'Send': 'Send',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show': 'Show',
     'Show at Commit ': 'Show at Commit ',
     'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Show this authentication token?': 'Show this authentication token?',
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Start following this repository',
@@ -94,6 +105,10 b' var _TM = {'
     'TODO comment': 'TODO comment',
     'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
+    'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.',
+    'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.',
+    'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
+    'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
     'Unwatch': 'Unwatch',
@@ -101,6 +116,7 b' var _TM = {'
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'Watch': 'Watch',
+    'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -117,6 +133,7 b' var _TM = {'
     'just now': 'just now',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'no commits': 'no commits',
     'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',

rhodecode/public/js/rhodecode/i18n/es.js

@@ -6,14 +6,18 b''
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
+    '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
+    '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ',
     'Add another comment': 'Add another comment',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'Ajax Request Error': 'Ajax Request Error',
     'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
     'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Authentication Token': 'Authentication Token',
     'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Changed files': 'Changed files',
     'Close': 'Close',
@@ -23,13 +27,16 b' var _TM = {'
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Context file: ': 'Context file: ',
+    'Delete': 'Delete',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    'Error during search operation': 'Error during search operation',
     'Expand all files': 'Expand all files',
     'Expand {0} commit': 'Expand {0} commit',
     'Expand {0} commits': 'Expand {0} commits',
     'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.',
     'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
+    'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.',
     'Follow': 'Follow',
     'Force updating...': 'Force updating...',
     'Hide full context diff': 'Hide full context diff',
@@ -40,6 +47,7 b' var _TM = {'
     'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}',
     'Lifetime': 'De por vida',
     'Loading ...': 'Loading ...',
+    'Loading diff ...': 'Loading diff ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
     'Loading...': 'Loading...',
@@ -68,6 +76,7 b' var _TM = {'
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Please wait creating pull request...': 'Please wait creating pull request...',
     'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
@@ -75,12 +84,14 b' var _TM = {'
     'Send': 'Send',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show': 'Show',
     'Show at Commit ': 'Show at Commit ',
     'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Show this authentication token?': 'Show this authentication token?',
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Start following this repository',
@@ -94,6 +105,10 b' var _TM = {'
     'TODO comment': 'TODO comment',
     'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
+    'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.',
+    'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.',
+    'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
+    'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
     'Unwatch': 'Unwatch',
@@ -101,6 +116,7 b' var _TM = {'
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'Watch': 'Watch',
+    'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -117,6 +133,7 b' var _TM = {'
     'just now': 'just now',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'no commits': 'no commits',
     'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',

rhodecode/public/js/rhodecode/i18n/fr.js

@@ -6,14 +6,18 b''
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
+    '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
+    '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ',
     'Add another comment': 'Add another comment',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'Ajax Request Error': 'Ajax Request Error',
     'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
     'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Authentication Token': 'Authentication Token',
     'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Changed files': 'Changed files',
     'Close': 'Close',
@@ -23,13 +27,16 b' var _TM = {'
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Context file: ': 'Context file: ',
+    'Delete': 'Supprimer',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    'Error during search operation': 'Error during search operation',
     'Expand all files': 'Expand all files',
     'Expand {0} commit': 'Expand {0} commit',
     'Expand {0} commits': 'Expand {0} commits',
     'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.',
     'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
+    'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.',
     'Follow': 'Follow',
     'Force updating...': 'Force updating...',
     'Hide full context diff': 'Hide full context diff',
@@ -40,6 +47,7 b' var _TM = {'
     'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}',
     'Lifetime': 'Durée de vie',
     'Loading ...': 'Loading ...',
+    'Loading diff ...': 'Loading diff ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
     'Loading...': 'Loading...',
@@ -68,6 +76,7 b' var _TM = {'
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Please wait creating pull request...': 'Please wait creating pull request...',
     'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
@@ -75,12 +84,14 b' var _TM = {'
     'Send': 'Envoyer',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show': 'Show',
     'Show at Commit ': 'Show at Commit ',
     'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Show this authentication token?': 'Show this authentication token?',
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Suivre ce dépôt',
@@ -94,6 +105,10 b' var _TM = {'
     'TODO comment': 'TODO comment',
     'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
+    'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.',
+    'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.',
+    'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
+    'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
     'Unwatch': 'Unwatch',
@@ -101,6 +116,7 b' var _TM = {'
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'Watch': 'Watch',
+    'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -117,6 +133,7 b' var _TM = {'
     'just now': 'à l’instant',
     'loading...': 'Chargement…',
     'member of "{0}"': 'member of "{0}"',
+    'no commits': 'no commits',
     'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',

rhodecode/public/js/rhodecode/i18n/it.js

@@ -6,14 +6,18 b''
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
+    '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
+    '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ',
     'Add another comment': 'Aggiungi un altro commento',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'Ajax Request Error': 'Ajax Request Error',
     'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
     'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Authentication Token': 'Authentication Token',
     'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Changed files': 'Changed files',
     'Close': 'Close',
@@ -23,13 +27,16 b' var _TM = {'
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Context file: ': 'Context file: ',
+    'Delete': 'Elimina',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    'Error during search operation': 'Error during search operation',
     'Expand all files': 'Expand all files',
     'Expand {0} commit': 'Expand {0} commit',
     'Expand {0} commits': 'Expand {0} commits',
     'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.',
     'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
+    'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.',
     'Follow': 'Segui',
     'Force updating...': 'Force updating...',
     'Hide full context diff': 'Hide full context diff',
@@ -40,6 +47,7 b' var _TM = {'
     'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}',
     'Lifetime': 'a vita',
     'Loading ...': 'Caricamento ...',
+    'Loading diff ...': 'Loading diff ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
     'Loading...': 'Loading...',
@@ -68,6 +76,7 b' var _TM = {'
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Please wait creating pull request...': 'Please wait creating pull request...',
     'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
@@ -75,12 +84,14 b' var _TM = {'
     'Send': 'Invia',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show': 'Show',
     'Show at Commit ': 'Show at Commit ',
     'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Mostra ancora',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Show this authentication token?': 'Show this authentication token?',
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Inizia a seguire il repository',
@@ -94,6 +105,10 b' var _TM = {'
     'TODO comment': 'TODO comment',
     'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'Al momento non ci sono richieste di PULL che richiedono il tuo intervento',
+    'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.',
+    'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.',
+    'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
+    'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Smetti di seguire',
     'Unwatch': 'Unwatch',
@@ -101,6 +116,7 b' var _TM = {'
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'Watch': 'Watch',
+    'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -117,6 +133,7 b' var _TM = {'
     'just now': 'proprio ora',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'no commits': 'no commits',
     'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',

rhodecode/public/js/rhodecode/i18n/ja.js

@@ -6,14 +6,18 b''
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
+    '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
+    '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ',
     'Add another comment': '別のコメントを追加',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'Ajax Request Error': 'Ajax Request Error',
     'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
     'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Authentication Token': 'Authentication Token',
     'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Changed files': 'Changed files',
     'Close': 'Close',
@@ -23,13 +27,16 b' var _TM = {'
     'Comment text will be set automatically based on currently selected status ({0}) ...': '選択したステータス ({0}) を元にコメントが自動的に設定されます...',
     'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Context file: ': 'Context file: ',
+    'Delete': '削除',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    'Error during search operation': 'Error during search operation',
     'Expand all files': 'Expand all files',
     'Expand {0} commit': 'Expand {0} commit',
     'Expand {0} commits': 'Expand {0} commits',
     'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.',
     'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
+    'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.',
     'Follow': 'フォロー',
     'Force updating...': 'Force updating...',
     'Hide full context diff': 'Hide full context diff',
@@ -40,6 +47,7 b' var _TM = {'
     'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}',
     'Lifetime': '有効期間',
     'Loading ...': '読み込み中...',
+    'Loading diff ...': 'Loading diff ...',
     'Loading failed': '読み込み失敗',
     'Loading more results...': '結果を読み込み中...',
     'Loading...': 'Loading...',
@@ -68,6 +76,7 b' var _TM = {'
     'Please delete {0} characters': '{0} 文字削除してください',
     'Please enter {0} or more character': '{0} 文字以上入力してください',
     'Please enter {0} or more characters': '{0} 文字以上入力してください',
+    'Please wait creating pull request...': 'Please wait creating pull request...',
     'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': '検索中...',
@@ -75,12 +84,14 b' var _TM = {'
     'Send': '送信',
     'Set status to Approved': 'ステータスを承認にする',
     'Set status to Rejected': 'ステータスを拒否にする',
+    'Show': 'Show',
     'Show at Commit ': 'Show at Commit ',
     'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'もっと表示',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Show this authentication token?': 'Show this authentication token?',
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'このリポジトリのフォローする',
@@ -94,6 +105,10 b' var _TM = {'
     'TODO comment': 'TODO comment',
     'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
+    'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.',
+    'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.',
+    'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
+    'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'アンフォロー',
     'Unwatch': 'Unwatch',
@@ -101,6 +116,7 b' var _TM = {'
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'Watch': 'Watch',
+    'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!',
     'You can only select {0} item': '{0} 件のみ選択できます',
     'You can only select {0} items': '{0} 件のみ選択できます',
     'activated': 'activated',
@@ -117,6 +133,7 b' var _TM = {'
     'just now': 'たったいま',
     'loading...': '読み込み中...',
     'member of "{0}"': 'member of "{0}"',
+    'no commits': 'no commits',
     'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',

rhodecode/public/js/rhodecode/i18n/js_translations.js

@@ -1,13 +1,17 b''
 // AUTO GENERATED FILE FOR Babel JS-GETTEXT EXTRACTORS, DO NOT CHANGE
 _gettext('(from usergroup {0})');
+_gettext('<strong>{0} file</strong> changed, ');
+_gettext('<strong>{0} files</strong> changed, ');
 _gettext('Add another comment');
 _gettext('Adding new reviewers is forbidden.');
+_gettext('Ajax Request Error');
 _gettext('All Authors');
 _gettext('All individual reviewers must vote.');
 _gettext('All reviewers must vote.');
 _gettext('Are you sure to close this pull request without merging?');
 _gettext('At least {0} reviewer must vote.');
 _gettext('At least {0} reviewers must vote.');
+_gettext('Authentication Token');
 _gettext('Author is not allowed to be a reviewer.');
 _gettext('Changed files');
 _gettext('Close');
@@ -17,13 +21,16 b''
 _gettext('Comment text will be set automatically based on currently selected status ({0}) ...');
 _gettext('Commit Authors are not allowed to be a reviewer.');
 _gettext('Context file: ');
+_gettext('Delete');
 _gettext('Delete this comment?');
 _gettext('Diff to Commit ');
+_gettext('Error during search operation');
 _gettext('Expand all files');
 _gettext('Expand {0} commit');
 _gettext('Expand {0} commits');
 _gettext('Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.');
 _gettext('Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.');
+_gettext('File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.');
 _gettext('Follow');
 _gettext('Force updating...');
 _gettext('Hide full context diff');
@@ -34,6 +41,7 b''
 _gettext('Leave a resolution comment, or click resolve button to resolve TODO comment #{0}');
 _gettext('Lifetime');
 _gettext('Loading ...');
+_gettext('Loading diff ...');
 _gettext('Loading failed');
 _gettext('Loading more results...');
 _gettext('Loading...');
@@ -62,6 +70,7 b''
 _gettext('Please delete {0} characters');
 _gettext('Please enter {0} or more character');
 _gettext('Please enter {0} or more characters');
+_gettext('Please wait creating pull request...');
 _gettext('Reviewers picked from source code changes.');
 _gettext('Saving...');
 _gettext('Searching...');
@@ -69,12 +78,14 b''
 _gettext('Send');
 _gettext('Set status to Approved');
 _gettext('Set status to Rejected');
+_gettext('Show');
 _gettext('Show at Commit ');
 _gettext('Show commit range {0} ... {1}');
 _gettext('Show full context diff');
 _gettext('Show more');
 _gettext('Show selected commit __S');
 _gettext('Show selected commits __S ... __E');
+_gettext('Show this authentication token?');
 _gettext('Show whitespace changes');
 _gettext('Specified expiration date');
 _gettext('Start following this repository');
@@ -88,6 +99,10 b''
 _gettext('TODO comment');
 _gettext('TODO from comment {0} was fixed.');
 _gettext('There are currently no open pull requests requiring your participation.');
+_gettext('There is a later version of file tree available. Click {0} to create a file at the latest tree.');
+_gettext('There is an existing path `{0}` at this commit.');
+_gettext('This pull requests will consist of <strong>{0} commit</strong>.');
+_gettext('This pull requests will consist of <strong>{0} commits</strong>.');
 _gettext('Toggle Wide Mode diff');
 _gettext('Unfollow');
 _gettext('Unwatch');
@@ -95,6 +110,7 b''
 _gettext('User `{0}` already in reviewers');
 _gettext('User `{0}` not allowed to be a reviewer');
 _gettext('Watch');
+_gettext('Yes, delete comment #{0}!');
 _gettext('You can only select {0} item');
 _gettext('You can only select {0} items');
 _gettext('activated');
@@ -111,6 +127,7 b''
 _gettext('just now');
 _gettext('loading...');
 _gettext('member of "{0}"');
+_gettext('no commits');
 _gettext('not active');
 _gettext('resolve comment');
 _gettext('showing {0} out of {1} commit');

rhodecode/public/js/rhodecode/i18n/pl.js

@@ -6,14 +6,18 b''
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
+    '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
+    '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ',
     'Add another comment': 'Dodaj kolejny komentarz',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'Ajax Request Error': 'Ajax Request Error',
     'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
     'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Authentication Token': 'Authentication Token',
     'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Changed files': 'Changed files',
     'Close': 'Zamknij',
@@ -23,13 +27,16 b' var _TM = {'
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Context file: ': 'Context file: ',
+    'Delete': 'Usuń',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    'Error during search operation': 'Error during search operation',
     'Expand all files': 'Expand all files',
     'Expand {0} commit': 'Expand {0} commit',
     'Expand {0} commits': 'Expand {0} commits',
     'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.',
     'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
+    'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.',
     'Follow': 'Obserwuj',
     'Force updating...': 'Force updating...',
     'Hide full context diff': 'Hide full context diff',
@@ -40,6 +47,7 b' var _TM = {'
     'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}',
     'Lifetime': 'Czas życia',
     'Loading ...': 'Ładuję...',
+    'Loading diff ...': 'Loading diff ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
     'Loading...': 'Loading...',
@@ -68,6 +76,7 b' var _TM = {'
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Please wait creating pull request...': 'Please wait creating pull request...',
     'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
@@ -75,12 +84,14 b' var _TM = {'
     'Send': 'Wyślij',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show': 'Show',
     'Show at Commit ': 'Show at Commit ',
     'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Pokaż więcej',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Show this authentication token?': 'Show this authentication token?',
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Zacznij obserwację tego repozytorium',
@@ -94,6 +105,10 b' var _TM = {'
     'TODO comment': 'TODO comment',
     'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
+    'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.',
+    'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.',
+    'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
+    'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Nie obserwuj',
     'Unwatch': 'Unwatch',
@@ -101,6 +116,7 b' var _TM = {'
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'Watch': 'Watch',
+    'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -117,6 +133,7 b' var _TM = {'
     'just now': 'przed chwilą',
     'loading...': 'wczytywanie...',
     'member of "{0}"': 'member of "{0}"',
+    'no commits': 'no commits',
     'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',

rhodecode/public/js/rhodecode/i18n/pt.js

@@ -6,14 +6,18 b''
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
+    '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
+    '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ',
     'Add another comment': 'Adicionar outro comentário',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'Ajax Request Error': 'Ajax Request Error',
     'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
     'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Authentication Token': 'Authentication Token',
     'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Changed files': 'Changed files',
     'Close': 'Close',
@@ -23,13 +27,16 b' var _TM = {'
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Context file: ': 'Context file: ',
+    'Delete': 'Excluir',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    'Error during search operation': 'Error during search operation',
     'Expand all files': 'Expand all files',
     'Expand {0} commit': 'Expand {0} commit',
     'Expand {0} commits': 'Expand {0} commits',
     'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.',
     'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
+    'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.',
     'Follow': 'Seguir',
     'Force updating...': 'Force updating...',
     'Hide full context diff': 'Hide full context diff',
@@ -40,6 +47,7 b' var _TM = {'
     'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}',
     'Lifetime': 'Tempo de Vida',
     'Loading ...': 'Carregando...',
+    'Loading diff ...': 'Loading diff ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
     'Loading...': 'Loading...',
@@ -68,6 +76,7 b' var _TM = {'
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Please wait creating pull request...': 'Please wait creating pull request...',
     'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
@@ -75,12 +84,14 b' var _TM = {'
     'Send': 'Enviar',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show': 'Show',
     'Show at Commit ': 'Show at Commit ',
     'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Mostrar mais',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Show this authentication token?': 'Show this authentication token?',
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Passar a seguir este repositório',
@@ -94,6 +105,10 b' var _TM = {'
     'TODO comment': 'TODO comment',
     'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
+    'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.',
+    'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.',
+    'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
+    'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Parar de seguir',
     'Unwatch': 'Unwatch',
@@ -101,6 +116,7 b' var _TM = {'
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'Watch': 'Watch',
+    'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -117,6 +133,7 b' var _TM = {'
     'just now': 'agora há pouco',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'no commits': 'no commits',
     'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',

rhodecode/public/js/rhodecode/i18n/ru.js

@@ -6,14 +6,18 b''
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
+    '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
+    '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ',
     'Add another comment': 'Добавить другой комментарий',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'Ajax Request Error': 'Ajax Request Error',
     'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
     'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Authentication Token': 'Authentication Token',
     'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Changed files': 'Changed files',
     'Close': 'Close',
@@ -23,13 +27,16 b' var _TM = {'
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Context file: ': 'Context file: ',
+    'Delete': 'Удалить',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    'Error during search operation': 'Error during search operation',
     'Expand all files': 'Expand all files',
     'Expand {0} commit': 'Expand {0} commit',
     'Expand {0} commits': 'Expand {0} commits',
     'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.',
     'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
+    'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.',
     'Follow': 'Наблюдать',
     'Force updating...': 'Force updating...',
     'Hide full context diff': 'Hide full context diff',
@@ -40,6 +47,7 b' var _TM = {'
     'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}',
     'Lifetime': 'Срок',
     'Loading ...': 'Загрузка...',
+    'Loading diff ...': 'Loading diff ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
     'Loading...': 'Loading...',
@@ -68,6 +76,7 b' var _TM = {'
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Please wait creating pull request...': 'Please wait creating pull request...',
     'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
@@ -75,12 +84,14 b' var _TM = {'
     'Send': 'Отправить',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show': 'Show',
     'Show at Commit ': 'Show at Commit ',
     'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Показать еще',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Show this authentication token?': 'Show this authentication token?',
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Наблюдать за репозиторием',
@@ -94,6 +105,10 b' var _TM = {'
     'TODO comment': 'TODO comment',
     'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
+    'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.',
+    'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.',
+    'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
+    'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Не наблюдать',
     'Unwatch': 'Unwatch',
@@ -101,6 +116,7 b' var _TM = {'
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'Watch': 'Watch',
+    'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -117,6 +133,7 b' var _TM = {'
     'just now': 'прямо сейчас',
     'loading...': 'загрузка...',
     'member of "{0}"': 'member of "{0}"',
+    'no commits': 'no commits',
     'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',

rhodecode/public/js/rhodecode/i18n/zh.js

@@ -6,14 +6,18 b''
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
+    '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
+    '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ',
     'Add another comment': 'Add another comment',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'Ajax Request Error': 'Ajax Request Error',
     'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
     'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Authentication Token': 'Authentication Token',
     'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Changed files': 'Changed files',
     'Close': 'Close',
@@ -23,13 +27,16 b' var _TM = {'
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Context file: ': 'Context file: ',
+    'Delete': '删除',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    'Error during search operation': 'Error during search operation',
     'Expand all files': 'Expand all files',
     'Expand {0} commit': 'Expand {0} commit',
     'Expand {0} commits': 'Expand {0} commits',
     'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.',
     'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
+    'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.',
     'Follow': 'Follow',
     'Force updating...': 'Force updating...',
     'Hide full context diff': 'Hide full context diff',
@@ -40,6 +47,7 b' var _TM = {'
     'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}',
     'Lifetime': '终身',
     'Loading ...': 'Loading ...',
+    'Loading diff ...': 'Loading diff ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
     'Loading...': 'Loading...',
@@ -68,6 +76,7 b' var _TM = {'
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Please wait creating pull request...': 'Please wait creating pull request...',
     'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
@@ -75,12 +84,14 b' var _TM = {'
     'Send': '发送',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show': 'Show',
     'Show at Commit ': 'Show at Commit ',
     'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Show this authentication token?': 'Show this authentication token?',
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': '开始关注该版本库',
@@ -94,6 +105,10 b' var _TM = {'
     'TODO comment': 'TODO comment',
     'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
+    'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.',
+    'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.',
+    'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
+    'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
     'Unwatch': 'Unwatch',
@@ -101,6 +116,7 b' var _TM = {'
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'Watch': 'Watch',
+    'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -117,6 +133,7 b' var _TM = {'
     'just now': '刚刚',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'no commits': 'no commits',
     'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',

rhodecode/templates/base/base.mako

@@ -50,18 +50,27 b''
 <div id="footer">
    <div id="footer-inner" class="title wrapper">
        <div>
+           <% sid = 'block' if request.GET.get('showrcid') else 'none' %>
+
            <p class="footer-link-right">
+               <a class="grey-link-action" href="${h.route_path('home', _query={'showrcid': 1})}">
+               RhodeCode
                % if c.visual.show_version:
-                   RhodeCode Enterprise ${c.rhodecode_version} ${c.rhodecode_edition}
+                   ${c.rhodecode_version}
                % endif
-               &copy; 2010-${h.datetime.today().year}, <a href="${h.route_url('rhodecode_official')}" target="_blank">RhodeCode GmbH</a>. All rights reserved.
+               ${c.rhodecode_edition}
+               </a> |
+
                % if c.visual.rhodecode_support_url:
-                  <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a>
+                  <a class="grey-link-action" href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a> |
+                  <a class="grey-link-action" href="https://docs.rhodecode.com" target="_blank">${_('Documentation')}</a>
                % endif
+
            </p>
-           <% sid = 'block' if request.GET.get('showrcid') else 'none' %>
+
            <p class="server-instance" style="display:${sid}">
                ## display hidden instance ID if specially defined
+               &copy; 2010-${h.datetime.today().year}, <a href="${h.route_url('rhodecode_official')}" target="_blank">RhodeCode GmbH</a>. All rights reserved.
                % if c.rhodecode_instanceid:
                    ${_('RhodeCode instance id: {}').format(c.rhodecode_instanceid)}
                % endif
@@ -363,9 +372,9 b''
       </div>
 
       <ul id="context-pages" class="navigation horizontal-list">
-        <li class="${h.is_active('summary', active)}"><a class="menulink" href="${h.route_path('repo_summary', repo_name=c.repo_name)}"><div class="menulabel">${_('Summary')}</div></a></li>
+        <li class="${h.is_active('summary', active)}"><a class="menulink" href="${h.route_path('repo_summary_explicit', repo_name=c.repo_name)}"><div class="menulabel">${_('Summary')}</div></a></li>
         <li class="${h.is_active('commits', active)}"><a class="menulink" href="${h.route_path('repo_commits', repo_name=c.repo_name)}"><div class="menulabel">${_('Commits')}</div></a></li>
-        <li class="${h.is_active('files', active)}"><a class="menulink" href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.rhodecode_db_repo.landing_rev[1], f_path='')}"><div class="menulabel">${_('Files')}</div></a></li>
+        <li class="${h.is_active('files', active)}"><a class="menulink" href="${h.repo_files_by_ref_url(c.repo_name, c.rhodecode_db_repo.repo_type, f_path='', ref_name=c.rhodecode_db_repo.landing_ref_name, commit_id='tip', query={'at':c.rhodecode_db_repo.landing_ref_name})}"><div class="menulabel">${_('Files')}</div></a></li>
         <li class="${h.is_active('compare', active)}"><a class="menulink" href="${h.route_path('repo_compare_select',repo_name=c.repo_name)}"><div class="menulabel">${_('Compare')}</div></a></li>
 
         ## TODO: anderson: ideally it would have a function on the scm_instance "enable_pullrequest() and enable_fork()"

rhodecode/templates/base/root.mako

@@ -6,7 +6,7 b" c.template_context['repo_name'] = getatt"
 go_import_header = ''
 if hasattr(c, 'rhodecode_db_repo'):
     c.template_context['repo_type'] = c.rhodecode_db_repo.repo_type
-    c.template_context['repo_landing_commit'] = c.rhodecode_db_repo.landing_rev[1]
+    c.template_context['repo_landing_commit'] = c.rhodecode_db_repo.landing_ref_name
     c.template_context['repo_id'] = c.rhodecode_db_repo.repo_id
     c.template_context['repo_view_type'] = h.get_repo_view_type(request)
 

rhodecode/templates/codeblocks/diffs.mako

@@ -253,8 +253,16 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
             data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}"
         >
         <label for="filediff-collapse-${id(filediff)}" class="filediff-heading">
+            <%
+                file_comments = (get_inline_comments(inline_comments, filediff.patch['filename']) or {}).values()
+                total_file_comments = [_c for _c in h.itertools.chain.from_iterable(file_comments) if not _c.outdated]
+            %>
             <div class="filediff-collapse-indicator icon-"></div>
+            <span class="pill-group pull-right" >
+                <span class="pill"><i class="icon-comment"></i> ${len(total_file_comments)}</span>
+            </span>
             ${diff_ops(filediff)}
+
         </label>
 
         ${diff_menu(filediff, use_comments=use_comments)}
@@ -484,7 +492,7 b' from rhodecode.lib.diffs import NEW_FILE'
                 <% final_path = filediff.target_file_path %>
             %endif
         %endif
-        <i style="color: #aaa" class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${final_path}" title="${_('Copy file path')}" onclick="return false;"></i>
+        <i style="color: #aaa" class="on-hover-icon icon-clipboard clipboard-action" data-clipboard-text="${final_path}" title="${_('Copy file path')}" onclick="return false;"></i>
     </span>
     ## anchor link
     <a class="pill filediff-anchor" href="#a_${h.FID(filediff.raw_id, filediff.patch['filename'])}">¶</a>
@@ -615,6 +623,19 b' from rhodecode.lib.diffs import NEW_FILE'
 </%def>
 
 <%!
+
+def get_inline_comments(comments, filename):
+    if hasattr(filename, 'unicode_path'):
+        filename = filename.unicode_path
+
+    if not isinstance(filename, (unicode, str)):
+        return None
+
+    if comments and filename in comments:
+        return comments[filename]
+
+    return None
+
 def get_comments_for(diff_type, comments, filename, line_version, line_number):
     if hasattr(filename, 'unicode_path'):
         filename = filename.unicode_path
@@ -622,13 +643,14 b' def get_comments_for(diff_type, comments'
     if not isinstance(filename, (unicode, str)):
         return None
 
-    line_key = '{}{}'.format(line_version, line_number) ## e.g o37, n12
+    file_comments = get_inline_comments(comments, filename)
+    if file_comments is None:
+        return None
 
-    if comments and filename in comments:
-        file_comments = comments[filename]
-        if line_key in file_comments:
-            data = file_comments.pop(line_key)
-            return data
+    line_key = '{}{}'.format(line_version, line_number) ## e.g o37, n12
+    if line_key in file_comments:
+        data = file_comments.pop(line_key)
+        return data
 %>
 
 <%def name="render_hunk_lines_sideside(filediff, hunk, use_comments=False, inline_comments=None, active_pattern_entries=None)">
@@ -655,9 +677,9 b' def get_comments_for(diff_type, comments'
             %if line_old_comments:
                 <% has_outdated = any([x.outdated for x in line_old_comments]) %>
                 % if has_outdated:
-                    <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i class="tooltip" title="${_('comments including outdated, click to show them')}:${len(line_old_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % else:
-                    <i title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i class="tooltip" title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % endif
             %endif
             </div>
@@ -698,9 +720,9 b' def get_comments_for(diff_type, comments'
             %if line_new_comments:
                 <% has_outdated = any([x.outdated for x in line_new_comments]) %>
                 % if has_outdated:
-                    <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i class="tooltip" title="${_('comments including outdated, click to show them')}:${len(line_new_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % else:
-                    <i title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i class="tooltip" title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % endif
             %endif
             </div>
@@ -754,9 +776,9 b' def get_comments_for(diff_type, comments'
             % if comments:
                 <% has_outdated = any([x.outdated for x in comments]) %>
                 % if has_outdated:
-                    <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i class="tooltip" title="${_('comments including outdated, click to show them')}:${len(comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % else:
-                    <i title="${_('comments')}: ${len(comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i class="tooltip" title="${_('comments')}: ${len(comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % endif
             % endif
             </div>

rhodecode/templates/commits/changelog.mako

@@ -60,10 +60,10 b''
                             class="btn btn-small"
                             href="${h.route_path('repo_compare',
                                 repo_name=c.rhodecode_db_repo.fork.repo_name,
-                                source_ref_type=c.rhodecode_db_repo.landing_rev[0],
-                                source_ref=c.rhodecode_db_repo.landing_rev[1],
-                                target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_rev[0],
-                                target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_rev[1],
+                                source_ref_type=c.rhodecode_db_repo.landing_ref_type,
+                                source_ref=c.rhodecode_db_repo.landing_ref_name,
+                                target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_ref_type,
+                                target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_ref_name,
                                 _query=dict(merge=1, target_repo=c.repo_name))}"
                         >
                         ${_('Compare fork with Parent (%s)' % c.rhodecode_db_repo.fork.repo_name)}

rhodecode/templates/compare/compare_diff.mako

@@ -93,10 +93,10 b''
                                        <a class="btn btn-default" title="${h.tooltip(_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name))}"
                                           href="${h.route_path('repo_compare',
                                                 repo_name=c.rhodecode_db_repo.fork.repo_name,
-                                                source_ref_type=c.rhodecode_db_repo.landing_rev[0],
-                                                source_ref=c.rhodecode_db_repo.landing_rev[1],
-                                                target_repo=c.repo_name,target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_rev[0],
-                                                target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_rev[1],
+                                                source_ref_type=c.rhodecode_db_repo.landing_ref_type,
+                                                source_ref=c.rhodecode_db_repo.landing_ref_name,
+                                                target_repo=c.repo_name,target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_ref_type,
+                                                target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_ref_name,
                                                 _query=dict(merge=1))}"
                                         >
                                        ${_('Compare with origin')}

rhodecode/templates/email_templates/base.mako

@@ -101,6 +101,7 b' text_monospace = "\'Menlo\', \'Liberation M'
             margin: 0;
             padding: 0;
             font-family: ${text_regular|n};
+            color: #000000;
         }
 
         /* Prevent Webkit and Windows Mobile platforms from changing default font sizes.*/
@@ -211,6 +212,20 b' text_monospace = "\'Menlo\', \'Liberation M'
 
         code {
             font-family: ${text_monospace|n};
+            white-space: pre-line !important;
+            color: #000000;
+        }
+
+        ul.changes-ul {
+            list-style: none;
+            list-style-type: none;
+            padding: 0;
+            margin: 10px 0;
+        }
+        ul.changes-ul li {
+            list-style: none;
+            list-style-type: none;
+            margin: 2px 0;
         }
 
         @media only screen and (-webkit-min-device-pixel-ratio: 2) {
@@ -237,13 +252,19 b' text_monospace = "\'Menlo\', \'Liberation M'
             padding: 3px 5px 3px
         }
 
-        div.markdown-block h1, div.markdown-block h2, div.markdown-block h3, div.markdown-block h4, div.markdown-block h5, div.markdown-block h6 {
+        div.markdown-block h1,
+        div.markdown-block h2,
+        div.markdown-block h3,
+        div.markdown-block h4,
+        div.markdown-block h5,
+        div.markdown-block h6 {
             border-bottom: none !important;
             padding: 0 !important;
             overflow: visible !important
         }
 
-        div.markdown-block h1, div.markdown-block h2 {
+        div.markdown-block h1,
+        div.markdown-block h2 {
             border-bottom: 1px #e6e5e5 solid !important
         }
 
@@ -290,7 +311,13 b' text_monospace = "\'Menlo\', \'Liberation M'
             margin-bottom: 13px
         }
 
-        div.markdown-block ol, div.markdown-block ul, div.markdown-block p, div.markdown-block blockquote, div.markdown-block dl, div.markdown-block li, div.markdown-block table {
+        div.markdown-block ol,
+        div.markdown-block ul,
+        div.markdown-block p,
+        div.markdown-block blockquote,
+        div.markdown-block dl,
+        div.markdown-block li,
+        div.markdown-block table {
             margin: 3px 0 13px 0 !important;
             color: #424242 !important;
             font-size: 13px !important;
@@ -371,27 +398,30 b' text_monospace = "\'Menlo\', \'Liberation M'
             background-color: #eeeeee
         }
 
-        div.markdown-block code, div.markdown-block pre, div.markdown-block #ws, div.markdown-block #message {
+        div.markdown-block code,
+        div.markdown-block pre,
+        div.markdown-block #ws,
+        div.markdown-block #message {
             font-family: ${text_monospace|n};
             font-size: 11px;
             -webkit-border-radius: 2px;
             -moz-border-radius: 2px;
             border-radius: 2px;
-            background-color: white;
+            background-color: #FFFFFF;
             color: #7E7F7F
         }
 
         div.markdown-block code {
-            border: 1px solid #eeeeee;
+            border: 1px solid #7E7F7F;
             margin: 0 2px;
             padding: 0 5px
         }
 
         div.markdown-block pre {
-            border: 1px solid #dbd9da;
+            border: 1px solid #7E7F7F;
             overflow: auto;
             padding: .5em;
-            background-color: #F5F5F5
+            background-color: #FFFFFF;
         }
 
         div.markdown-block pre > code {
@@ -411,7 +441,12 b' text_monospace = "\'Menlo\', \'Liberation M'
             font-weight: normal
         }
 
-        div.rst-block h1, div.rst-block h2, div.rst-block h3, div.rst-block h4, div.rst-block h5, div.rst-block h6 {
+        div.rst-block h1,
+        div.rst-block h2,
+        div.rst-block h3,
+        div.rst-block h4,
+        div.rst-block h5,
+        div.rst-block h6 {
             border-bottom: 0 !important;
             margin: 0 !important;
             padding: 0 !important;
@@ -461,7 +496,7 b' text_monospace = "\'Menlo\', \'Liberation M'
             background-color: ghostWhite !important;
             color: #444 !important;
             padding: 0 .2em !important;
-            border: 1px solid #dedede !important
+            border: 1px solid #7E7F7F !important
         }
 
         div.rst-block pre code {
@@ -474,20 +509,24 b' text_monospace = "\'Menlo\', \'Liberation M'
         div.rst-block pre {
             margin: 1em 0;
             padding: 15px;
-            border: 1px solid #eeeeee;
+            border: 1px solid #7E7F7F;
             -webkit-border-radius: 2px;
             -moz-border-radius: 2px;
             border-radius: 2px;
             overflow: auto;
             font-size: 12px;
             color: #444;
-            background-color: #F5F5F5
+            background-color: #FFFFFF;
+        }
+
+        .clear-both {
+            clear:both;
         }
 
         /*elasticmatch is custom rhodecode tag*/
         .codehilite .c-ElasticMatch {
-                background-color: #faffa6;
-                padding: 0.2em;
+            background-color: #faffa6;
+            padding: 0.2em;
         }
 
         .codehilite .c-ElasticMatch { background-color: #faffa6; padding: 0.2em;}
@@ -581,7 +620,7 b' text_monospace = "\'Menlo\', \'Liberation M'
                         </a>
                     </td>
                 </tr>
-                <tr>
+                <tr style="background-color: #fff">
                     <td style="padding:15px;" valign="top">${self.body()}</td>
                 </tr>
             </table>

rhodecode/templates/email_templates/commit_comment.mako

@@ -89,12 +89,13 b' data = {'
 }
 %>
 
+## header
 <table style="text-align:left;vertical-align:middle;width: 100%">
     <tr>
     <td style="width:100%;border-bottom:1px solid #dbd9da;">
 
-        <h4 style="margin: 0">
-            <div style="margin-bottom: 4px">
+        <div style="margin: 0; font-weight: bold">
+            <div class="clear-both" style="margin-bottom: 4px">
                 <span style="color:#7E7F7F">@${h.person(user.username)}</span>
                 ${_('left a')}
                 <a href="${commit_comment_url}" style="${base.link_css()}">
@@ -107,13 +108,14 b' data = {'
             </div>
             <div style="margin-top: 10px"></div>
             ${_('Commit')} <code>${data['commit_id']}</code> ${_('of repository')}: ${data['repo_name']}
-        </h4>
+        </div>
 
     </td>
     </tr>
 
 </table>
-
+<div class="clear-both"></div>
+## main body
 <table style="text-align:left;vertical-align:middle;width: 100%">
 
     ## spacing def

rhodecode/templates/email_templates/pull_request_comment.mako

@@ -110,12 +110,13 b' data = {'
 }
 %>
 
+## header
 <table style="text-align:left;vertical-align:middle;width: 100%">
     <tr>
     <td style="width:100%;border-bottom:1px solid #dbd9da;">
 
-        <h4 style="margin: 0">
-            <div style="margin-bottom: 4px">
+        <div style="margin: 0; font-weight: bold">
+            <div class="clear-both" style="margin-bottom: 4px">
                 <span style="color:#7E7F7F">@${h.person(user.username)}</span>
                 ${_('left a')}
                 <a href="${pr_comment_url}" style="${base.link_css()}">
@@ -128,13 +129,14 b' data = {'
             </div>
             <div style="margin-top: 10px"></div>
             ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code>
-        </h4>
+        </div>
 
     </td>
     </tr>
 
 </table>
-
+<div class="clear-both"></div>
+## main body
 <table style="text-align:left;vertical-align:middle;width: 100%">
 
     ## spacing def

rhodecode/templates/email_templates/pull_request_review.mako

@@ -72,13 +72,13 b' data = {'
     'target_repo_url': h.link_to(pull_request_target_repo.repo_name, pull_request_target_repo_url),
 }
 %>
-
+## header
 <table style="text-align:left;vertical-align:middle;width: 100%">
     <tr>
     <td style="width:100%;border-bottom:1px solid #dbd9da;">
 
-        <h4 style="margin: 0">
-            <div style="margin-bottom: 4px">
+        <div style="margin: 0; font-weight: bold">
+            <div class="clear-both" class="clear-both" style="margin-bottom: 4px">
                 <span style="color:#7E7F7F">@${h.person(user.username)}</span>
                 ${_('requested a')}
                 <a href="${pull_request_url}" style="${base.link_css()}">
@@ -87,13 +87,14 b' data = {'
             </div>
             <div style="margin-top: 10px"></div>
             ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code>
-        </h4>
+        </div>
 
     </td>
     </tr>
 
 </table>
-
+<div class="clear-both"></div>
+## main body
 <table style="text-align:left;vertical-align:middle;width: 100%">
     ## spacing def
     <tr>

rhodecode/templates/email_templates/pull_request_update.mako

@@ -85,12 +85,13 b' data = {'
 }
 %>
 
+## header
 <table style="text-align:left;vertical-align:middle;width: 100%">
     <tr>
     <td style="width:100%;border-bottom:1px solid #dbd9da;">
 
-        <h4 style="margin: 0">
-            <div style="margin-bottom: 4px">
+        <div style="margin: 0; font-weight: bold">
+            <div class="clear-both" style="margin-bottom: 4px">
                 <span style="color:#7E7F7F">@${h.person(updating_user.username)}</span>
                 ${_('updated')}
                 <a href="${pull_request_url}" style="${base.link_css()}">
@@ -99,13 +100,14 b' data = {'
             </div>
             <div style="margin-top: 10px"></div>
             ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code>
-        </h4>
+        </div>
 
     </td>
     </tr>
 
 </table>
-
+<div class="clear-both"></div>
+## main body
 <table style="text-align:left;vertical-align:middle;width: 100%">
     ## spacing def
     <tr>
@@ -137,27 +139,31 b' data = {'
     </tr>
     <tr>
         <td style="padding-right:20px;">${_('Changes')}:</td>
-        <td style="white-space:pre-line">\
+        <td>
             <strong>Changed commits:</strong>
-
-             - Added: ${len(added_commits)}
-             - Removed: ${len(removed_commits)}
+            <ul class="changes-ul">
+                <li>- Added: ${len(added_commits)}</li>
+                <li>- Removed: ${len(removed_commits)}</li>
+            </ul>
 
             <strong>Changed files:</strong>
+            <ul class="changes-ul">
 
             %if not changed_files:
-             No file changes found
+                <li>No file changes found</li>
             %else:
-            %for file_name in added_files:
-             - A <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a>
-            %endfor
-            %for file_name in modified_files:
-             - M <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a>
-            %endfor
-            %for file_name in removed_files:
-             - R <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a>
-            %endfor
+                %for file_name in added_files:
+                 <li>- A <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a></li>
+                %endfor
+                %for file_name in modified_files:
+                 <li>-  M <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a></li>
+                %endfor
+                %for file_name in removed_files:
+                 <li>-  R <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a></li>
+                %endfor
             %endif
+
+            </ul>
         </td>
     </tr>
 

rhodecode/templates/email_templates/user_registration.mako

@@ -19,7 +19,7 b' A new user `${user.username}` has regist'
 ${self.plaintext_footer()}
 </%def>
 
-
+## header
 <table style="text-align:left;vertical-align:middle;width: 100%">
     <tr>
     <td style="width:100%;border-bottom:1px solid #dbd9da;">
@@ -31,7 +31,8 b' A new user `${user.username}` has regist'
     </td>
     </tr>
 </table>
-
+<div class="clear-both"></div>
+## main body
 <table style="text-align:left;vertical-align:middle;width: 100%">
     ## spacing def
     <tr>

rhodecode/templates/files/files_add.mako

@@ -36,8 +36,7 b''
             <ul>
             <li class="breadcrumb-path">
                 <div>
-                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
-                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path)}">${c.f_path}</a> ${('/' if c.f_path else '')}
+                    ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.f_path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=False, linkify_last_item=True, copy_path_icon=False)} /
                 </div>
             </li>
             <li class="location-path">

rhodecode/templates/files/files_browser.mako

@@ -64,10 +64,10 b''
     %if c.readme_data:
     <div id="readme" class="anchor">
     <div class="box">
-        <div class="readme-title" title="${h.tooltip(_('Readme file from commit %s:%s') % (c.rhodecode_db_repo.landing_rev[0], c.rhodecode_db_repo.landing_rev[1]))}">
+        <div class="readme-title" title="${h.tooltip(_('Readme file from commit %s:%s') % (c.rhodecode_db_repo.landing_ref_type, c.rhodecode_db_repo.landing_ref_name))}">
             <div>
                 <i class="icon-file-text"></i>
-                <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.rhodecode_db_repo.landing_rev[1],f_path=c.readme_file)}">
+                <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.rhodecode_db_repo.landing_ref_name,f_path=c.readme_file)}">
                     ${c.readme_file}
                 </a>
             </div>

rhodecode/templates/files/files_browser_tree.mako

@@ -1,10 +1,13 b''
 <%namespace name="base" file="/base/base.mako"/>
 
 <%
-    if request.GET.get('at'):
-        query={'at': request.GET.get('at')}
+    at_ref = request.GET.get('at')
+    if at_ref:
+        query={'at': at_ref}
+        default_landing_ref = at_ref or c.rhodecode_db_repo.landing_ref_name
     else:
         query=None
+        default_landing_ref = c.commit.raw_id
 %>
 <div id="file-tree-wrapper" class="browser-body ${('full-load' if c.full_load else '')}">
     <table class="code-browser rctable repo_summary">
@@ -21,7 +24,7 b''
         <tbody id="tbody">
         <tr>
             <td colspan="5">
-                ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'), limit_items=True)}
+                ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True)}
             </td>
         </tr>
 
@@ -41,7 +44,7 b''
                 % endif
               </span>
             % else:
-              <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=h.safe_unicode(node.path), _query=query)}">
+              <a href="${h.repo_files_by_ref_url(c.repo_name, c.rhodecode_db_repo.repo_type, f_path=h.safe_unicode(node.path), ref_name=default_landing_ref, commit_id=c.commit.raw_id, query=query)}">
                 <i class="${('icon-file-text browser-file' if node.is_file() else 'icon-directory browser-dir')}"></i>${node.name}
               </a>
             % endif

rhodecode/templates/files/files_delete.mako

@@ -35,8 +35,7 b''
         <div class="path-items">
             <li class="breadcrumb-path">
                 <div>
-                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
-                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.file.dir_path)}">${c.file.dir_path}</a> ${('/' if c.file.dir_path else '')}
+                    ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=True, copy_path_icon=False)} /
                 </div>
             </li>
             <li class="location-path">

rhodecode/templates/files/files_edit.mako

@@ -36,8 +36,7 b''
             <ul>
             <li class="breadcrumb-path">
                 <div>
-                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
-                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.file.dir_path)}">${c.file.dir_path}</a> ${('/' if c.file.dir_path else '')}
+                    ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=True, copy_path_icon=False)} /
                 </div>
             </li>
             <li class="location-path">

rhodecode/templates/files/files_source.mako

@@ -1,5 +1,15 b''
 <%namespace name="sourceblock" file="/codeblocks/source.mako"/>
 
+<%
+    at_ref = request.GET.get('at')
+    if at_ref:
+        query={'at': at_ref}
+        default_commit_id = at_ref or c.rhodecode_db_repo.landing_ref_name
+    else:
+        query=None
+        default_commit_id = c.commit.raw_id
+%>
+
 <div id="codeblock" class="browserblock">
     <div class="browser-header">
         <div class="browser-nav">
@@ -27,13 +37,13 b''
                   ## binary files are delete only
                   % if c.file.is_binary:
                     ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing binary files not allowed'))}
-                    ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path),class_="btn btn-danger")}
+                    ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query),class_="btn btn-danger")}
                   % else:
-                    <a  class="btn btn-default" href="${h.route_path('repo_files_edit_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path)}">
+                    <a  class="btn btn-default" href="${h.route_path('repo_files_edit_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query)}">
                         ${_('Edit on branch: ')}<code>${c.branch_name}</code>
                     </a>
 
-                    <a class="btn btn-danger" href="${h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path)}">
+                    <a class="btn btn-danger" href="${h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query)}">
                         ${_('Delete')}
                     </a>
                   % endif
@@ -88,7 +98,7 b''
 
       <div class="path clear-fix">
           <div class="pull-left">
-            ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'))}
+            ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'))}
           </div>
 
           <div class="pull-right stats">
@@ -104,7 +114,7 b''
                  | ${h.link_to(_('Raw'), h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
                  % if not c.file.is_binary:
                  |<a href="#copySource" onclick="return false;" class="no-grey clipboard-action" data-clipboard-text="${c.file.content}">${_('Copy content')}</a>
-                 |<a href="#copySource" onclick="return false;" class="no-grey clipboard-action" data-clipboard-text="${h.route_url('repo_files', repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">${_('Copy permalink')}</a>
+                 |<a href="#copyPermaLink" onclick="return false;" class="no-grey clipboard-action" data-clipboard-text="${h.route_url('repo_files', repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">${_('Copy permalink')}</a>
                  % endif
 
           </div>

rhodecode/templates/pullrequests/pullrequest_show.mako

@@ -476,7 +476,7 b''
                   <div class="alert alert-info">
                     <div>
                        % if c.pr_merge_source_commit.changed:
-                        <strong>${_('There are new changes for {}:{} in source repository, please consider updating this pull request.').format(c.pr_merge_source_commit.ref_spec.type, c.pr_merge_source_commit.ref_spec.name)}</strong>
+                        <strong>${_('There are new changes for `{}:{}` in source repository, please consider updating this pull request.').format(c.pr_merge_source_commit.ref_spec.type, c.pr_merge_source_commit.ref_spec.name)}</strong>
                        % endif
                     </div>
                   </div>

rhodecode/templates/search/search_content.mako

@@ -93,7 +93,7 b''
 
         <div class="path clear-fix">
             <div class="pull-left">
-                ${h.files_breadcrumbs(entry['repository'],entry.get('commit_id', 'tip'),entry['f_path'], linkify_last_item=True)}
+                ${h.files_breadcrumbs(entry['repository'], repo_type, entry.get('commit_id', 'tip'), entry['f_path'], linkify_last_item=True)}
             </div>
 
             <div class="pull-right stats">

rhodecode/templates/search/search_path.mako

@@ -27,7 +27,7 b''
                 <td class="td-componentname">
                     <i class="icon-file"></i>
                     ${h.link_to(h.literal(entry['f_path']),
-                        h.route_path('repo_files',repo_name=entry['repository'],commit_id='tip',f_path=entry['f_path']))}
+                        h.route_path('repo_files',repo_name=entry['repository'],commit_id=entry.get('commit_id', 'tip'),f_path=entry['f_path']))}
                 </td>
                 <td>
                     %if entry.get('size'):

rhodecode/templates/summary/summary.mako

@@ -34,10 +34,10 b''
 <div id="readme" class="anchor">
 <div class="box">
 
-    <div class="readme-title" title="${h.tooltip(_('Readme file from commit %s:%s') % (c.rhodecode_db_repo.landing_rev[0], c.rhodecode_db_repo.landing_rev[1]))}">
+    <div class="readme-title" title="${h.tooltip(_('Readme file from commit %s:%s') % (c.rhodecode_db_repo.landing_ref_type, c.rhodecode_db_repo.landing_ref_name))}">
         <div>
             <i class="icon-file-text"></i>
-            <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.rhodecode_db_repo.landing_rev[1],f_path=c.readme_file)}">
+            <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.rhodecode_db_repo.landing_ref_name,f_path=c.readme_file)}">
                 ${c.readme_file}
             </a>
         </div>

rhodecode/tests/lib/test_helpers.py

@@ -82,9 +82,8 b' def test_urlify_text(url, expected_url):'
      'bX"X'),
 
 ], ids=['simple1', 'simple2', 'one_segment', 'empty_path', 'simple_quote'])
-def test_files_breadcrumbs_xss(
-        repo_name, commit_id, path, app, expected_result):
-    result = helpers.files_breadcrumbs(repo_name, commit_id, path)
+def test_files_breadcrumbs_xss(repo_name, commit_id, path, app, expected_result):
+    result = helpers.files_breadcrumbs(repo_name, 'hg', commit_id, path)
     # Expect it to encode all path fragments properly. This is important
     # because it returns an instance of `literal`.
     if path != '':