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

@@ -1,64 +1,67 b''
 1bd3e92b7e2e2d2024152b34bb88dff1db544a71 v4.0.0
 170c5398320ea6cddd50955e88d408794c21d43a v4.0.1
 c3fe200198f5aa34cf2e4066df2881a9cefe3704 v4.1.0
 7fd5c850745e2ea821fb4406af5f4bff9b0a7526 v4.1.1
 41c87da28a179953df86061d817bc35533c66dd2 v4.1.2
 baaf9f5bcea3bae0ef12ae20c8b270482e62abb6 v4.2.0
 32a70c7e56844a825f61df496ee5eaf8c3c4e189 v4.2.1
 fa695cdb411d294679ac081d595ac654e5613b03 v4.3.0
 0e4dc11b58cad833c513fe17bac39e6850edf959 v4.3.1
 8a876f48f5cb1d018b837db28ff928500cb32cfb v4.4.0
 8dd86b410b1aac086ffdfc524ef300f896af5047 v4.4.1
 d2514226abc8d3b4f6fb57765f47d1b6fb360a05 v4.4.2
 27d783325930af6dad2741476c0d0b1b7c8415c2 v4.5.0
 7f2016f352abcbdba4a19d4039c386e9629449da v4.5.1
 416fec799314c70a5c780fb28b3357b08869333a v4.5.2
 27c3b85fafc83143e6678fbc3da69e1615bcac55 v4.6.0
 5ad13deb9118c2a5243d4032d4d9cc174e5872db v4.6.1
 2be921e01fa24bb102696ada596f87464c3666f6 v4.7.0
 7198bdec29c2872c974431d55200d0398354cdb1 v4.7.1
 bd1c8d230fe741c2dfd7100a0ef39fd0774fd581 v4.7.2
 9731914f89765d9628dc4dddc84bc9402aa124c8 v4.8.0
 c5a2b7d0e4bbdebc4a62d7b624befe375207b659 v4.9.0
 d9aa3b27ac9f7e78359775c75fedf7bfece232f1 v4.9.1
 4ba4d74981cec5d6b28b158f875a2540952c2f74 v4.10.0
 0a6821cbd6b0b3c21503002f88800679fa35ab63 v4.10.1
 434ad90ec8d621f4416074b84f6e9ce03964defb v4.10.2
 68baee10e698da2724c6e0f698c03a6abb993bf2 v4.10.3
 00821d3afd1dce3f4767cc353f84a17f7d5218a1 v4.10.4
 22f6744ad8cc274311825f63f953e4dee2ea5cb9 v4.10.5
 96eb24bea2f5f9258775245e3f09f6fa0a4dda01 v4.10.6
 3121217a812c956d7dd5a5875821bd73e8002a32 v4.11.0
 fa98b454715ac5b912f39e84af54345909a2a805 v4.11.1
 3982abcfdcc229a723cebe52d3a9bcff10bba08e v4.11.2
 33195f145db9172f0a8f1487e09207178a6ab065 v4.11.3
 194c74f33e32bbae6fc4d71ec5a999cff3c13605 v4.11.4
 8fbd8b0c3ddc2fa4ac9e4ca16942a03eb593df2d v4.11.5
 f0609aa5d5d05a1ca2f97c3995542236131c9d8a v4.11.6
 b5b30547d90d2e088472a70c84878f429ffbf40d v4.12.0
 9072253aa8894d20c00b4a43dc61c2168c1eff94 v4.12.1
 6a517543ea9ef9987d74371bd2a315eb0b232dc9 v4.12.2
 7fc0731b024c3114be87865eda7ab621cc957e32 v4.12.3
 6d531c0b068c6eda62dddceedc9f845ecb6feb6f v4.12.4
 3d6bf2d81b1564830eb5e83396110d2a9a93eb1e v4.13.0
 5468fc89e708bd90e413cd0d54350017abbdbc0e v4.13.1
 610d621550521c314ee97b3d43473ac0bcf06fb8 v4.13.2
 7dc62c090881fb5d03268141e71e0940d7c3295d v4.13.3
 9151328c1c46b72ba6f00d7640d9141e75aa1ca2 v4.14.0
 a47eeac5dfa41fa6779d90452affba4091c3ade8 v4.14.1
 4b34ce0d2c3c10510626b3b65044939bb7a2cddf v4.15.0
 14502561d22e6b70613674cd675ae9a604b7989f v4.15.1
 4aaa40b605b01af78a9f6882eca561c54b525ef0 v4.15.2
 797744642eca86640ed20bef2cd77445780abaec v4.16.0
 6c3452c7c25ed35ff269690929e11960ed6ad7d3 v4.16.1
 5d8057df561c4b6b81b6401aed7d2f911e6e77f7 v4.16.2
 13acfc008896ef4c62546bab5074e8f6f89b4fa7 v4.17.0
 45b9b610976f483877142fe75321808ce9ebac59 v4.17.1
 ad5bd0c4bd322fdbd04bb825a3d027e08f7a3901 v4.17.2
 037f5794b55a6236d68f6485a485372dde6566e0 v4.17.3
 83bc3100cfd6094c1d04f475ddb299b7dc3d0b33 v4.17.4
 e3de8c95baf8cc9109ca56aee8193a2cb6a54c8a v4.17.4
 f37a3126570477543507f0bc9d245ce75546181a v4.18.0
 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

@@ -1,27 +1,34 b''
 .. _integrations-jira:
 
 JIRA integration
 ================
 
 .. important::
 
     JIRA integration is only available in |RCEE|.
 
 
 .. important::
 
     In order to make issue numbers clickable in commit messages, see the
     :ref:`rhodecode-issue-trackers-ref` section. The JIRA integration
     only deals with altering JIRA issues.
 
 
 The JIRA integration allows you to reference and change issue statuses in
 JIRA directly from commit messages using commit message patterns such as
 ``fixes #JIRA-235`` in order to change the status of issue JIRA-235 to
 eg. "Resolved".
 
 In order to apply a status to a JIRA issue, it is necessary to find the
 transition status id in the *Workflow* section of JIRA.
 
 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

@@ -1,28 +1,34 b''
 .. _integrations-redmine:
 
 Redmine integration
 ===================
 
 .. important::
 
     Redmine integration is only available in |RCEE|.
 
 
 .. important::
 
     In order to make issue numbers clickable in commit messages, see the section
     :ref:`rhodecode-issue-trackers-ref`. Redmine integration is specifically for
     altering Redmine issues.
 
 
 Redmine integration allows you to reference and change issue statuses in
 Redmine directly from commit messages, using commit message patterns such as
 ``fixes #235`` in order to change the status of issue 235 to eg. "Resolved".
 
 To set a Redmine integration up, it is first necessary to obtain a Redmine API
 key. This can be found under *My Account* in the Redmine application.
 You may have to enable API Access in Redmine settings if it is not already
 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

@@ -1,141 +1,143 b''
 .. _rhodecode-release-notes-ref:
 
 Release Notes
 =============
 
 |RCE| 4.x Versions
 ------------------
 
 .. 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
    release-notes-4.18.1.rst
    release-notes-4.18.0.rst
    release-notes-4.17.4.rst
    release-notes-4.17.3.rst
    release-notes-4.17.2.rst
    release-notes-4.17.1.rst
    release-notes-4.17.0.rst
    release-notes-4.16.2.rst
    release-notes-4.16.1.rst
    release-notes-4.16.0.rst
    release-notes-4.15.2.rst
    release-notes-4.15.1.rst
    release-notes-4.15.0.rst
    release-notes-4.14.1.rst
    release-notes-4.14.0.rst
    release-notes-4.13.3.rst
    release-notes-4.13.2.rst
    release-notes-4.13.1.rst
    release-notes-4.13.0.rst
    release-notes-4.12.4.rst
    release-notes-4.12.3.rst
    release-notes-4.12.2.rst
    release-notes-4.12.1.rst
    release-notes-4.12.0.rst
    release-notes-4.11.6.rst
    release-notes-4.11.5.rst
    release-notes-4.11.4.rst
    release-notes-4.11.3.rst
    release-notes-4.11.2.rst
    release-notes-4.11.1.rst
    release-notes-4.11.0.rst
    release-notes-4.10.6.rst
    release-notes-4.10.5.rst
    release-notes-4.10.4.rst
    release-notes-4.10.3.rst
    release-notes-4.10.2.rst
    release-notes-4.10.1.rst
    release-notes-4.10.0.rst
    release-notes-4.9.1.rst
    release-notes-4.9.0.rst
    release-notes-4.8.0.rst
    release-notes-4.7.2.rst
    release-notes-4.7.1.rst
    release-notes-4.7.0.rst
    release-notes-4.6.1.rst
    release-notes-4.6.0.rst
    release-notes-4.5.2.rst
    release-notes-4.5.1.rst
    release-notes-4.5.0.rst
    release-notes-4.4.2.rst
    release-notes-4.4.1.rst
    release-notes-4.4.0.rst
    release-notes-4.3.1.rst
    release-notes-4.3.0.rst
    release-notes-4.2.1.rst
    release-notes-4.2.0.rst
    release-notes-4.1.2.rst
    release-notes-4.1.1.rst
    release-notes-4.1.0.rst
    release-notes-4.0.1.rst
    release-notes-4.0.0.rst
 
 |RCE| 3.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-3.8.4.rst
    release-notes-3.8.3.rst
    release-notes-3.8.2.rst
    release-notes-3.8.1.rst
    release-notes-3.8.0.rst
    release-notes-3.7.1.rst
    release-notes-3.7.0.rst
    release-notes-3.6.1.rst
    release-notes-3.6.0.rst
    release-notes-3.5.2.rst
    release-notes-3.5.1.rst
    release-notes-3.5.0.rst
    release-notes-3.4.1.rst
    release-notes-3.4.0.rst
    release-notes-3.3.4.rst
    release-notes-3.3.3.rst
    release-notes-3.3.2.rst
    release-notes-3.3.1.rst
    release-notes-3.3.0.rst
    release-notes-3.2.3.rst
    release-notes-3.2.2.rst
    release-notes-3.2.1.rst
    release-notes-3.2.0.rst
    release-notes-3.1.1.rst
    release-notes-3.1.0.rst
    release-notes-3.0.2.rst
    release-notes-3.0.1.rst
    release-notes-3.0.0.rst
 
 |RCE| 2.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-2.2.8.rst
    release-notes-2.2.7.rst
    release-notes-2.2.6.rst
    release-notes-2.2.5.rst
    release-notes-2.2.4.rst
    release-notes-2.2.3.rst
    release-notes-2.2.2.rst
    release-notes-2.2.1.rst
    release-notes-2.2.0.rst
    release-notes-2.1.0.rst
    release-notes-2.0.2.rst
    release-notes-2.0.1.rst
    release-notes-2.0.0.rst
 
 |RCE| 1.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-1.7.2.rst
    release-notes-1.7.1.rst
    release-notes-1.7.0.rst
    release-notes-1.6.0.rst

rhodecode/apps/_base/__init__.py

@@ -1,807 +1,808 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import time
 import logging
 import operator
 
 from pyramid import compat
 from pyramid.httpexceptions import HTTPFound, HTTPForbidden, HTTPBadRequest
 
 from rhodecode.lib import helpers as h, diffs, rc_cache
 from rhodecode.lib.utils2 import (
     StrictAttributeDict, str2bool, safe_int, datetime_to_time, safe_unicode)
 from rhodecode.lib.markup_renderer import MarkupRenderer, relative_links
 from rhodecode.lib.vcs.backends.base import EmptyCommit
 from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
 from rhodecode.model import repo
 from rhodecode.model import repo_group
 from rhodecode.model import user_group
 from rhodecode.model import user
 from rhodecode.model.db import User
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.settings import VcsSettingsModel, IssueTrackerSettingsModel
 from rhodecode.model.repo import ReadmeFinder
 
 log = logging.getLogger(__name__)
 
 
 ADMIN_PREFIX = '/_admin'
 STATIC_FILE_PREFIX = '/_static'
 
 URL_NAME_REQUIREMENTS = {
     # group name can have a slash in them, but they must not end with a slash
     'group_name': r'.*?[^/]',
     'repo_group_name': r'.*?[^/]',
     # repo names can have a slash in them, but they must not end with a slash
     'repo_name': r'.*?[^/]',
     # file path eats up everything at the end
     'f_path': r'.*',
     # reference types
     'source_ref_type': '(branch|book|tag|rev|\%\(source_ref_type\)s)',
     'target_ref_type': '(branch|book|tag|rev|\%\(target_ref_type\)s)',
 }
 
 
 def add_route_with_slash(config,name, pattern, **kw):
     config.add_route(name, pattern, **kw)
     if not pattern.endswith('/'):
         config.add_route(name + '_slash', pattern + '/', **kw)
 
 
 def add_route_requirements(route_path, requirements=None):
     """
     Adds regex requirements to pyramid routes using a mapping dict
     e.g::
         add_route_requirements('{repo_name}/settings')
     """
     requirements = requirements or URL_NAME_REQUIREMENTS
     for key, regex in requirements.items():
         route_path = route_path.replace('{%s}' % key, '{%s:%s}' % (key, regex))
     return route_path
 
 
 def get_format_ref_id(repo):
     """Returns a `repo` specific reference formatter function"""
     if h.is_svn(repo):
         return _format_ref_id_svn
     else:
         return _format_ref_id
 
 
 def _format_ref_id(name, raw_id):
     """Default formatting of a given reference `name`"""
     return name
 
 
 def _format_ref_id_svn(name, raw_id):
     """Special way of formatting a reference for Subversion including path"""
     return '%s@%s' % (name, raw_id)
 
 
 class TemplateArgs(StrictAttributeDict):
     pass
 
 
 class BaseAppView(object):
 
     def __init__(self, context, request):
         self.request = request
         self.context = context
         self.session = request.session
         if not hasattr(request, 'user'):
             # NOTE(marcink): edge case, we ended up in matched route
             # but probably of web-app context, e.g API CALL/VCS CALL
             if hasattr(request, 'vcs_call') or hasattr(request, 'rpc_method'):
                 log.warning('Unable to process request `%s` in this scope', request)
                 raise HTTPBadRequest()
 
         self._rhodecode_user = request.user  # auth user
         self._rhodecode_db_user = self._rhodecode_user.get_instance()
         self._maybe_needs_password_change(
             request.matched_route.name, self._rhodecode_db_user)
 
     def _maybe_needs_password_change(self, view_name, user_obj):
         log.debug('Checking if user %s needs password change on view %s',
                   user_obj, view_name)
         skip_user_views = [
             'logout', 'login',
             'my_account_password', 'my_account_password_update'
         ]
 
         if not user_obj:
             return
 
         if user_obj.username == User.DEFAULT_USER:
             return
 
         now = time.time()
         should_change = user_obj.user_data.get('force_password_change')
         change_after = safe_int(should_change) or 0
         if should_change and now > change_after:
             log.debug('User %s requires password change', user_obj)
             h.flash('You are required to change your password', 'warning',
                     ignore_duplicate=True)
 
             if view_name not in skip_user_views:
                 raise HTTPFound(
                     self.request.route_path('my_account_password'))
 
     def _log_creation_exception(self, e, repo_name):
         _ = self.request.translate
         reason = None
         if len(e.args) == 2:
             reason = e.args[1]
 
         if reason == 'INVALID_CERTIFICATE':
             log.exception(
                 'Exception creating a repository: invalid certificate')
             msg = (_('Error creating repository %s: invalid certificate')
                    % repo_name)
         else:
             log.exception("Exception creating a repository")
             msg = (_('Error creating repository %s')
                    % repo_name)
         return msg
 
     def _get_local_tmpl_context(self, include_app_defaults=True):
         c = TemplateArgs()
         c.auth_user = self.request.user
         # TODO(marcink): migrate the usage of c.rhodecode_user to c.auth_user
         c.rhodecode_user = self.request.user
 
         if include_app_defaults:
             from rhodecode.lib.base import attach_context_attributes
             attach_context_attributes(c, self.request, self.request.user.user_id)
 
         c.is_super_admin = c.auth_user.is_admin
 
         c.can_create_repo = c.is_super_admin
         c.can_create_repo_group = c.is_super_admin
         c.can_create_user_group = c.is_super_admin
 
         c.is_delegated_admin = False
 
         if not c.auth_user.is_default and not c.is_super_admin:
             c.can_create_repo = h.HasPermissionAny('hg.create.repository')(
                 user=self.request.user)
             repositories = c.auth_user.repositories_admin or c.can_create_repo
 
             c.can_create_repo_group = h.HasPermissionAny('hg.repogroup.create.true')(
                 user=self.request.user)
             repository_groups = c.auth_user.repository_groups_admin or c.can_create_repo_group
 
             c.can_create_user_group = h.HasPermissionAny('hg.usergroup.create.true')(
                 user=self.request.user)
             user_groups = c.auth_user.user_groups_admin or c.can_create_user_group
             # delegated admin can create, or manage some objects
             c.is_delegated_admin = repositories or repository_groups or user_groups
         return c
 
     def _get_template_context(self, tmpl_args, **kwargs):
 
         local_tmpl_args = {
             'defaults': {},
             'errors': {},
             'c': tmpl_args
         }
         local_tmpl_args.update(kwargs)
         return local_tmpl_args
 
     def load_default_context(self):
         """
         example:
 
         def load_default_context(self):
             c = self._get_local_tmpl_context()
             c.custom_var = 'foobar'
 
             return c
         """
         raise NotImplementedError('Needs implementation in view class')
 
 
 class RepoAppView(BaseAppView):
 
     def __init__(self, context, request):
         super(RepoAppView, self).__init__(context, request)
         self.db_repo = request.db_repo
         self.db_repo_name = self.db_repo.repo_name
         self.db_repo_pull_requests = ScmModel().get_pull_requests(self.db_repo)
         self.db_repo_artifacts = ScmModel().get_artifacts(self.db_repo)
         self.db_repo_patterns = IssueTrackerSettingsModel(repo=self.db_repo)
 
     def _handle_missing_requirements(self, error):
         log.error(
             'Requirements are missing for repository %s: %s',
             self.db_repo_name, safe_unicode(error))
 
     def _get_local_tmpl_context(self, include_app_defaults=True):
         _ = self.request.translate
         c = super(RepoAppView, self)._get_local_tmpl_context(
             include_app_defaults=include_app_defaults)
 
         # register common vars for this type of view
         c.rhodecode_db_repo = self.db_repo
         c.repo_name = self.db_repo_name
         c.repository_pull_requests = self.db_repo_pull_requests
         c.repository_artifacts = self.db_repo_artifacts
         c.repository_is_user_following = ScmModel().is_following_repo(
             self.db_repo_name, self._rhodecode_user.user_id)
         self.path_filter = PathFilter(None)
 
         c.repository_requirements_missing = {}
         try:
             self.rhodecode_vcs_repo = self.db_repo.scm_instance()
             # NOTE(marcink):
             # comparison to None since if it's an object __bool__ is expensive to
             # calculate
             if self.rhodecode_vcs_repo is not None:
                 path_perms = self.rhodecode_vcs_repo.get_path_permissions(
                     c.auth_user.username)
                 self.path_filter = PathFilter(path_perms)
         except RepositoryRequirementError as e:
             c.repository_requirements_missing = {'error': str(e)}
             self._handle_missing_requirements(e)
             self.rhodecode_vcs_repo = None
 
         c.path_filter = self.path_filter  # used by atom_feed_entry.mako
 
         if self.rhodecode_vcs_repo is None:
             # unable to fetch this repo as vcs instance, report back to user
             h.flash(_(
                 "The repository `%(repo_name)s` cannot be loaded in filesystem. "
                 "Please check if it exist, or is not damaged.") %
                     {'repo_name': c.repo_name},
                     category='error', ignore_duplicate=True)
             if c.repository_requirements_missing:
                 route = self.request.matched_route.name
                 if route.startswith(('edit_repo', 'repo_summary')):
                     # allow summary and edit repo on missing requirements
                     return c
 
                 raise HTTPFound(
                     h.route_path('repo_summary', repo_name=self.db_repo_name))
 
             else:  # redirect if we don't show missing requirements
                 raise HTTPFound(h.route_path('home'))
 
         c.has_origin_repo_read_perm = False
         if self.db_repo.fork:
             c.has_origin_repo_read_perm = h.HasRepoPermissionAny(
                 'repository.write', 'repository.read', 'repository.admin')(
                 self.db_repo.fork.repo_name, 'summary fork link')
 
         return c
 
     def _get_f_path_unchecked(self, matchdict, default=None):
         """
         Should only be used by redirects, everything else should call _get_f_path
         """
         f_path = matchdict.get('f_path')
         if f_path:
             # fix for multiple initial slashes that causes errors for GIT
             return f_path.lstrip('/')
 
         return default
 
     def _get_f_path(self, matchdict, default=None):
         f_path_match = self._get_f_path_unchecked(matchdict, default)
         return self.path_filter.assert_path_permissions(f_path_match)
 
     def _get_general_setting(self, target_repo, settings_key, default=False):
         settings_model = VcsSettingsModel(repo=target_repo)
         settings = settings_model.get_general_settings()
         return settings.get(settings_key, default)
 
     def _get_repo_setting(self, target_repo, settings_key, default=False):
         settings_model = VcsSettingsModel(repo=target_repo)
         settings = settings_model.get_repo_settings_inherited()
         return settings.get(settings_key, default)
 
     def _get_readme_data(self, db_repo, renderer_type, commit_id=None, path='/'):
         log.debug('Looking for README file at path %s', path)
         if commit_id:
             landing_commit_id = commit_id
         else:
             landing_commit = db_repo.get_landing_commit()
             if isinstance(landing_commit, EmptyCommit):
                 return None, None
             landing_commit_id = landing_commit.raw_id
 
         cache_namespace_uid = 'cache_repo.{}'.format(db_repo.repo_id)
         region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
         start = time.time()
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
         def generate_repo_readme(repo_id, _commit_id, _repo_name, _readme_search_path, _renderer_type):
             readme_data = None
             readme_filename = None
 
             commit = db_repo.get_commit(_commit_id)
             log.debug("Searching for a README file at commit %s.", _commit_id)
             readme_node = ReadmeFinder(_renderer_type).search(commit, path=_readme_search_path)
 
             if readme_node:
                 log.debug('Found README node: %s', readme_node)
                 relative_urls = {
                     'raw': h.route_path(
                         'repo_file_raw', repo_name=_repo_name,
                         commit_id=commit.raw_id, f_path=readme_node.path),
                     'standard': h.route_path(
                         'repo_files', repo_name=_repo_name,
                         commit_id=commit.raw_id, f_path=readme_node.path),
                 }
                 readme_data = self._render_readme_or_none(commit, readme_node, relative_urls)
                 readme_filename = readme_node.unicode_path
 
             return readme_data, readme_filename
 
         readme_data, readme_filename = generate_repo_readme(
             db_repo.repo_id, landing_commit_id, db_repo.repo_name, path, renderer_type,)
         compute_time = time.time() - start
         log.debug('Repo README for path %s generated and computed in %.4fs',
                   path, compute_time)
         return readme_data, readme_filename
 
     def _render_readme_or_none(self, commit, readme_node, relative_urls):
         log.debug('Found README file `%s` rendering...', readme_node.path)
         renderer = MarkupRenderer()
         try:
             html_source = renderer.render(
                 readme_node.content, filename=readme_node.path)
             if relative_urls:
                 return relative_links(html_source, relative_urls)
             return html_source
         except Exception:
             log.exception(
                 "Exception while trying to render the README")
 
     def get_recache_flag(self):
         for flag_name in ['force_recache', 'force-recache', 'no-cache']:
             flag_val = self.request.GET.get(flag_name)
             if str2bool(flag_val):
                 return True
         return False
 
 
 class PathFilter(object):
 
     # Expects and instance of BasePathPermissionChecker or None
     def __init__(self, permission_checker):
         self.permission_checker = permission_checker
 
     def assert_path_permissions(self, path):
         if self.path_access_allowed(path):
             return path
         raise HTTPForbidden()
 
     def path_access_allowed(self, path):
         log.debug('Checking ACL permissions for PathFilter for `%s`', path)
         if self.permission_checker:
             has_access = path and self.permission_checker.has_access(path)
             log.debug('ACL Permissions checker enabled, ACL Check has_access: %s', has_access)
             return has_access
 
         log.debug('ACL permissions checker not enabled, skipping...')
         return True
 
     def filter_patchset(self, patchset):
         if not self.permission_checker or not patchset:
             return patchset, False
         had_filtered = False
         filtered_patchset = []
         for patch in patchset:
             filename = patch.get('filename', None)
             if not filename or self.permission_checker.has_access(filename):
                 filtered_patchset.append(patch)
             else:
                 had_filtered = True
         if had_filtered:
             if isinstance(patchset, diffs.LimitedDiffContainer):
                 filtered_patchset = diffs.LimitedDiffContainer(patchset.diff_limit, patchset.cur_diff_size, filtered_patchset)
             return filtered_patchset, True
         else:
             return patchset, False
 
     def render_patchset_filtered(self, diffset, patchset, source_ref=None, target_ref=None):
         filtered_patchset, has_hidden_changes = self.filter_patchset(patchset)
         result = diffset.render_patchset(
             filtered_patchset, source_ref=source_ref, target_ref=target_ref)
         result.has_hidden_changes = has_hidden_changes
         return result
 
     def get_raw_patch(self, diff_processor):
         if self.permission_checker is None:
             return diff_processor.as_raw()
         elif self.permission_checker.has_full_access:
             return diff_processor.as_raw()
         else:
             return '# Repository has user-specific filters, raw patch generation is disabled.'
 
     @property
     def is_enabled(self):
         return self.permission_checker is not None
 
 
 class RepoGroupAppView(BaseAppView):
     def __init__(self, context, request):
         super(RepoGroupAppView, self).__init__(context, request)
         self.db_repo_group = request.db_repo_group
         self.db_repo_group_name = self.db_repo_group.group_name
 
     def _get_local_tmpl_context(self, include_app_defaults=True):
         _ = self.request.translate
         c = super(RepoGroupAppView, self)._get_local_tmpl_context(
             include_app_defaults=include_app_defaults)
         c.repo_group = self.db_repo_group
         return c
 
     def _revoke_perms_on_yourself(self, form_result):
         _updates = filter(lambda u: self._rhodecode_user.user_id == int(u[0]),
                           form_result['perm_updates'])
         _additions = filter(lambda u: self._rhodecode_user.user_id == int(u[0]),
                             form_result['perm_additions'])
         _deletions = filter(lambda u: self._rhodecode_user.user_id == int(u[0]),
                             form_result['perm_deletions'])
         admin_perm = 'group.admin'
         if _updates and _updates[0][1] != admin_perm or \
            _additions and _additions[0][1] != admin_perm or \
            _deletions and _deletions[0][1] != admin_perm:
             return True
         return False
 
 
 class UserGroupAppView(BaseAppView):
     def __init__(self, context, request):
         super(UserGroupAppView, self).__init__(context, request)
         self.db_user_group = request.db_user_group
         self.db_user_group_name = self.db_user_group.users_group_name
 
 
 class UserAppView(BaseAppView):
     def __init__(self, context, request):
         super(UserAppView, self).__init__(context, request)
         self.db_user = request.db_user
         self.db_user_id = self.db_user.user_id
 
         _ = self.request.translate
         if not request.db_user_supports_default:
             if self.db_user.username == User.DEFAULT_USER:
                 h.flash(_("Editing user `{}` is disabled.".format(
                     User.DEFAULT_USER)), category='warning')
                 raise HTTPFound(h.route_path('users'))
 
 
 class DataGridAppView(object):
     """
     Common class to have re-usable grid rendering components
     """
 
     def _extract_ordering(self, request, column_map=None):
         column_map = column_map or {}
         column_index = safe_int(request.GET.get('order[0][column]'))
         order_dir = request.GET.get(
             'order[0][dir]', 'desc')
         order_by = request.GET.get(
             'columns[%s][data][sort]' % column_index, 'name_raw')
 
         # translate datatable to DB columns
         order_by = column_map.get(order_by) or order_by
 
         search_q = request.GET.get('search[value]')
         return search_q, order_by, order_dir
 
     def _extract_chunk(self, request):
         start = safe_int(request.GET.get('start'), 0)
         length = safe_int(request.GET.get('length'), 25)
         draw = safe_int(request.GET.get('draw'))
         return draw, start, length
 
     def _get_order_col(self, order_by, model):
         if isinstance(order_by, compat.string_types):
             try:
                 return operator.attrgetter(order_by)(model)
             except AttributeError:
                 return None
         else:
             return order_by
 
 
 class BaseReferencesView(RepoAppView):
     """
     Base for reference view for branches, tags and bookmarks.
     """
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-
-
         return c
 
     def load_refs_context(self, ref_items, partials_template):
         _render = self.request.get_partial_renderer(partials_template)
         pre_load = ["author", "date", "message", "parents"]
 
         is_svn = h.is_svn(self.rhodecode_vcs_repo)
         is_hg = h.is_hg(self.rhodecode_vcs_repo)
 
         format_ref_id = get_format_ref_id(self.rhodecode_vcs_repo)
 
         closed_refs = {}
         if is_hg:
             closed_refs = self.rhodecode_vcs_repo.branches_closed
 
         data = []
         for ref_name, commit_id in ref_items:
             commit = self.rhodecode_vcs_repo.get_commit(
                 commit_id=commit_id, pre_load=pre_load)
             closed = ref_name in closed_refs
 
             # TODO: johbo: Unify generation of reference links
             use_commit_id = '/' in ref_name or is_svn
 
             if use_commit_id:
                 files_url = h.route_path(
                     '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(
                     'repo_files',
                     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),
                 "name_raw": ref_name,
                 "date": _render('date', commit.date),
                 "date_raw": datetime_to_time(commit.date),
                 "author": _render('author', commit.author),
                 "commit": _render(
                     'commit', commit.message, commit.raw_id, commit.idx),
                 "commit_raw": commit.idx,
                 "compare": _render(
                     'compare', format_ref_id(ref_name, commit.raw_id)),
             })
 
         return data
 
 
 class RepoRoutePredicate(object):
     def __init__(self, val, config):
         self.val = val
 
     def text(self):
         return 'repo_route = %s' % self.val
 
     phash = text
 
     def __call__(self, info, request):
         if hasattr(request, 'vcs_call'):
             # skip vcs calls
             return
 
         repo_name = info['match']['repo_name']
         repo_model = repo.RepoModel()
 
         by_name_match = repo_model.get_by_repo_name(repo_name, cache=False)
 
         def redirect_if_creating(route_info, db_repo):
             skip_views = ['edit_repo_advanced_delete']
             route = route_info['route']
             # we should skip delete view so we can actually "remove" repositories
             # if they get stuck in creating state.
             if route.name in skip_views:
                 return
 
             if db_repo.repo_state in [repo.Repository.STATE_PENDING]:
                 repo_creating_url = request.route_path(
                     'repo_creating', repo_name=db_repo.repo_name)
                 raise HTTPFound(repo_creating_url)
 
         if by_name_match:
             # register this as request object we can re-use later
             request.db_repo = by_name_match
             redirect_if_creating(info, by_name_match)
             return True
 
         by_id_match = repo_model.get_repo_by_id(repo_name)
         if by_id_match:
             request.db_repo = by_id_match
             redirect_if_creating(info, by_id_match)
             return True
 
         return False
 
 
 class RepoForbidArchivedRoutePredicate(object):
     def __init__(self, val, config):
         self.val = val
 
     def text(self):
         return 'repo_forbid_archived = %s' % self.val
 
     phash = text
 
     def __call__(self, info, request):
         _ = request.translate
         rhodecode_db_repo = request.db_repo
 
         log.debug(
             '%s checking if archived flag for repo for %s',
             self.__class__.__name__, rhodecode_db_repo.repo_name)
 
         if rhodecode_db_repo.archived:
             log.warning('Current view is not supported for archived repo:%s',
                         rhodecode_db_repo.repo_name)
 
             h.flash(
                 h.literal(_('Action not supported for archived repository.')),
                 category='warning')
             summary_url = request.route_path(
                 'repo_summary', repo_name=rhodecode_db_repo.repo_name)
             raise HTTPFound(summary_url)
         return True
 
 
 class RepoTypeRoutePredicate(object):
     def __init__(self, val, config):
         self.val = val or ['hg', 'git', 'svn']
 
     def text(self):
         return 'repo_accepted_type = %s' % self.val
 
     phash = text
 
     def __call__(self, info, request):
         if hasattr(request, 'vcs_call'):
             # skip vcs calls
             return
 
         rhodecode_db_repo = request.db_repo
 
         log.debug(
             '%s checking repo type for %s in %s',
             self.__class__.__name__, rhodecode_db_repo.repo_type, self.val)
 
         if rhodecode_db_repo.repo_type in self.val:
             return True
         else:
             log.warning('Current view is not supported for repo type:%s',
                         rhodecode_db_repo.repo_type)
             return False
 
 
 class RepoGroupRoutePredicate(object):
     def __init__(self, val, config):
         self.val = val
 
     def text(self):
         return 'repo_group_route = %s' % self.val
 
     phash = text
 
     def __call__(self, info, request):
         if hasattr(request, 'vcs_call'):
             # skip vcs calls
             return
 
         repo_group_name = info['match']['repo_group_name']
         repo_group_model = repo_group.RepoGroupModel()
         by_name_match = repo_group_model.get_by_group_name(repo_group_name, cache=False)
 
         if by_name_match:
             # register this as request object we can re-use later
             request.db_repo_group = by_name_match
             return True
 
         return False
 
 
 class UserGroupRoutePredicate(object):
     def __init__(self, val, config):
         self.val = val
 
     def text(self):
         return 'user_group_route = %s' % self.val
 
     phash = text
 
     def __call__(self, info, request):
         if hasattr(request, 'vcs_call'):
             # skip vcs calls
             return
 
         user_group_id = info['match']['user_group_id']
         user_group_model = user_group.UserGroup()
         by_id_match = user_group_model.get(user_group_id, cache=False)
 
         if by_id_match:
             # register this as request object we can re-use later
             request.db_user_group = by_id_match
             return True
 
         return False
 
 
 class UserRoutePredicateBase(object):
     supports_default = None
 
     def __init__(self, val, config):
         self.val = val
 
     def text(self):
         raise NotImplementedError()
 
     def __call__(self, info, request):
         if hasattr(request, 'vcs_call'):
             # skip vcs calls
             return
 
         user_id = info['match']['user_id']
         user_model = user.User()
         by_id_match = user_model.get(user_id, cache=False)
 
         if by_id_match:
             # register this as request object we can re-use later
             request.db_user = by_id_match
             request.db_user_supports_default = self.supports_default
             return True
 
         return False
 
 
 class UserRoutePredicate(UserRoutePredicateBase):
     supports_default = False
 
     def text(self):
         return 'user_route = %s' % self.val
 
     phash = text
 
 
 class UserRouteWithDefaultPredicate(UserRoutePredicateBase):
     supports_default = True
 
     def text(self):
         return 'user_with_default_route = %s' % self.val
 
     phash = text
 
 
 def includeme(config):
     config.add_route_predicate(
         'repo_route', RepoRoutePredicate)
     config.add_route_predicate(
         'repo_accepted_types', RepoTypeRoutePredicate)
     config.add_route_predicate(
         'repo_forbid_when_archived', RepoForbidArchivedRoutePredicate)
     config.add_route_predicate(
         'repo_group_route', RepoGroupRoutePredicate)
     config.add_route_predicate(
         'user_group_route', UserGroupRoutePredicate)
     config.add_route_predicate(
         'user_route_with_default', UserRouteWithDefaultPredicate)
     config.add_route_predicate(
         'user_route', UserRoutePredicate)

rhodecode/apps/debug_style/views.py

@@ -1,402 +1,419 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import os
 import logging
 import datetime
 
 from pyramid.view import view_config
 from pyramid.renderers import render_to_response
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib.celerylib import run_task, tasks
 from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.model.db import User
 from rhodecode.model.notification import EmailNotificationModel
 
 log = logging.getLogger(__name__)
 
 
 class DebugStyleView(BaseAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
         return c
 
     @view_config(
         route_name='debug_style_home', request_method='GET',
         renderer=None)
     def index(self):
         c = self.load_default_context()
         c.active = 'index'
 
         return render_to_response(
             'debug_style/index.html', self._get_template_context(c),
             request=self.request)
 
     @view_config(
         route_name='debug_style_email', request_method='GET',
         renderer=None)
     @view_config(
         route_name='debug_style_email_plain_rendered', request_method='GET',
         renderer=None)
     def render_email(self):
         c = self.load_default_context()
         email_id = self.request.matchdict['email_id']
         c.active = 'emails'
 
         pr = AttributeDict(
             pull_request_id=123,
             title='digital_ocean: fix redis, elastic search start on boot, '
                   'fix fd limits on supervisor, set postgres 11 version',
             description='''
 Check if we should use full-topic or mini-topic.
 
 - full topic produces some problems with merge states etc
 - server-mini-topic needs probably tweeks.            
             ''',
             repo_name='foobar',
             source_ref_parts=AttributeDict(type='branch', name='fix-ticket-2000'),
             target_ref_parts=AttributeDict(type='branch', name='master'),
         )
         target_repo = AttributeDict(repo_name='repo_group/target_repo')
         source_repo = AttributeDict(repo_name='repo_group/source_repo')
         user = User.get_by_username(self.request.GET.get('user')) or self._rhodecode_db_user
         # file/commit changes for PR update
         commit_changes = AttributeDict({
             'added': ['aaaaaaabbbbb', 'cccccccddddddd'],
             'removed': ['eeeeeeeeeee'],
         })
         file_changes = AttributeDict({
             'added': ['a/file1.md', 'file2.py'],
             'modified': ['b/modified_file.rst'],
             'removed': ['.idea'],
         })
 
         exc_traceback = {
             'exc_utc_date': '2020-03-26T12:54:50.683281',
             'exc_id': 139638856342656,
             'exc_timestamp': '1585227290.683288',
             'version': 'v1',
             'exc_message': 'Traceback (most recent call last):\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/tweens.py", line 41, in excview_tween\n    response = handler(request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/router.py", line 148, in handle_request\n    registry, request, context, context_iface, view_name\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/view.py", line 667, in _call_view\n    response = view_callable(context, request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/config/views.py", line 188, in attr_view\n    return view(context, request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/config/views.py", line 214, in predicate_wrapper\n    return view(context, request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/viewderivers.py", line 401, in viewresult_to_response\n    result = view(context, request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/viewderivers.py", line 132, in _class_view\n    response = getattr(inst, attr)()\n  File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/apps/debug_style/views.py", line 355, in render_email\n    template_type, **email_kwargs.get(email_id, {}))\n  File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/model/notification.py", line 402, in render_email\n    body = email_template.render(None, **_kwargs)\n  File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/lib/partial_renderer.py", line 95, in render\n    return self._render_with_exc(tmpl, args, kwargs)\n  File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/lib/partial_renderer.py", line 79, in _render_with_exc\n    return render_func.render(*args, **kwargs)\n  File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/template.py", line 476, in render\n    return runtime._render(self, self.callable_, args, data)\n  File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/runtime.py", line 883, in _render\n    **_kwargs_for_callable(callable_, data)\n  File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/runtime.py", line 920, in _render_context\n    _exec_template(inherit, lclcontext, args=args, kwargs=kwargs)\n  File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/runtime.py", line 947, in _exec_template\n    callable_(context, *args, **kwargs)\n  File "rhodecode_templates_email_templates_base_mako", line 63, in render_body\n  File "rhodecode_templates_email_templates_exception_tracker_mako", line 43, in render_body\nAttributeError: \'str\' object has no attribute \'get\'\n',
             'exc_type': 'AttributeError'
         }
         email_kwargs = {
             'test': {},
             'message': {
                 'body': 'message body !'
             },
             'email_test': {
                 'user': user,
                 'date': datetime.datetime.now(),
             },
             'exception': {
                 'email_prefix': '[RHODECODE ERROR]',
                 'exc_id': exc_traceback['exc_id'],
                 'exc_url': 'http://server-url/{}'.format(exc_traceback['exc_id']),
                 'exc_type_name': 'NameError',
                 'exc_traceback': exc_traceback,
             },
             'password_reset': {
                 'password_reset_url': 'http://example.com/reset-rhodecode-password/token',
 
                 'user': user,
                 'date': datetime.datetime.now(),
                 'email': '[e-mail]',
                 'first_admin_email': User.get_first_super_admin().email
             },
             'password_reset_confirmation': {
                 'new_password': 'new-password-example',
                 'user': user,
                 'date': datetime.datetime.now(),
                 'email': '[e-mail]',
                 'first_admin_email': User.get_first_super_admin().email
             },
             'registration': {
                 'user': user,
                 'date': datetime.datetime.now(),
             },
 
             'pull_request_comment': {
                 'user': user,
 
                 'status_change': None,
                 'status_change_type': None,
 
                 'pull_request': pr,
                 'pull_request_commits': [],
 
                 'pull_request_target_repo': target_repo,
                 'pull_request_target_repo_url': 'http://target-repo/url',
 
                 'pull_request_source_repo': source_repo,
                 'pull_request_source_repo_url': 'http://source-repo/url',
 
                 'pull_request_url': 'http://localhost/pr1',
                 'pr_comment_url': 'http://comment-url',
                 'pr_comment_reply_url': 'http://comment-url#reply',
 
                 'comment_file': None,
                 'comment_line': None,
                 'comment_type': 'note',
                 'comment_body': 'This is my comment body. *I like !*',
                 'comment_id': 2048,
                 'renderer_type': 'markdown',
                 'mention': True,
 
             },
             'pull_request_comment+status': {
                 'user': user,
 
                 'status_change': 'approved',
                 'status_change_type': 'approved',
 
                 'pull_request': pr,
                 'pull_request_commits': [],
 
                 'pull_request_target_repo': target_repo,
                 'pull_request_target_repo_url': 'http://target-repo/url',
 
                 'pull_request_source_repo': source_repo,
                 'pull_request_source_repo_url': 'http://source-repo/url',
 
                 'pull_request_url': 'http://localhost/pr1',
                 'pr_comment_url': 'http://comment-url',
                 'pr_comment_reply_url': 'http://comment-url#reply',
 
                 'comment_type': 'todo',
                 'comment_file': None,
                 'comment_line': None,
                 'comment_body': '''
 I think something like this would be better
 
 ```py
+// markdown renderer
 
 def db():
    global connection
    return connection
 
 ```
                 
                 ''',
                 'comment_id': 2048,
                 'renderer_type': 'markdown',
                 'mention': True,
 
             },
             'pull_request_comment+file': {
                 'user': user,
 
                 'status_change': None,
                 'status_change_type': None,
 
                 'pull_request': pr,
                 'pull_request_commits': [],
 
                 'pull_request_target_repo': target_repo,
                 'pull_request_target_repo_url': 'http://target-repo/url',
 
                 'pull_request_source_repo': source_repo,
                 'pull_request_source_repo_url': 'http://source-repo/url',
 
                 'pull_request_url': 'http://localhost/pr1',
 
                 'pr_comment_url': 'http://comment-url',
                 'pr_comment_reply_url': 'http://comment-url#reply',
 
                 'comment_file': 'rhodecode/model/get_flow_commits',
                 'comment_line': 'o1210',
                 'comment_type': 'todo',
                 '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 !
                 ''',
                 'comment_id': 2048,
                 'renderer_type': 'rst',
                 'mention': True,
 
             },
 
             'pull_request_update': {
                 'updating_user': user,
 
                 'status_change': None,
                 'status_change_type': None,
 
                 'pull_request': pr,
                 'pull_request_commits': [],
 
                 'pull_request_target_repo': target_repo,
                 'pull_request_target_repo_url': 'http://target-repo/url',
 
                 'pull_request_source_repo': source_repo,
                 'pull_request_source_repo_url': 'http://source-repo/url',
 
                 'pull_request_url': 'http://localhost/pr1',
 
                 # update comment links
                 'pr_comment_url': 'http://comment-url',
                 'pr_comment_reply_url': 'http://comment-url#reply',
                 'ancestor_commit_id': 'f39bd443',
                 'added_commits': commit_changes.added,
                 'removed_commits': commit_changes.removed,
                 'changed_files': (file_changes.added + file_changes.modified + file_changes.removed),
                 'added_files': file_changes.added,
                 'modified_files': file_changes.modified,
                 'removed_files': file_changes.removed,
             },
 
             'cs_comment': {
                 'user': user,
                 'commit': AttributeDict(idx=123, raw_id='a'*40, message='Commit message'),
                 'status_change': None,
                 'status_change_type': None,
 
                 'commit_target_repo_url': 'http://foo.example.com/#comment1',
                 'repo_name': 'test-repo',
                 'comment_type': 'note',
                 'comment_file': None,
                 'comment_line': None,
                 'commit_comment_url': 'http://comment-url',
                 'commit_comment_reply_url': 'http://comment-url#reply',
                 'comment_body': 'This is my comment body. *I like !*',
                 'comment_id': 2048,
                 'renderer_type': 'markdown',
                 'mention': True,
             },
             'cs_comment+status': {
                 'user': user,
                 'commit': AttributeDict(idx=123, raw_id='a' * 40, message='Commit message'),
                 'status_change': 'approved',
                 'status_change_type': 'approved',
 
                 'commit_target_repo_url': 'http://foo.example.com/#comment1',
                 'repo_name': 'test-repo',
                 'comment_type': 'note',
                 'comment_file': None,
                 'comment_line': None,
                 'commit_comment_url': 'http://comment-url',
                 'commit_comment_reply_url': 'http://comment-url#reply',
                 'comment_body': '''
 Hello **world**
 
 This is a multiline comment :)
 
 - list
 - list2
                 ''',
                 'comment_id': 2048,
                 'renderer_type': 'markdown',
                 'mention': True,
             },
             'cs_comment+file': {
                 'user': user,
                 'commit': AttributeDict(idx=123, raw_id='a' * 40, message='Commit message'),
                 'status_change': None,
                 'status_change_type': None,
 
                 'commit_target_repo_url': 'http://foo.example.com/#comment1',
                 'repo_name': 'test-repo',
 
                 'comment_type': 'note',
                 'comment_file': 'test-file.py',
                 'comment_line': 'n100',
 
                 'commit_comment_url': 'http://comment-url',
                 'commit_comment_reply_url': 'http://comment-url#reply',
                 'comment_body': 'This is my comment body. *I like !*',
                 'comment_id': 2048,
                 'renderer_type': 'markdown',
                 'mention': True,
             },
             
             'pull_request': {
                 'user': user,
                 'pull_request': pr,
                 'pull_request_commits': [
                     ('472d1df03bf7206e278fcedc6ac92b46b01c4e21', '''\
 my-account: moved email closer to profile as it's similar data just moved outside.                    
                     '''),
                     ('cbfa3061b6de2696c7161ed15ba5c6a0045f90a7', '''\
 users: description edit fixes
 
 - tests
 - added metatags info                    
                     '''),
                 ],
 
                 'pull_request_target_repo': target_repo,
                 'pull_request_target_repo_url': 'http://target-repo/url',
 
                 'pull_request_source_repo': source_repo,
                 'pull_request_source_repo_url': 'http://source-repo/url',
 
                 'pull_request_url': 'http://code.rhodecode.com/_pull-request/123',
             }
 
         }
 
         template_type = email_id.split('+')[0]
         (c.subject, c.headers, c.email_body,
          c.email_body_plaintext) = EmailNotificationModel().render_email(
             template_type, **email_kwargs.get(email_id, {}))
 
         test_email = self.request.GET.get('email')
         if test_email:
             recipients = [test_email]
             run_task(tasks.send_email, recipients, c.subject,
                      c.email_body_plaintext, c.email_body)
 
         if self.request.matched_route.name == 'debug_style_email_plain_rendered':
             template = 'debug_style/email_plain_rendered.mako'
         else:
             template = 'debug_style/email.mako'
         return render_to_response(
             template, self._get_template_context(c),
             request=self.request)
 
     @view_config(
         route_name='debug_style_template', request_method='GET',
         renderer=None)
     def template(self):
         t_path = self.request.matchdict['t_path']
         c = self.load_default_context()
         c.active = os.path.splitext(t_path)[0]
         c.came_from = ''
         c.email_types = {
             'cs_comment+file': {},
             'cs_comment+status': {},
 
             'pull_request_comment+file': {},
             'pull_request_comment+status': {},
 
             'pull_request_update': {},
         }
         c.email_types.update(EmailNotificationModel.email_types)
 
         return render_to_response(
             'debug_style/' + t_path, self._get_template_context(c),
             request=self.request)
 

rhodecode/apps/home/tests/test_home.py

@@ -1,179 +1,179 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
 import pytest
 
 import rhodecode
 from rhodecode.model.db import Repository, RepoGroup, User
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.settings import SettingsModel
 from rhodecode.tests import TestController
 from rhodecode.tests.fixture import Fixture
 from rhodecode.lib import helpers as h
 
 fixture = Fixture()
 
 
 def route_path(name, **kwargs):
     return {
         'home': '/',
         'main_page_repos_data': '/_home_repos',
         'main_page_repo_groups_data': '/_home_repo_groups',
         'repo_group_home': '/{repo_group_name}'
     }[name].format(**kwargs)
 
 
 class TestHomeController(TestController):
 
     def test_index(self):
         self.log_user()
         response = self.app.get(route_path('home'))
         # if global permission is set
         response.mustcontain('New Repository')
 
     def test_index_grid_repos(self, xhr_header):
         self.log_user()
         response = self.app.get(route_path('main_page_repos_data'), extra_environ=xhr_header)
         # search for objects inside the JavaScript JSON
         for obj in Repository.getAll():
             response.mustcontain('<a href=\\"/{}\\">'.format(obj.repo_name))
 
     def test_index_grid_repo_groups(self, xhr_header):
         self.log_user()
         response = self.app.get(route_path('main_page_repo_groups_data'),
                                 extra_environ=xhr_header,)
 
         # search for objects inside the JavaScript JSON
         for obj in RepoGroup.getAll():
             response.mustcontain('<a href=\\"/{}\\">'.format(obj.group_name))
 
     def test_index_grid_repo_groups_without_access(self, xhr_header, user_util):
         user = user_util.create_user(password='qweqwe')
         group_ok = user_util.create_repo_group(owner=user)
         group_id_ok = group_ok.group_id
 
         group_forbidden = user_util.create_repo_group(owner=User.get_first_super_admin())
         group_id_forbidden = group_forbidden.group_id
 
         user_util.grant_user_permission_to_repo_group(group_forbidden, user, 'group.none')
         self.log_user(user.username, 'qweqwe')
 
         self.app.get(route_path('main_page_repo_groups_data'),
                      extra_environ=xhr_header,
                      params={'repo_group_id': group_id_ok}, status=200)
 
         self.app.get(route_path('main_page_repo_groups_data'),
                      extra_environ=xhr_header,
                      params={'repo_group_id': group_id_forbidden}, status=404)
 
     def test_index_contains_statics_with_ver(self):
         from rhodecode.lib.base import calculate_version_hash
 
         self.log_user()
         response = self.app.get(route_path('home'))
 
         rhodecode_version_hash = calculate_version_hash(
             {'beaker.session.secret': 'test-rc-uytcxaz'})
         response.mustcontain('style.css?ver={0}'.format(rhodecode_version_hash))
         response.mustcontain('scripts.min.js?ver={0}'.format(rhodecode_version_hash))
 
     def test_index_contains_backend_specific_details(self, backend, xhr_header):
         self.log_user()
         response = self.app.get(route_path('main_page_repos_data'), extra_environ=xhr_header)
         tip = backend.repo.get_commit().raw_id
 
         # html in javascript variable:
         response.mustcontain(r'<i class=\"icon-%s\"' % (backend.alias, ))
         response.mustcontain(r'href=\"/%s\"' % (backend.repo_name, ))
 
         response.mustcontain("""/%s/changeset/%s""" % (backend.repo_name, tip))
         response.mustcontain("""Added a symlink""")
 
     def test_index_with_anonymous_access_disabled(self):
         with fixture.anon_access(False):
             response = self.app.get(route_path('home'), status=302)
             assert 'login' in response.location
 
     def test_index_page_on_groups_with_wrong_group_id(self, autologin_user, xhr_header):
         group_id = 918123
         self.app.get(
             route_path('main_page_repo_groups_data'),
             params={'repo_group_id': group_id},
             status=404, extra_environ=xhr_header)
 
     def test_index_page_on_groups(self, autologin_user, user_util, xhr_header):
         gr = user_util.create_repo_group()
         repo = user_util.create_repo(parent=gr)
         repo_name = repo.repo_name
         group_id = gr.group_id
 
         response = self.app.get(route_path(
             'repo_group_home', repo_group_name=gr.group_name))
         response.mustcontain('d.repo_group_id = {}'.format(group_id))
 
         response = self.app.get(
             route_path('main_page_repos_data'),
             params={'repo_group_id': group_id},
             extra_environ=xhr_header,)
         response.mustcontain(repo_name)
 
     def test_index_page_on_group_with_trailing_slash(self, autologin_user, user_util, xhr_header):
         gr = user_util.create_repo_group()
         repo = user_util.create_repo(parent=gr)
         repo_name = repo.repo_name
         group_id = gr.group_id
 
         response = self.app.get(route_path(
             'repo_group_home', repo_group_name=gr.group_name+'/'))
         response.mustcontain('d.repo_group_id = {}'.format(group_id))
 
         response = self.app.get(
             route_path('main_page_repos_data'),
             params={'repo_group_id': group_id},
             extra_environ=xhr_header, )
         response.mustcontain(repo_name)
 
     @pytest.mark.parametrize("name, state", [
         ('Disabled', False),
         ('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')
         Session().add(sett)
         Session().commit()
         SettingsModel().invalidate_settings_cache()
 
         response = self.app.get(route_path('home'))
         if state is True:
             response.mustcontain(version_string)
         if state is False:
             response.mustcontain(no=[version_string])
 
     def test_logout_form_contains_csrf(self, autologin_user, csrf_token):
         response = self.app.get(route_path('home'))
         assert_response = response.assert_response()
         element = assert_response.get_element('.logout [name=csrf_token]')
         assert element.value == csrf_token

rhodecode/apps/repository/tests/test_repo_files.py

@@ -1,1070 +1,1070 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import os
 
 import mock
 import pytest
 
 from rhodecode.apps.repository.tests.test_repo_compare import ComparePage
 from rhodecode.apps.repository.views.repo_files import RepoFilesView
 from rhodecode.lib import helpers as h
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.vcs import nodes
 
 from rhodecode.lib.vcs.conf import settings
 from rhodecode.tests import assert_session_flash
 from rhodecode.tests.fixture import Fixture
 from rhodecode.model.db import Session
 
 fixture = Fixture()
 
 
 def get_node_history(backend_type):
     return {
         'hg': json.loads(fixture.load_resource('hg_node_history_response.json')),
         'git': json.loads(fixture.load_resource('git_node_history_response.json')),
         'svn': json.loads(fixture.load_resource('svn_node_history_response.json')),
     }[backend_type]
 
 
 def route_path(name, params=None, **kwargs):
     import urllib
 
     base_url = {
         'repo_summary': '/{repo_name}',
         'repo_archivefile': '/{repo_name}/archive/{fname}',
         'repo_files_diff': '/{repo_name}/diff/{f_path}',
         'repo_files_diff_2way_redirect':  '/{repo_name}/diff-2way/{f_path}',
         'repo_files': '/{repo_name}/files/{commit_id}/{f_path}',
         'repo_files:default_path': '/{repo_name}/files/{commit_id}/',
         'repo_files:default_commit': '/{repo_name}/files',
         'repo_files:rendered': '/{repo_name}/render/{commit_id}/{f_path}',
         'repo_files:annotated': '/{repo_name}/annotate/{commit_id}/{f_path}',
         'repo_files:annotated_previous': '/{repo_name}/annotate-previous/{commit_id}/{f_path}',
         'repo_files_nodelist': '/{repo_name}/nodelist/{commit_id}/{f_path}',
         'repo_file_raw': '/{repo_name}/raw/{commit_id}/{f_path}',
         'repo_file_download': '/{repo_name}/download/{commit_id}/{f_path}',
         'repo_file_history': '/{repo_name}/history/{commit_id}/{f_path}',
         'repo_file_authors': '/{repo_name}/authors/{commit_id}/{f_path}',
         'repo_files_remove_file': '/{repo_name}/remove_file/{commit_id}/{f_path}',
         'repo_files_delete_file': '/{repo_name}/delete_file/{commit_id}/{f_path}',
         'repo_files_edit_file': '/{repo_name}/edit_file/{commit_id}/{f_path}',
         'repo_files_update_file': '/{repo_name}/update_file/{commit_id}/{f_path}',
         'repo_files_add_file': '/{repo_name}/add_file/{commit_id}/{f_path}',
         'repo_files_create_file': '/{repo_name}/create_file/{commit_id}/{f_path}',
         'repo_nodetree_full': '/{repo_name}/nodetree_full/{commit_id}/{f_path}',
         'repo_nodetree_full:default_path': '/{repo_name}/nodetree_full/{commit_id}/',
     }[name].format(**kwargs)
 
     if params:
         base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
     return base_url
 
 
 def assert_files_in_response(response, files, params):
     template = (
         'href="/%(repo_name)s/files/%(commit_id)s/%(name)s"')
     _assert_items_in_response(response, files, template, params)
 
 
 def assert_dirs_in_response(response, dirs, params):
     template = (
         'href="/%(repo_name)s/files/%(commit_id)s/%(name)s"')
     _assert_items_in_response(response, dirs, template, params)
 
 
 def _assert_items_in_response(response, items, template, params):
     for item in items:
         item_params = {'name': item}
         item_params.update(params)
         response.mustcontain(template % item_params)
 
 
 def assert_timeago_in_response(response, items, params):
     for item in items:
         response.mustcontain(h.age_component(params['date']))
 
 
 @pytest.mark.usefixtures("app")
 class TestFilesViews(object):
 
     def test_show_files(self, backend):
         response = self.app.get(
             route_path('repo_files',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path='/'))
         commit = backend.repo.get_commit()
 
         params = {
             'repo_name': backend.repo_name,
             'commit_id': commit.raw_id,
             'date': commit.date
         }
         assert_dirs_in_response(response, ['docs', 'vcs'], params)
         files = [
             '.gitignore',
             '.hgignore',
             '.hgtags',
             # TODO: missing in Git
             # '.travis.yml',
             'MANIFEST.in',
             'README.rst',
             # TODO: File is missing in svn repository
             # 'run_test_and_report.sh',
             'setup.cfg',
             'setup.py',
             'test_and_report.sh',
             'tox.ini',
         ]
         assert_files_in_response(response, files, params)
         assert_timeago_in_response(response, files, params)
 
     def test_show_files_links_submodules_with_absolute_url(self, backend_hg):
         repo = backend_hg['subrepos']
         response = self.app.get(
             route_path('repo_files',
                        repo_name=repo.repo_name,
                        commit_id='tip', f_path='/'))
         assert_response = response.assert_response()
         assert_response.contains_one_link(
             'absolute-path @ 000000000000', 'http://example.com/absolute-path')
 
     def test_show_files_links_submodules_with_absolute_url_subpaths(
             self, backend_hg):
         repo = backend_hg['subrepos']
         response = self.app.get(
             route_path('repo_files',
                        repo_name=repo.repo_name,
                        commit_id='tip', f_path='/'))
         assert_response = response.assert_response()
         assert_response.contains_one_link(
             'subpaths-path @ 000000000000',
             'http://sub-base.example.com/subpaths-path')
 
     @pytest.mark.xfail_backends("svn", reason="Depends on branch support")
     def test_files_menu(self, backend):
         new_branch = "temp_branch_name"
         commits = [
             {'message': 'a'},
             {'message': 'b', 'branch': new_branch}
         ]
         backend.create_repo(commits)
         backend.repo.landing_rev = "branch:%s" % new_branch
         Session().commit()
 
         # get response based on tip and not new commit
         response = self.app.get(
             route_path('repo_files',
                        repo_name=backend.repo_name,
                        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(
             '<li class="active"><a class="menulink" href="%s">' % files_url)
 
     def test_show_files_commit(self, backend):
         commit = backend.repo.get_commit(commit_idx=32)
 
         response = self.app.get(
             route_path('repo_files',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='/'))
 
         dirs = ['docs', 'tests']
         files = ['README.rst']
         params = {
             'repo_name': backend.repo_name,
             'commit_id': commit.raw_id,
         }
         assert_dirs_in_response(response, dirs, params)
         assert_files_in_response(response, files, params)
 
     def test_show_files_different_branch(self, backend):
         branches = dict(
             hg=(150, ['git']),
             # TODO: Git test repository does not contain other branches
             git=(633, ['master']),
             # TODO: Branch support in Subversion
             svn=(150, [])
         )
         idx, branches = branches[backend.alias]
         commit = backend.repo.get_commit(commit_idx=idx)
         response = self.app.get(
             route_path('repo_files',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='/'))
 
         assert_response = response.assert_response()
         for branch in branches:
             assert_response.element_contains('.tags .branchtag', branch)
 
     def test_show_files_paging(self, backend):
         repo = backend.repo
         indexes = [73, 92, 109, 1, 0]
         idx_map = [(rev, repo.get_commit(commit_idx=rev).raw_id)
                    for rev in indexes]
 
         for idx in idx_map:
             response = self.app.get(
             route_path('repo_files',
                        repo_name=backend.repo_name,
                        commit_id=idx[1], f_path='/'))
 
             response.mustcontain("""r%s:%s""" % (idx[0], idx[1][:8]))
 
     def test_file_source(self, backend):
         commit = backend.repo.get_commit(commit_idx=167)
         response = self.app.get(
             route_path('repo_files',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='vcs/nodes.py'))
 
         msgbox = """<div class="commit">%s</div>"""
         response.mustcontain(msgbox % (commit.message, ))
 
         assert_response = response.assert_response()
         if commit.branch:
             assert_response.element_contains(
                 '.tags.tags-main .branchtag', commit.branch)
         if commit.tags:
             for tag in commit.tags:
                 assert_response.element_contains('.tags.tags-main .tagtag', tag)
 
     def test_file_source_annotated(self, backend):
         response = self.app.get(
             route_path('repo_files:annotated',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path='vcs/nodes.py'))
         expected_commits = {
             'hg': 'r356',
             'git': 'r345',
             'svn': 'r208',
         }
         response.mustcontain(expected_commits[backend.alias])
 
     def test_file_source_authors(self, backend):
         response = self.app.get(
             route_path('repo_file_authors',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path='vcs/nodes.py'))
         expected_authors = {
             'hg': ('Marcin Kuzminski', 'Lukasz Balcerzak'),
             'git': ('Marcin Kuzminski', 'Lukasz Balcerzak'),
             'svn': ('marcin', 'lukasz'),
         }
 
         for author in expected_authors[backend.alias]:
             response.mustcontain(author)
 
     def test_file_source_authors_with_annotation(self, backend):
         response = self.app.get(
             route_path('repo_file_authors',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path='vcs/nodes.py',
                        params=dict(annotate=1)))
         expected_authors = {
             'hg': ('Marcin Kuzminski', 'Lukasz Balcerzak'),
             'git': ('Marcin Kuzminski', 'Lukasz Balcerzak'),
             'svn': ('marcin', 'lukasz'),
         }
 
         for author in expected_authors[backend.alias]:
             response.mustcontain(author)
 
     def test_file_source_history(self, backend, xhr_header):
         response = self.app.get(
             route_path('repo_file_history',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path='vcs/nodes.py'),
             extra_environ=xhr_header)
         assert get_node_history(backend.alias) == json.loads(response.body)
 
     def test_file_source_history_svn(self, backend_svn, xhr_header):
         simple_repo = backend_svn['svn-simple-layout']
         response = self.app.get(
             route_path('repo_file_history',
                        repo_name=simple_repo.repo_name,
                        commit_id='tip', f_path='trunk/example.py'),
             extra_environ=xhr_header)
 
         expected_data = json.loads(
             fixture.load_resource('svn_node_history_branches.json'))
 
         assert expected_data == response.json
 
     def test_file_source_history_with_annotation(self, backend, xhr_header):
         response = self.app.get(
             route_path('repo_file_history',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path='vcs/nodes.py',
                        params=dict(annotate=1)),
 
             extra_environ=xhr_header)
         assert get_node_history(backend.alias) == json.loads(response.body)
 
     def test_tree_search_top_level(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
             route_path('repo_files_nodelist',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='/'),
             extra_environ=xhr_header)
         assert 'nodes' in response.json
         assert {'name': 'docs', 'type': 'dir'} in response.json['nodes']
 
     def test_tree_search_missing_xhr(self, backend):
         self.app.get(
             route_path('repo_files_nodelist',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path='/'),
             status=404)
 
     def test_tree_search_at_path(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
             route_path('repo_files_nodelist',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='/docs'),
             extra_environ=xhr_header)
         assert 'nodes' in response.json
         nodes = response.json['nodes']
         assert {'name': 'docs/api', 'type': 'dir'} in nodes
         assert {'name': 'docs/index.rst', 'type': 'file'} in nodes
 
     def test_tree_search_at_path_2nd_level(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
             route_path('repo_files_nodelist',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='/docs/api'),
             extra_environ=xhr_header)
         assert 'nodes' in response.json
         nodes = response.json['nodes']
         assert {'name': 'docs/api/index.rst', 'type': 'file'} in nodes
 
     def test_tree_search_at_path_missing_xhr(self, backend):
         self.app.get(
             route_path('repo_files_nodelist',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path='/docs'),
             status=404)
 
     def test_nodetree(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
             route_path('repo_nodetree_full',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='/'),
             extra_environ=xhr_header)
 
         assert_response = response.assert_response()
 
         for attr in ['data-commit-id', 'data-date', 'data-author']:
             elements = assert_response.get_elements('[{}]'.format(attr))
             assert len(elements) > 1
 
             for element in elements:
                 assert element.get(attr)
 
     def test_nodetree_if_file(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
             route_path('repo_nodetree_full',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='README.rst'),
             extra_environ=xhr_header)
         assert response.body == ''
 
     def test_nodetree_wrong_path(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
             route_path('repo_nodetree_full',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='/dont-exist'),
             extra_environ=xhr_header)
 
         err = 'error: There is no file nor ' \
               'directory at the given path'
         assert err in response.body
 
     def test_nodetree_missing_xhr(self, backend):
         self.app.get(
             route_path('repo_nodetree_full',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path='/'),
             status=404)
 
 
 @pytest.mark.usefixtures("app", "autologin_user")
 class TestRawFileHandling(object):
 
     def test_download_file(self, backend):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
             route_path('repo_file_download',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='vcs/nodes.py'),)
 
         assert response.content_disposition == 'attachment; filename="nodes.py"; filename*=UTF-8\'\'nodes.py'
         assert response.content_type == "text/x-python"
 
     def test_download_file_wrong_cs(self, backend):
         raw_id = u'ERRORce30c96924232dffcd24178a07ffeb5dfc'
 
         response = self.app.get(
             route_path('repo_file_download',
                        repo_name=backend.repo_name,
                        commit_id=raw_id, f_path='vcs/nodes.svg'),
             status=404)
 
         msg = """No such commit exists for this repository"""
         response.mustcontain(msg)
 
     def test_download_file_wrong_f_path(self, backend):
         commit = backend.repo.get_commit(commit_idx=173)
         f_path = 'vcs/ERRORnodes.py'
 
         response = self.app.get(
             route_path('repo_file_download',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path=f_path),
             status=404)
 
         msg = (
             "There is no file nor directory at the given path: "
             "`%s` at commit %s" % (f_path, commit.short_id))
         response.mustcontain(msg)
 
     def test_file_raw(self, backend):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
             route_path('repo_file_raw',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='vcs/nodes.py'),)
 
         assert response.content_type == "text/plain"
 
     def test_file_raw_binary(self, backend):
         commit = backend.repo.get_commit()
         response = self.app.get(
             route_path('repo_file_raw',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id,
                        f_path='docs/theme/ADC/static/breadcrumb_background.png'),)
 
         assert response.content_disposition == 'inline'
 
     def test_raw_file_wrong_cs(self, backend):
         raw_id = u'ERRORcce30c96924232dffcd24178a07ffeb5dfc'
 
         response = self.app.get(
             route_path('repo_file_raw',
                        repo_name=backend.repo_name,
                        commit_id=raw_id, f_path='vcs/nodes.svg'),
             status=404)
 
         msg = """No such commit exists for this repository"""
         response.mustcontain(msg)
 
     def test_raw_wrong_f_path(self, backend):
         commit = backend.repo.get_commit(commit_idx=173)
         f_path = 'vcs/ERRORnodes.py'
         response = self.app.get(
             route_path('repo_file_raw',
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path=f_path),
             status=404)
 
         msg = (
             "There is no file nor directory at the given path: "
             "`%s` at commit %s" % (f_path, commit.short_id))
         response.mustcontain(msg)
 
     def test_raw_svg_should_not_be_rendered(self, backend):
         backend.create_repo()
         backend.ensure_file("xss.svg")
         response = self.app.get(
             route_path('repo_file_raw',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path='xss.svg'),)
         # If the content type is image/svg+xml then it allows to render HTML
         # and malicious SVG.
         assert response.content_type == "text/plain"
 
 
 @pytest.mark.usefixtures("app")
 class TestRepositoryArchival(object):
 
     def test_archival(self, backend):
         backend.enable_downloads()
         commit = backend.repo.get_commit(commit_idx=173)
         for a_type, content_type, extension in settings.ARCHIVE_SPECS:
 
             short = commit.short_id + extension
             fname = commit.raw_id + extension
             filename = '%s-%s' % (backend.repo_name, short)
             response = self.app.get(
                 route_path('repo_archivefile',
                            repo_name=backend.repo_name,
                            fname=fname))
 
             assert response.status == '200 OK'
             headers = [
                 ('Content-Disposition', 'attachment; filename=%s' % filename),
                 ('Content-Type', '%s' % content_type),
             ]
 
             for header in headers:
                 assert header in response.headers.items()
 
     @pytest.mark.parametrize('arch_ext',[
         'tar', 'rar', 'x', '..ax', '.zipz', 'tar.gz.tar'])
     def test_archival_wrong_ext(self, backend, arch_ext):
         backend.enable_downloads()
         commit = backend.repo.get_commit(commit_idx=173)
 
         fname = commit.raw_id + '.' + arch_ext
 
         response = self.app.get(
             route_path('repo_archivefile',
                        repo_name=backend.repo_name,
                        fname=fname))
         response.mustcontain(
             'Unknown archive type for: `{}`'.format(fname))
 
     @pytest.mark.parametrize('commit_id', [
         '00x000000', 'tar', 'wrong', '@$@$42413232', '232dffcd'])
     def test_archival_wrong_commit_id(self, backend, commit_id):
         backend.enable_downloads()
         fname = '%s.zip' % commit_id
 
         response = self.app.get(
             route_path('repo_archivefile',
                        repo_name=backend.repo_name,
                        fname=fname))
         response.mustcontain('Unknown commit_id')
 
 
 @pytest.mark.usefixtures("app")
 class TestFilesDiff(object):
 
     @pytest.mark.parametrize("diff", ['diff', 'download', 'raw'])
     def test_file_full_diff(self, backend, diff):
         commit1 = backend.repo.get_commit(commit_idx=-1)
         commit2 = backend.repo.get_commit(commit_idx=-2)
 
         response = self.app.get(
             route_path('repo_files_diff',
                        repo_name=backend.repo_name,
                        f_path='README'),
             params={
                 'diff1': commit2.raw_id,
                 'diff2': commit1.raw_id,
                 'fulldiff': '1',
                 'diff': diff,
             })
 
         if diff == 'diff':
             # use redirect since this is OLD view redirecting to compare page
             response = response.follow()
 
         # It's a symlink to README.rst
         response.mustcontain('README.rst')
         response.mustcontain('No newline at end of file')
 
     def test_file_binary_diff(self, backend):
         commits = [
             {'message': 'First commit'},
             {'message': 'Commit with binary',
              'added': [nodes.FileNode('file.bin', content='\0BINARY\0')]},
         ]
         repo = backend.create_repo(commits=commits)
 
         response = self.app.get(
             route_path('repo_files_diff',
                        repo_name=backend.repo_name,
                        f_path='file.bin'),
             params={
                 'diff1': repo.get_commit(commit_idx=0).raw_id,
                 'diff2': repo.get_commit(commit_idx=1).raw_id,
                 'fulldiff': '1',
                 'diff': 'diff',
             })
         # use redirect since this is OLD view redirecting to compare page
         response = response.follow()
         response.mustcontain('Collapse 1 commit')
         file_changes = (1, 0, 0)
 
         compare_page = ComparePage(response)
         compare_page.contains_change_summary(*file_changes)
 
         if backend.alias == 'svn':
             response.mustcontain('new file 10644')
             # TODO(marcink): SVN doesn't yet detect binary changes
         else:
             response.mustcontain('new file 100644')
             response.mustcontain('binary diff hidden')
 
     def test_diff_2way(self, backend):
         commit1 = backend.repo.get_commit(commit_idx=-1)
         commit2 = backend.repo.get_commit(commit_idx=-2)
         response = self.app.get(
             route_path('repo_files_diff_2way_redirect',
                        repo_name=backend.repo_name,
                        f_path='README'),
             params={
                 'diff1': commit2.raw_id,
                 'diff2': commit1.raw_id,
             })
         # use redirect since this is OLD view redirecting to compare page
         response = response.follow()
 
         # It's a symlink to README.rst
         response.mustcontain('README.rst')
         response.mustcontain('No newline at end of file')
 
     def test_requires_one_commit_id(self, backend, autologin_user):
         response = self.app.get(
             route_path('repo_files_diff',
                        repo_name=backend.repo_name,
                        f_path='README.rst'),
             status=400)
         response.mustcontain(
             'Need query parameter', 'diff1', 'diff2', 'to generate a diff.')
 
     def test_returns_no_files_if_file_does_not_exist(self, vcsbackend):
         repo = vcsbackend.repo
         response = self.app.get(
             route_path('repo_files_diff',
                        repo_name=repo.name,
                        f_path='does-not-exist-in-any-commit'),
             params={
                 'diff1': repo[0].raw_id,
                 'diff2': repo[1].raw_id
             })
 
         response = response.follow()
         response.mustcontain('No files')
 
     def test_returns_redirect_if_file_not_changed(self, backend):
         commit = backend.repo.get_commit(commit_idx=-1)
         response = self.app.get(
             route_path('repo_files_diff_2way_redirect',
                        repo_name=backend.repo_name,
                        f_path='README'),
             params={
                 'diff1': commit.raw_id,
                 'diff2': commit.raw_id,
             })
 
         response = response.follow()
         response.mustcontain('No files')
         response.mustcontain('No commits in this compare')
 
     def test_supports_diff_to_different_path_svn(self, backend_svn):
         #TODO: check this case
         return
 
         repo = backend_svn['svn-simple-layout'].scm_instance()
         commit_id_1 = '24'
         commit_id_2 = '26'
 
         response = self.app.get(
             route_path('repo_files_diff',
                        repo_name=backend_svn.repo_name,
                        f_path='trunk/example.py'),
             params={
                 'diff1': 'tags/v0.2/example.py@' + commit_id_1,
                 'diff2': commit_id_2,
             })
 
         response = response.follow()
         response.mustcontain(
             # diff contains this
             "Will print out a useful message on invocation.")
 
         # Note: Expecting that we indicate the user what's being compared
         response.mustcontain("trunk/example.py")
         response.mustcontain("tags/v0.2/example.py")
 
     def test_show_rev_redirects_to_svn_path(self, backend_svn):
         #TODO: check this case
         return
 
         repo = backend_svn['svn-simple-layout'].scm_instance()
         commit_id = repo[-1].raw_id
 
         response = self.app.get(
             route_path('repo_files_diff',
                        repo_name=backend_svn.repo_name,
                        f_path='trunk/example.py'),
             params={
                 'diff1': 'branches/argparse/example.py@' + commit_id,
                 'diff2': commit_id,
             },
             status=302)
         response = response.follow()
         assert response.headers['Location'].endswith(
             'svn-svn-simple-layout/files/26/branches/argparse/example.py')
 
     def test_show_rev_and_annotate_redirects_to_svn_path(self, backend_svn):
         #TODO: check this case
         return
 
         repo = backend_svn['svn-simple-layout'].scm_instance()
         commit_id = repo[-1].raw_id
         response = self.app.get(
             route_path('repo_files_diff',
                        repo_name=backend_svn.repo_name,
                        f_path='trunk/example.py'),
             params={
                 'diff1': 'branches/argparse/example.py@' + commit_id,
                 'diff2': commit_id,
                 'show_rev': 'Show at Revision',
                 'annotate': 'true',
             },
             status=302)
         response = response.follow()
         assert response.headers['Location'].endswith(
             'svn-svn-simple-layout/annotate/26/branches/argparse/example.py')
 
 
 @pytest.mark.usefixtures("app", "autologin_user")
 class TestModifyFilesWithWebInterface(object):
 
     def test_add_file_view(self, backend):
         self.app.get(
             route_path('repo_files_add_file',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path='/')
             )
 
     @pytest.mark.xfail_backends("svn", reason="Depends on online editing")
     def test_add_file_into_repo_missing_content(self, backend, csrf_token):
         backend.create_repo()
         filename = 'init.py'
         response = self.app.post(
             route_path('repo_files_create_file',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path='/'),
             params={
                 'content': "",
                 'filename': filename,
                 'csrf_token': csrf_token,
             },
             status=302)
         expected_msg = 'Successfully committed new file `{}`'.format(os.path.join(filename))
         assert_session_flash(response, expected_msg)
 
     def test_add_file_into_repo_missing_filename(self, backend, csrf_token):
         commit_id = backend.repo.get_commit().raw_id
         response = self.app.post(
             route_path('repo_files_create_file',
                        repo_name=backend.repo_name,
                        commit_id=commit_id, f_path='/'),
             params={
                 'content': "foo",
                 'csrf_token': csrf_token,
             },
             status=302)
 
         assert_session_flash(response, 'No filename specified')
 
     def test_add_file_into_repo_errors_and_no_commits(
             self, backend, csrf_token):
         repo = backend.create_repo()
         # Create a file with no filename, it will display an error but
         # the repo has no commits yet
         response = self.app.post(
             route_path('repo_files_create_file',
                        repo_name=repo.repo_name,
                        commit_id='tip', f_path='/'),
             params={
                 'content': "foo",
                 'csrf_token': csrf_token,
             },
             status=302)
 
         assert_session_flash(response, 'No filename specified')
 
         # Not allowed, redirect to the summary
         redirected = response.follow()
         summary_url = h.route_path('repo_summary', repo_name=repo.repo_name)
 
         # As there are no commits, displays the summary page with the error of
         # creating a file with no filename
 
         assert redirected.request.path == summary_url
 
     @pytest.mark.parametrize("filename, clean_filename", [
         ('/abs/foo', 'abs/foo'),
         ('../rel/foo', 'rel/foo'),
         ('file/../foo/foo', 'file/foo/foo'),
     ])
     def test_add_file_into_repo_bad_filenames(self, filename, clean_filename, backend, csrf_token):
         repo = backend.create_repo()
         commit_id = repo.get_commit().raw_id
 
         response = self.app.post(
             route_path('repo_files_create_file',
                        repo_name=repo.repo_name,
                        commit_id=commit_id, f_path='/'),
             params={
                 'content': "foo",
                 'filename': filename,
                 'csrf_token': csrf_token,
             },
             status=302)
 
         expected_msg = 'Successfully committed new file `{}`'.format(clean_filename)
         assert_session_flash(response, expected_msg)
 
     @pytest.mark.parametrize("cnt, filename, content", [
         (1, 'foo.txt', "Content"),
         (2, 'dir/foo.rst', "Content"),
         (3, 'dir/foo-second.rst', "Content"),
         (4, 'rel/dir/foo.bar', "Content"),
     ])
     def test_add_file_into_empty_repo(self, cnt, filename, content, backend, csrf_token):
         repo = backend.create_repo()
         commit_id = repo.get_commit().raw_id
         response = self.app.post(
             route_path('repo_files_create_file',
                        repo_name=repo.repo_name,
                        commit_id=commit_id, f_path='/'),
             params={
                 'content': content,
                 'filename': filename,
                 'csrf_token': csrf_token,
             },
             status=302)
 
         expected_msg = 'Successfully committed new file `{}`'.format(filename)
         assert_session_flash(response, expected_msg)
 
     def test_edit_file_view(self, backend):
         response = self.app.get(
             route_path('repo_files_edit_file',
                        repo_name=backend.repo_name,
                        commit_id=backend.default_head_id,
                        f_path='vcs/nodes.py'),
             status=200)
         response.mustcontain("Module holding everything related to vcs nodes.")
 
     def test_edit_file_view_not_on_branch(self, backend):
         repo = backend.create_repo()
         backend.ensure_file("vcs/nodes.py")
 
         response = self.app.get(
             route_path('repo_files_edit_file',
                        repo_name=repo.repo_name,
                        commit_id='tip',
                        f_path='vcs/nodes.py'),
             status=302)
         assert_session_flash(
             response, 'Cannot modify file. Given commit `tip` is not head of a branch.')
 
     def test_edit_file_view_commit_changes(self, backend, csrf_token):
         repo = backend.create_repo()
         backend.ensure_file("vcs/nodes.py", content="print 'hello'")
 
         response = self.app.post(
             route_path('repo_files_update_file',
                        repo_name=repo.repo_name,
                        commit_id=backend.default_head_id,
                        f_path='vcs/nodes.py'),
             params={
                 'content': "print 'hello world'",
                 'message': 'I committed',
                 'filename': "vcs/nodes.py",
                 'csrf_token': csrf_token,
             },
             status=302)
         assert_session_flash(
             response, 'Successfully committed changes to file `vcs/nodes.py`')
         tip = repo.get_commit(commit_idx=-1)
         assert tip.message == 'I committed'
 
     def test_edit_file_view_commit_changes_default_message(self, backend,
                                                            csrf_token):
         repo = backend.create_repo()
         backend.ensure_file("vcs/nodes.py", content="print 'hello'")
 
         commit_id = (
             backend.default_branch_name or
             backend.repo.scm_instance().commit_ids[-1])
 
         response = self.app.post(
             route_path('repo_files_update_file',
                        repo_name=repo.repo_name,
                        commit_id=commit_id,
                        f_path='vcs/nodes.py'),
             params={
                 'content': "print 'hello world'",
                 'message': '',
                 'filename': "vcs/nodes.py",
                 'csrf_token': csrf_token,
             },
             status=302)
         assert_session_flash(
             response, 'Successfully committed changes to file `vcs/nodes.py`')
         tip = repo.get_commit(commit_idx=-1)
         assert tip.message == 'Edited file vcs/nodes.py via RhodeCode Enterprise'
 
     def test_delete_file_view(self, backend):
         self.app.get(
             route_path('repo_files_remove_file',
                        repo_name=backend.repo_name,
                        commit_id=backend.default_head_id,
                        f_path='vcs/nodes.py'),
             status=200)
 
     def test_delete_file_view_not_on_branch(self, backend):
         repo = backend.create_repo()
         backend.ensure_file('vcs/nodes.py')
 
         response = self.app.get(
             route_path('repo_files_remove_file',
                        repo_name=repo.repo_name,
                        commit_id='tip',
                        f_path='vcs/nodes.py'),
             status=302)
         assert_session_flash(
             response, 'Cannot modify file. Given commit `tip` is not head of a branch.')
 
     def test_delete_file_view_commit_changes(self, backend, csrf_token):
         repo = backend.create_repo()
         backend.ensure_file("vcs/nodes.py")
 
         response = self.app.post(
             route_path('repo_files_delete_file',
                        repo_name=repo.repo_name,
                        commit_id=backend.default_head_id,
                        f_path='vcs/nodes.py'),
             params={
                 'message': 'i commited',
                 'csrf_token': csrf_token,
             },
             status=302)
         assert_session_flash(
             response, 'Successfully deleted file `vcs/nodes.py`')
 
 
 @pytest.mark.usefixtures("app")
 class TestFilesViewOtherCases(object):
 
     def test_access_empty_repo_redirect_to_summary_with_alert_write_perms(
             self, backend_stub, autologin_regular_user, user_regular,
             user_util):
 
         repo = backend_stub.create_repo()
         user_util.grant_user_permission_to_repo(
             repo, user_regular, 'repository.write')
         response = self.app.get(
             route_path('repo_files',
                        repo_name=repo.repo_name,
                        commit_id='tip', f_path='/'))
 
         repo_file_add_url = route_path(
             'repo_files_add_file',
             repo_name=repo.repo_name,
             commit_id=0, f_path='')
 
         assert_session_flash(
             response,
             'There are no files yet. <a class="alert-link" '
             'href="{}">Click here to add a new file.</a>'
             .format(repo_file_add_url))
 
     def test_access_empty_repo_redirect_to_summary_with_alert_no_write_perms(
             self, backend_stub, autologin_regular_user):
         repo = backend_stub.create_repo()
         # init session for anon user
         route_path('repo_summary', repo_name=repo.repo_name)
 
         repo_file_add_url = route_path(
             'repo_files_add_file',
             repo_name=repo.repo_name,
             commit_id=0, f_path='')
 
         response = self.app.get(
             route_path('repo_files',
                        repo_name=repo.repo_name,
                        commit_id='tip', f_path='/'))
 
         assert_session_flash(response, no_=repo_file_add_url)
 
     @pytest.mark.parametrize('file_node', [
         'archive/file.zip',
         'diff/my-file.txt',
         'render.py',
         'render',
         'remove_file',
         'remove_file/to-delete.txt',
     ])
     def test_file_names_equal_to_routes_parts(self, backend, file_node):
         backend.create_repo()
         backend.ensure_file(file_node)
 
         self.app.get(
             route_path('repo_files',
                        repo_name=backend.repo_name,
                        commit_id='tip', f_path=file_node),
             status=200)
 
 
 class TestAdjustFilePathForSvn(object):
     """
     SVN specific adjustments of node history in RepoFilesView.
     """
 
     def test_returns_path_relative_to_matched_reference(self):
         repo = self._repo(branches=['trunk'])
         self.assert_file_adjustment('trunk/file', 'file', repo)
 
     def test_does_not_modify_file_if_no_reference_matches(self):
         repo = self._repo(branches=['trunk'])
         self.assert_file_adjustment('notes/file', 'notes/file', repo)
 
     def test_does_not_adjust_partial_directory_names(self):
         repo = self._repo(branches=['trun'])
         self.assert_file_adjustment('trunk/file', 'trunk/file', repo)
 
     def test_is_robust_to_patterns_which_prefix_other_patterns(self):
         repo = self._repo(branches=['trunk', 'trunk/new', 'trunk/old'])
         self.assert_file_adjustment('trunk/new/file', 'file', repo)
 
     def assert_file_adjustment(self, f_path, expected, repo):
         result = RepoFilesView.adjust_file_path_for_svn(f_path, repo)
         assert result == expected
 
     def _repo(self, branches=None):
         repo = mock.Mock()
         repo.branches = OrderedDict((name, '0') for name in branches or [])
         repo.tags = {}
         return repo

rhodecode/apps/repository/views/repo_files.py

@@ -1,1603 +1,1618 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import itertools
 import logging
 import os
 import shutil
 import tempfile
 import collections
 import urllib
 import pathlib2
 
 from pyramid.httpexceptions import HTTPNotFound, HTTPBadRequest, HTTPFound
 from pyramid.view import view_config
 from pyramid.renderers import render
 from pyramid.response import Response
 
 import rhodecode
 from rhodecode.apps._base import RepoAppView
 
 
 from rhodecode.lib import diffs, helpers as h, rc_cache
 from rhodecode.lib import audit_logger
 from rhodecode.lib.view_utils import parse_path_ref
 from rhodecode.lib.exceptions import NonRelativePathError
 from rhodecode.lib.codeblocks import (
     filenode_as_lines_tokens, filenode_as_annotated_lines_tokens)
 from rhodecode.lib.utils2 import (
     convert_line_endings, detect_mode, safe_str, str2bool, safe_int, sha1, safe_unicode)
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
 from rhodecode.lib.vcs import path as vcspath
 from rhodecode.lib.vcs.backends.base import EmptyCommit
 from rhodecode.lib.vcs.conf import settings
 from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.lib.vcs.exceptions import (
     RepositoryError, CommitDoesNotExistError, EmptyRepositoryError,
     ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError,
     NodeDoesNotExistError, CommitError, NodeError)
 
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.db import Repository
 
 log = logging.getLogger(__name__)
 
 
 class RepoFilesView(RepoAppView):
 
     @staticmethod
     def adjust_file_path_for_svn(f_path, repo):
         """
         Computes the relative path of `f_path`.
 
         This is mainly based on prefix matching of the recognized tags and
         branches in the underlying repository.
         """
         tags_and_branches = itertools.chain(
             repo.branches.iterkeys(),
             repo.tags.iterkeys())
         tags_and_branches = sorted(tags_and_branches, key=len, reverse=True)
 
         for name in tags_and_branches:
             if f_path.startswith('{}/'.format(name)):
                 f_path = vcspath.relpath(f_path, name)
                 break
         return f_path
 
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
         c.rhodecode_repo = self.rhodecode_vcs_repo
         c.enable_downloads = self.db_repo.enable_downloads
         return c
 
     def _ensure_not_locked(self, commit_id='tip'):
         _ = self.request.translate
 
         repo = self.db_repo
         if repo.enable_locking and repo.locked[0]:
             h.flash(_('This repository has been locked by %s on %s')
                     % (h.person_by_id(repo.locked[0]),
                     h.format_date(h.time_to_datetime(repo.locked[1]))),
                     'warning')
             files_url = h.route_path(
                 'repo_files:default_path',
                 repo_name=self.db_repo_name, commit_id=commit_id)
             raise HTTPFound(files_url)
 
     def forbid_non_head(self, is_head, f_path, commit_id='tip', json_mode=False):
         _ = self.request.translate
 
         if not is_head:
             message = _('Cannot modify file. '
                         'Given commit `{}` is not head of a branch.').format(commit_id)
             h.flash(message, category='warning')
 
             if json_mode:
                 return message
 
             files_url = h.route_path(
                 'repo_files', repo_name=self.db_repo_name, commit_id=commit_id,
                 f_path=f_path)
             raise HTTPFound(files_url)
 
     def check_branch_permission(self, branch_name, commit_id='tip', json_mode=False):
         _ = self.request.translate
 
         rule, branch_perm = self._rhodecode_user.get_rule_and_branch_permission(
             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:
                 return message
 
             files_url = h.route_path(
                 'repo_files:default_path', repo_name=self.db_repo_name, commit_id=commit_id)
 
             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(
             'commit_id', default_commit_id)
         f_path = self._get_f_path(self.request.matchdict, default_f_path)
         return commit_id, f_path
 
     def _get_default_encoding(self, c):
         enc_list = getattr(c, 'default_encodings', [])
         return enc_list[0] if enc_list else 'UTF-8'
 
     def _get_commit_or_redirect(self, commit_id, redirect_after=True):
         """
         This is a safe way to get commit. If an error occurs it redirects to
         tip with proper message
 
         :param commit_id: id of commit to fetch
         :param redirect_after: toggle redirection
         """
         _ = self.request.translate
 
         try:
             return self.rhodecode_vcs_repo.get_commit(commit_id)
         except EmptyRepositoryError:
             if not redirect_after:
                 return None
 
             _url = h.route_path(
                 'repo_files_add_file',
                 repo_name=self.db_repo_name, commit_id=0, f_path='')
 
             if h.HasRepoPermissionAny(
                     'repository.write', 'repository.admin')(self.db_repo_name):
                 add_new = h.link_to(
                     _('Click here to add a new file.'), _url, class_="alert-link")
             else:
                 add_new = ""
 
             h.flash(h.literal(
                 _('There are no files yet. %s') % add_new), category='warning')
             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:
             h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPNotFound()
 
     def _get_filenode_or_redirect(self, commit_obj, path):
         """
         Returns file_node, if error occurs or given path is directory,
         it'll redirect to top level path
         """
         _ = self.request.translate
 
         try:
             file_node = commit_obj.get_node(path)
             if file_node.is_dir():
                 raise RepositoryError('The given path is a directory')
         except CommitDoesNotExistError:
             log.exception('No such commit exists for this repository')
             h.flash(_('No such commit exists for this repository'), category='error')
             raise HTTPNotFound()
         except RepositoryError as e:
             log.warning('Repository error while fetching filenode `%s`. Err:%s', path, e)
             h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPNotFound()
 
         return file_node
 
     def _is_valid_head(self, commit_id, repo):
         branch_name = sha_commit_id = ''
         is_head = False
         log.debug('Checking if commit_id `%s` is a head for %s.', commit_id, repo)
 
         for _branch_name, branch_commit_id in repo.branches.items():
             # simple case we pass in branch name, it's a HEAD
             if commit_id == _branch_name:
                 is_head = True
                 branch_name = _branch_name
                 sha_commit_id = branch_commit_id
                 break
             # case when we pass in full sha commit_id, which is a head
             elif commit_id == branch_commit_id:
                 is_head = True
                 branch_name = _branch_name
                 sha_commit_id = branch_commit_id
                 break
 
         if h.is_svn(repo) and not repo.is_empty():
             # Note: Subversion only has one head.
             if commit_id == repo.get_commit(commit_idx=-1).raw_id:
                 is_head = True
                 return branch_name, sha_commit_id, is_head
 
         # checked branches, means we only need to try to get the branch/commit_sha
         if not repo.is_empty():
             commit = repo.get_commit(commit_id=commit_id)
             if commit:
                 branch_name = commit.branch
                 sha_commit_id = commit.raw_id
 
         return branch_name, sha_commit_id, is_head
 
     def _get_tree_at_commit(self, c, commit_id, f_path, full_load=False, at_rev=None):
 
         repo_id = self.db_repo.repo_id
         force_recache = self.get_recache_flag()
 
         cache_seconds = safe_int(
             rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
         cache_on = not force_recache and cache_seconds > 0
         log.debug(
             'Computing FILE TREE for repo_id %s commit_id `%s` and path `%s`'
             'with caching: %s[TTL: %ss]' % (
                 repo_id, commit_id, f_path, cache_on, cache_seconds or 0))
 
         cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
         region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=cache_on)
         def compute_file_tree(ver, _name_hash, _repo_id, _commit_id, _f_path, _full_load, _at_rev):
             log.debug('Generating cached file tree at ver:%s for repo_id: %s, %s, %s',
                       ver, _repo_id, _commit_id, _f_path)
 
             c.full_load = _full_load
             return render(
                 'rhodecode:templates/files/files_browser_tree.mako',
                 self._get_template_context(c), self.request, _at_rev)
 
         return compute_file_tree(
             rc_cache.FILE_TREE_CACHE_VER, self.db_repo.repo_name_hash,
             self.db_repo.repo_id, commit_id, f_path, full_load, at_rev)
 
     def _get_archive_spec(self, fname):
         log.debug('Detecting archive spec for: `%s`', fname)
 
         fileformat = None
         ext = None
         content_type = None
         for a_type, content_type, extension in settings.ARCHIVE_SPECS:
 
             if fname.endswith(extension):
                 fileformat = a_type
                 log.debug('archive is of type: %s', fileformat)
                 ext = extension
                 break
 
         if not fileformat:
             raise ValueError()
 
         # left over part of whole fname is the commit
         commit_id = fname[:-len(ext)]
 
         return commit_id, ext, fileformat, content_type
 
     def create_pure_path(self, *parts):
         # Split paths and sanitize them, removing any ../ etc
         sanitized_path = [
             x for x in pathlib2.PurePath(*parts).parts
             if x not in ['.', '..']]
 
         pure_path = pathlib2.PurePath(*sanitized_path)
         return pure_path
 
     def _is_lf_enabled(self, target_repo):
         lf_enabled = False
 
         lf_key_for_vcs_map = {
             'hg': 'extensions_largefiles',
             'git': 'vcs_git_lfs_enabled'
         }
 
         lf_key_for_vcs = lf_key_for_vcs_map.get(target_repo.repo_type)
 
         if lf_key_for_vcs:
             lf_enabled = self._get_repo_setting(target_repo, lf_key_for_vcs)
 
         return lf_enabled
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_archivefile', request_method='GET',
         renderer=None)
     def repo_archivefile(self):
         # archive cache config
         from rhodecode import CONFIG
         _ = self.request.translate
         self.load_default_context()
         default_at_path = '/'
         fname = self.request.matchdict['fname']
         subrepos = self.request.GET.get('subrepos') == 'true'
         at_path = self.request.GET.get('at_path') or default_at_path
 
         if not self.db_repo.enable_downloads:
             return Response(_('Downloads disabled'))
 
         try:
             commit_id, ext, fileformat, content_type = \
                 self._get_archive_spec(fname)
         except ValueError:
             return Response(_('Unknown archive type for: `{}`').format(
                 h.escape(fname)))
 
         try:
             commit = self.rhodecode_vcs_repo.get_commit(commit_id)
         except CommitDoesNotExistError:
             return Response(_('Unknown commit_id {}').format(
                 h.escape(commit_id)))
         except EmptyRepositoryError:
             return Response(_('Empty repository'))
 
         try:
             at_path = commit.get_node(at_path).path or default_at_path
         except Exception:
             return Response(_('No node at path {} for this repository').format(at_path))
 
         path_sha = sha1(at_path)[:8]
 
         # original backward compat name of archive
         clean_name = safe_str(self.db_repo_name.replace('/', '_'))
         short_sha = safe_str(commit.short_id)
 
         if at_path == default_at_path:
             archive_name = '{}-{}{}{}'.format(
                 clean_name,
                 '-sub' if subrepos else '',
                 short_sha,
                 ext)
         # custom path and new name
         else:
             archive_name = '{}-{}{}-{}{}'.format(
                 clean_name,
                 '-sub' if subrepos else '',
                 short_sha,
                 path_sha,
                 ext)
 
         use_cached_archive = False
         archive_cache_enabled = CONFIG.get(
             'archive_cache_dir') and not self.request.GET.get('no_cache')
         cached_archive_path = None
 
         if archive_cache_enabled:
             # check if we it's ok to write
             if not os.path.isdir(CONFIG['archive_cache_dir']):
                 os.makedirs(CONFIG['archive_cache_dir'])
             cached_archive_path = os.path.join(
                 CONFIG['archive_cache_dir'], archive_name)
             if os.path.isfile(cached_archive_path):
                 log.debug('Found cached archive in %s', cached_archive_path)
                 fd, archive = None, cached_archive_path
                 use_cached_archive = True
             else:
                 log.debug('Archive %s is not yet cached', archive_name)
 
         if not use_cached_archive:
             # generate new archive
             fd, archive = tempfile.mkstemp()
             log.debug('Creating new temp archive in %s', archive)
             try:
                 commit.archive_repo(archive, kind=fileformat, subrepos=subrepos,
                                     archive_at_path=at_path)
             except ImproperArchiveTypeError:
                 return _('Unknown archive type')
             if archive_cache_enabled:
                 # if we generated the archive and we have cache enabled
                 # let's use this for future
                 log.debug('Storing new archive in %s', cached_archive_path)
                 shutil.move(archive, cached_archive_path)
                 archive = cached_archive_path
 
         # store download action
         audit_logger.store_web(
             'repo.archive.download', action_data={
                 'user_agent': self.request.user_agent,
                 'archive_name': archive_name,
                 'archive_spec': fname,
                 'archive_cached': use_cached_archive},
             user=self._rhodecode_user,
             repo=self.db_repo,
             commit=True
         )
 
         def get_chunked_archive(archive_path):
             with open(archive_path, 'rb') as stream:
                 while True:
                     data = stream.read(16 * 1024)
                     if not data:
                         if fd:  # fd means we used temporary file
                             os.close(fd)
                         if not archive_cache_enabled:
                             log.debug('Destroying temp archive %s', archive_path)
                             os.remove(archive_path)
                         break
                     yield data
 
         response = Response(app_iter=get_chunked_archive(archive))
         response.content_disposition = str(
             'attachment; filename=%s' % archive_name)
         response.content_type = str(content_type)
 
         return response
 
     def _get_file_node(self, commit_id, f_path):
         if commit_id not in ['', None, 'None', '0' * 12, '0' * 40]:
             commit = self.rhodecode_vcs_repo.get_commit(commit_id=commit_id)
             try:
                 node = commit.get_node(f_path)
                 if node.is_dir():
                     raise NodeError('%s path is a %s not a file'
                                     % (node, type(node)))
             except NodeDoesNotExistError:
                 commit = EmptyCommit(
                     commit_id=commit_id,
                     idx=commit.idx,
                     repo=commit.repository,
                     alias=commit.repository.alias,
                     message=commit.message,
                     author=commit.author,
                     date=commit.date)
                 node = FileNode(f_path, '', commit=commit)
         else:
             commit = EmptyCommit(
                 repo=self.rhodecode_vcs_repo,
                 alias=self.rhodecode_vcs_repo.alias)
             node = FileNode(f_path, '', commit=commit)
         return node
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_diff', request_method='GET',
         renderer=None)
     def repo_files_diff(self):
         c = self.load_default_context()
         f_path = self._get_f_path(self.request.matchdict)
         diff1 = self.request.GET.get('diff1', '')
         diff2 = self.request.GET.get('diff2', '')
 
         path1, diff1 = parse_path_ref(diff1, default_path=f_path)
 
         ignore_whitespace = str2bool(self.request.GET.get('ignorews'))
         line_context = self.request.GET.get('context', 3)
 
         if not any((diff1, diff2)):
             h.flash(
                 'Need query parameter "diff1" or "diff2" to generate a diff.',
                 category='error')
             raise HTTPBadRequest()
 
         c.action = self.request.GET.get('diff')
         if c.action not in ['download', 'raw']:
             compare_url = h.route_path(
                 'repo_compare',
                 repo_name=self.db_repo_name,
                 source_ref_type='rev',
                 source_ref=diff1,
                 target_repo=self.db_repo_name,
                 target_ref_type='rev',
                 target_ref=diff2,
                 _query=dict(f_path=f_path))
             # redirect to new view if we render diff
             raise HTTPFound(compare_url)
 
         try:
             node1 = self._get_file_node(diff1, path1)
             node2 = self._get_file_node(diff2, f_path)
         except (RepositoryError, NodeError):
             log.exception("Exception while trying to get node from repository")
             raise HTTPFound(
                 h.route_path('repo_files', repo_name=self.db_repo_name,
                              commit_id='tip', f_path=f_path))
 
         if all(isinstance(node.commit, EmptyCommit)
                for node in (node1, node2)):
             raise HTTPNotFound()
 
         c.commit_1 = node1.commit
         c.commit_2 = node2.commit
 
         if c.action == 'download':
             _diff = diffs.get_gitdiff(node1, node2,
                                       ignore_whitespace=ignore_whitespace,
                                       context=line_context)
             diff = diffs.DiffProcessor(_diff, format='gitdiff')
 
             response = Response(self.path_filter.get_raw_patch(diff))
             response.content_type = 'text/plain'
             response.content_disposition = (
                 'attachment; filename=%s_%s_vs_%s.diff' % (f_path, diff1, diff2)
             )
             charset = self._get_default_encoding(c)
             if charset:
                 response.charset = charset
             return response
 
         elif c.action == 'raw':
             _diff = diffs.get_gitdiff(node1, node2,
                                       ignore_whitespace=ignore_whitespace,
                                       context=line_context)
             diff = diffs.DiffProcessor(_diff, format='gitdiff')
 
             response = Response(self.path_filter.get_raw_patch(diff))
             response.content_type = 'text/plain'
             charset = self._get_default_encoding(c)
             if charset:
                 response.charset = charset
             return response
 
         # in case we ever end up here
         raise HTTPNotFound()
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_diff_2way_redirect', request_method='GET',
         renderer=None)
     def repo_files_diff_2way_redirect(self):
         """
         Kept only to make OLD links work
         """
         f_path = self._get_f_path_unchecked(self.request.matchdict)
         diff1 = self.request.GET.get('diff1', '')
         diff2 = self.request.GET.get('diff2', '')
 
         if not any((diff1, diff2)):
             h.flash(
                 'Need query parameter "diff1" or "diff2" to generate a diff.',
                 category='error')
             raise HTTPBadRequest()
 
         compare_url = h.route_path(
             'repo_compare',
             repo_name=self.db_repo_name,
             source_ref_type='rev',
             source_ref=diff1,
             target_ref_type='rev',
             target_ref=diff2,
             _query=dict(f_path=f_path, diffmode='sideside',
                         target_repo=self.db_repo_name,))
         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(
         route_name='repo_files', request_method='GET',
         renderer=None)
     @view_config(
         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(
         route_name='repo_files:annotated', request_method='GET',
         renderer=None)
     def repo_files(self):
         c = self.load_default_context()
 
         view_name = getattr(self.request.matched_route, 'name', None)
 
         c.annotate = view_name == 'repo_files:annotated'
         # default is false, but .rst/.md files later are auto rendered, we can
         # overwrite auto rendering by setting this GET flag
         c.renderer = view_name == 'repo_files:rendered' or \
                         not self.request.GET.get('no-render', False)
 
         commit_id, f_path = self._get_commit_and_path()
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.branch = self.request.GET.get('branch', None)
         c.f_path = f_path
         at_rev = self.request.GET.get('at')
 
         # prev link
         try:
             prev_commit = c.commit.prev(c.branch)
             c.prev_commit = prev_commit
             c.url_prev = h.route_path(
                 'repo_files', repo_name=self.db_repo_name,
                 commit_id=prev_commit.raw_id, f_path=f_path)
             if c.branch:
                 c.url_prev += '?branch=%s' % c.branch
         except (CommitDoesNotExistError, VCSError):
             c.url_prev = '#'
             c.prev_commit = EmptyCommit()
 
         # next link
         try:
             next_commit = c.commit.next(c.branch)
             c.next_commit = next_commit
             c.url_next = h.route_path(
                 'repo_files', repo_name=self.db_repo_name,
                 commit_id=next_commit.raw_id, f_path=f_path)
             if c.branch:
                 c.url_next += '?branch=%s' % c.branch
         except (CommitDoesNotExistError, VCSError):
             c.url_next = '#'
             c.next_commit = EmptyCommit()
 
         # files or dirs
         try:
             c.file = c.commit.get_node(f_path)
             c.file_author = True
             c.file_tree = ''
 
             # load file content
             if c.file.is_file():
                 c.lf_node = {}
 
                 has_lf_enabled = self._is_lf_enabled(self.db_repo)
                 if has_lf_enabled:
                     c.lf_node = c.file.get_largefile_node()
 
                 c.file_source_page = 'true'
                 c.file_last_commit = c.file.last_commit
 
                 c.file_size_too_big = c.file.size > c.visual.cut_off_limit_file
 
                 if not (c.file_size_too_big or c.file.is_binary):
                     if c.annotate:  # annotation has precedence over renderer
                         c.annotated_lines = filenode_as_annotated_lines_tokens(
                             c.file
                         )
                     else:
                         c.renderer = (
                             c.renderer and h.renderer_from_filename(c.file.path)
                         )
                         if not c.renderer:
                             c.lines = filenode_as_lines_tokens(c.file)
 
                 _branch_name, _sha_commit_id, is_head = self._is_valid_head(
                     commit_id, self.rhodecode_vcs_repo)
                 c.on_branch_head = is_head
 
                 branch = c.commit.branch if (
                     c.commit.branch and '/' not in c.commit.branch) else None
                 c.branch_or_raw_id = branch or c.commit.raw_id
                 c.branch_name = c.commit.branch or h.short_id(c.commit.raw_id)
 
                 author = c.file_last_commit.author
                 c.authors = [[
                     h.email(author),
                     h.person(author, 'username_or_name_or_email'),
                     1
                 ]]
 
             else:  # load tree content at path
                 c.file_source_page = 'false'
                 c.authors = []
                 # this loads a simple tree without metadata to speed things up
                 # later via ajax we call repo_nodetree_full and fetch whole
                 c.file_tree = self._get_tree_at_commit(c, c.commit.raw_id, f_path, at_rev=at_rev)
 
                 c.readme_data, c.readme_file = \
                     self._get_readme_data(self.db_repo, c.visual.default_renderer,
                                           c.commit.raw_id, f_path)
 
         except RepositoryError as e:
             h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPNotFound()
 
         if self.request.environ.get('HTTP_X_PJAX'):
             html = render('rhodecode:templates/files/files_pjax.mako',
                           self._get_template_context(c), self.request)
         else:
             html = render('rhodecode:templates/files/files.mako',
                           self._get_template_context(c), self.request)
         return Response(html)
 
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files:annotated_previous', request_method='GET',
         renderer=None)
     def repo_files_annotated_previous(self):
         self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         prev_commit_id = commit.raw_id
         line_anchor = self.request.GET.get('line_anchor')
         is_file = False
         try:
             _file = commit.get_node(f_path)
             is_file = _file.is_file()
         except (NodeDoesNotExistError, CommitDoesNotExistError, VCSError):
             pass
 
         if is_file:
             history = commit.get_path_history(f_path)
             prev_commit_id = history[1].raw_id \
                 if len(history) > 1 else prev_commit_id
         prev_url = h.route_path(
             'repo_files:annotated', repo_name=self.db_repo_name,
             commit_id=prev_commit_id, f_path=f_path,
             _anchor='L{}'.format(line_anchor))
 
         raise HTTPFound(prev_url)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_nodetree_full', request_method='GET',
         renderer=None, xhr=True)
     @view_config(
         route_name='repo_nodetree_full:default_path', request_method='GET',
         renderer=None, xhr=True)
     def repo_nodetree_full(self):
         """
         Returns rendered html of file tree that contains commit date,
         author, commit_id for the specified combination of
         repo, commit_id and file path
         """
         c = self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         try:
             dir_node = commit.get_node(f_path)
         except RepositoryError as e:
             return Response('error: {}'.format(h.escape(safe_str(e))))
 
         if dir_node.is_file():
             return Response('')
 
         c.file = dir_node
         c.commit = commit
         at_rev = self.request.GET.get('at')
 
         html = self._get_tree_at_commit(
             c, commit.raw_id, dir_node.path, full_load=True, at_rev=at_rev)
 
         return Response(html)
 
     def _get_attachement_headers(self, f_path):
         f_name = safe_str(f_path.split(Repository.NAME_SEP)[-1])
         safe_path = f_name.replace('"', '\\"')
         encoded_path = urllib.quote(f_name)
 
         return "attachment; " \
                "filename=\"{}\"; " \
                "filename*=UTF-8\'\'{}".format(safe_path, encoded_path)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_file_raw', request_method='GET',
         renderer=None)
     def repo_file_raw(self):
         """
         Action for show as raw, some mimetypes are "rendered",
         those include images, icons.
         """
         c = self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         file_node = self._get_filenode_or_redirect(commit, f_path)
 
         raw_mimetype_mapping = {
             # map original mimetype to a mimetype used for "show as raw"
             # you can also provide a content-disposition to override the
             # default "attachment" disposition.
             # orig_type: (new_type, new_dispo)
 
             # show images inline:
             # Do not re-add SVG: it is unsafe and permits XSS attacks. One can
             # for example render an SVG with javascript inside or even render
             # HTML.
             'image/x-icon': ('image/x-icon', 'inline'),
             'image/png': ('image/png', 'inline'),
             'image/gif': ('image/gif', 'inline'),
             'image/jpeg': ('image/jpeg', 'inline'),
             'application/pdf': ('application/pdf', 'inline'),
         }
 
         mimetype = file_node.mimetype
         try:
             mimetype, disposition = raw_mimetype_mapping[mimetype]
         except KeyError:
             # we don't know anything special about this, handle it safely
             if file_node.is_binary:
                 # do same as download raw for binary files
                 mimetype, disposition = 'application/octet-stream', 'attachment'
             else:
                 # do not just use the original mimetype, but force text/plain,
                 # otherwise it would serve text/html and that might be unsafe.
                 # Note: underlying vcs library fakes text/plain mimetype if the
                 # mimetype can not be determined and it thinks it is not
                 # binary.This might lead to erroneous text display in some
                 # cases, but helps in other cases, like with text files
                 # without extension.
                 mimetype, disposition = 'text/plain', 'inline'
 
         if disposition == 'attachment':
             disposition = self._get_attachement_headers(f_path)
 
         stream_content = file_node.stream_bytes()
 
         response = Response(app_iter=stream_content)
         response.content_disposition = disposition
         response.content_type = mimetype
 
         charset = self._get_default_encoding(c)
         if charset:
             response.charset = charset
 
         return response
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_file_download', request_method='GET',
         renderer=None)
     @view_config(
         route_name='repo_file_download:legacy', request_method='GET',
         renderer=None)
     def repo_file_download(self):
         c = self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         file_node = self._get_filenode_or_redirect(commit, f_path)
 
         if self.request.GET.get('lf'):
             # only if lf get flag is passed, we download this file
             # as LFS/Largefile
             lf_node = file_node.get_largefile_node()
             if lf_node:
                 # overwrite our pointer with the REAL large-file
                 file_node = lf_node
 
         disposition = self._get_attachement_headers(f_path)
 
         stream_content = file_node.stream_bytes()
 
         response = Response(app_iter=stream_content)
         response.content_disposition = disposition
         response.content_type = file_node.mimetype
 
         charset = self._get_default_encoding(c)
         if charset:
             response.charset = charset
 
         return response
 
     def _get_nodelist_at_commit(self, repo_name, repo_id, commit_id, f_path):
 
         cache_seconds = safe_int(
             rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
         cache_on = cache_seconds > 0
         log.debug(
             'Computing FILE SEARCH for repo_id %s commit_id `%s` and path `%s`'
             'with caching: %s[TTL: %ss]' % (
                 repo_id, commit_id, f_path, cache_on, cache_seconds or 0))
 
         cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
         region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=cache_on)
         def compute_file_search(_name_hash, _repo_id, _commit_id, _f_path):
             log.debug('Generating cached nodelist for repo_id:%s, %s, %s',
                       _repo_id, commit_id, f_path)
             try:
                 _d, _f = ScmModel().get_quick_filter_nodes(repo_name, _commit_id, _f_path)
             except (RepositoryError, CommitDoesNotExistError, Exception) as e:
                 log.exception(safe_str(e))
                 h.flash(safe_str(h.escape(e)), category='error')
                 raise HTTPFound(h.route_path(
                     'repo_files', repo_name=self.db_repo_name,
                     commit_id='tip', f_path='/'))
 
             return _d + _f
 
         result = compute_file_search(self.db_repo.repo_name_hash, self.db_repo.repo_id,
                                      commit_id, f_path)
         return filter(lambda n: self.path_filter.path_access_allowed(n['name']), result)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_nodelist', request_method='GET',
         renderer='json_ext', xhr=True)
     def repo_nodelist(self):
         self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
 
         metadata = self._get_nodelist_at_commit(
             self.db_repo_name, self.db_repo.repo_id, commit.raw_id, f_path)
         return {'nodes': metadata}
 
     def _create_references(self, branches_or_tags, symbolic_reference, f_path, ref_type):
         items = []
         for name, commit_id in branches_or_tags.items():
             sym_ref = symbolic_reference(commit_id, name, f_path, ref_type)
             items.append((sym_ref, name, ref_type))
         return items
 
     def _symbolic_reference(self, commit_id, name, f_path, ref_type):
         return commit_id
 
     def _symbolic_reference_svn(self, commit_id, name, f_path, ref_type):
         return commit_id
 
         # NOTE(dan): old code we used in "diff" mode compare
         new_f_path = vcspath.join(name, f_path)
         return u'%s@%s' % (new_f_path, commit_id)
 
     def _get_node_history(self, commit_obj, f_path, commits=None):
         """
         get commit history for given node
 
         :param commit_obj: commit to calculate history
         :param f_path: path for node to calculate history for
         :param commits: if passed don't calculate history and take
             commits defined in this list
         """
         _ = self.request.translate
 
         # calculate history based on tip
         tip = self.rhodecode_vcs_repo.get_commit()
         if commits is None:
             pre_load = ["author", "branch"]
             try:
                 commits = tip.get_path_history(f_path, pre_load=pre_load)
             except (NodeDoesNotExistError, CommitError):
                 # this node is not present at tip!
                 commits = commit_obj.get_path_history(f_path, pre_load=pre_load)
 
         history = []
         commits_group = ([], _("Changesets"))
         for commit in commits:
             branch = ' (%s)' % commit.branch if commit.branch else ''
             n_desc = 'r%s:%s%s' % (commit.idx, commit.short_id, branch)
             commits_group[0].append((commit.raw_id, n_desc, 'sha'))
         history.append(commits_group)
 
         symbolic_reference = self._symbolic_reference
 
         if self.rhodecode_vcs_repo.alias == 'svn':
             adjusted_f_path = RepoFilesView.adjust_file_path_for_svn(
                 f_path, self.rhodecode_vcs_repo)
             if adjusted_f_path != f_path:
                 log.debug(
                     'Recognized svn tag or branch in file "%s", using svn '
                     'specific symbolic references', f_path)
                 f_path = adjusted_f_path
                 symbolic_reference = self._symbolic_reference_svn
 
         branches = self._create_references(
             self.rhodecode_vcs_repo.branches, symbolic_reference, f_path, 'branch')
         branches_group = (branches, _("Branches"))
 
         tags = self._create_references(
             self.rhodecode_vcs_repo.tags, symbolic_reference, f_path, 'tag')
         tags_group = (tags, _("Tags"))
 
         history.append(branches_group)
         history.append(tags_group)
 
         return history, commits
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_file_history', request_method='GET',
         renderer='json_ext')
     def repo_file_history(self):
         self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         file_node = self._get_filenode_or_redirect(commit, f_path)
 
         if file_node.is_file():
             file_history, _hist = self._get_node_history(commit, f_path)
 
             res = []
             for section_items, section in file_history:
                 items = []
                 for obj_id, obj_text, obj_type in section_items:
                     at_rev = ''
                     if obj_type in ['branch', 'bookmark', 'tag']:
                         at_rev = obj_text
                     entry = {
                         'id': obj_id,
                         'text': obj_text,
                         'type': obj_type,
                         'at_rev': at_rev
                     }
 
                     items.append(entry)
 
                 res.append({
                     'text': section,
                     'children': items
                 })
 
             data = {
                 'more': False,
                 'results': res
             }
             return data
 
         log.warning('Cannot fetch history for directory')
         raise HTTPBadRequest()
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_file_authors', request_method='GET',
         renderer='rhodecode:templates/files/file_authors_box.mako')
     def repo_file_authors(self):
         c = self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         file_node = self._get_filenode_or_redirect(commit, f_path)
 
         if not file_node.is_file():
             raise HTTPBadRequest()
 
         c.file_last_commit = file_node.last_commit
         if self.request.GET.get('annotate') == '1':
             # use _hist from annotation if annotation mode is on
             commit_ids = set(x[1] for x in file_node.annotate)
             _hist = (
                 self.rhodecode_vcs_repo.get_commit(commit_id)
                 for commit_id in commit_ids)
         else:
             _f_history, _hist = self._get_node_history(commit, f_path)
         c.file_author = False
 
         unique = collections.OrderedDict()
         for commit in _hist:
             author = commit.author
             if author not in unique:
                 unique[commit.author] = [
                     h.email(author),
                     h.person(author, 'username_or_name_or_email'),
                     1  # counter
                 ]
 
             else:
                 # increase counter
                 unique[commit.author][2] += 1
 
         c.authors = [val for val in unique.values()]
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_check_head', request_method='POST',
         renderer='json_ext', xhr=True)
     def repo_files_check_head(self):
         self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         _branch_name, _sha_commit_id, is_head = \
             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
         new_path = self.request.POST.get('path')
         operation = self.request.POST.get('operation')
         path_exist = ''
 
         if new_path and operation in ['create', 'upload']:
             new_f_path = os.path.join(f_path.lstrip('/'), new_path)
             try:
                 commit_obj = self.rhodecode_vcs_repo.get_commit(commit_id)
                 # NOTE(dan): construct whole path without leading /
                 file_node = commit_obj.get_node(new_f_path)
                 if file_node is not None:
                     path_exist = new_f_path
             except EmptyRepositoryError:
                 pass
             except Exception:
                 pass
 
         return {
             'branch': _branch_name,
             'sha': _sha_commit_id,
             'is_head': is_head,
             'path_exists': path_exist
         }
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_remove_file', request_method='GET',
         renderer='rhodecode:templates/files/files_delete.mako')
     def repo_files_remove_file(self):
         _ = self.request.translate
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
         _branch_name, _sha_commit_id, is_head = \
             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
         self.forbid_non_head(is_head, f_path)
         self.check_branch_permission(_branch_name)
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
         c.default_message = _(
             'Deleted file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='repo_files_delete_file', request_method='POST',
         renderer=None)
     def repo_files_delete_file(self):
         _ = self.request.translate
 
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
         _branch_name, _sha_commit_id, is_head = \
             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
         self.forbid_non_head(is_head, f_path)
         self.check_branch_permission(_branch_name)
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
         c.default_message = _(
             'Deleted file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
         node_path = f_path
         author = self._rhodecode_db_user.full_contact
         message = self.request.POST.get('message') or c.default_message
         try:
             nodes = {
                 node_path: {
                     'content': ''
                 }
             }
             ScmModel().delete_nodes(
                 user=self._rhodecode_db_user.user_id, repo=self.db_repo,
                 message=message,
                 nodes=nodes,
                 parent_commit=c.commit,
                 author=author,
             )
 
             h.flash(
                 _('Successfully deleted file `{}`').format(
                     h.escape(f_path)), category='success')
         except Exception:
             log.exception('Error during commit operation')
             h.flash(_('Error occurred during commit'), category='error')
         raise HTTPFound(
             h.route_path('repo_commit', repo_name=self.db_repo_name,
                          commit_id='tip'))
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_edit_file', request_method='GET',
         renderer='rhodecode:templates/files/files_edit.mako')
     def repo_files_edit_file(self):
         _ = self.request.translate
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
         _branch_name, _sha_commit_id, is_head = \
             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
         self.forbid_non_head(is_head, f_path, commit_id=commit_id)
         self.check_branch_permission(_branch_name, commit_id=commit_id)
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
         if c.file.is_binary:
             files_url = h.route_path(
                 'repo_files',
                 repo_name=self.db_repo_name,
                 commit_id=c.commit.raw_id, f_path=f_path)
             raise HTTPFound(files_url)
 
         c.default_message = _('Edited file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='repo_files_update_file', request_method='POST',
         renderer=None)
     def repo_files_update_file(self):
         _ = self.request.translate
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
         if c.file.is_binary:
             raise HTTPFound(h.route_path('repo_files', repo_name=self.db_repo_name,
                                          commit_id=c.commit.raw_id, f_path=f_path))
 
         _branch_name, _sha_commit_id, is_head = \
             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
         self.forbid_non_head(is_head, f_path, commit_id=commit_id)
         self.check_branch_permission(_branch_name, commit_id=commit_id)
 
         c.default_message = _('Edited file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
 
         old_content = c.file.content
         sl = old_content.splitlines(1)
         first_line = sl[0] if sl else ''
 
         r_post = self.request.POST
         # line endings:  0 - Unix, 1 - Mac, 2 - DOS
         line_ending_mode = detect_mode(first_line, 0)
         content = convert_line_endings(r_post.get('content', ''), line_ending_mode)
 
         message = r_post.get('message') or c.default_message
         org_node_path = c.file.unicode_path
         filename = r_post['filename']
 
         root_path = c.file.dir_path
         pure_path = self.create_pure_path(root_path, filename)
         node_path = safe_unicode(bytes(pure_path))
 
         default_redirect_url = h.route_path('repo_commit', repo_name=self.db_repo_name,
                                             commit_id=commit_id)
         if content == old_content and node_path == org_node_path:
             h.flash(_('No changes detected on {}').format(h.escape(org_node_path)),
                     category='warning')
             raise HTTPFound(default_redirect_url)
 
         try:
             mapping = {
                 org_node_path: {
                     'org_filename': org_node_path,
                     'filename': node_path,
                     'content': content,
                     'lexer': '',
                     'op': 'mod',
                     'mode': c.file.mode
                 }
             }
 
             commit = ScmModel().update_nodes(
                 user=self._rhodecode_db_user.user_id,
                 repo=self.db_repo,
                 message=message,
                 nodes=mapping,
                 parent_commit=c.commit,
             )
 
             h.flash(_('Successfully committed changes to file `{}`').format(
                     h.escape(f_path)), category='success')
             default_redirect_url = h.route_path(
                 'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
 
         except Exception:
             log.exception('Error occurred during commit')
             h.flash(_('Error occurred during commit'), category='error')
 
         raise HTTPFound(default_redirect_url)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_add_file', request_method='GET',
         renderer='rhodecode:templates/files/files_add.mako')
     @view_config(
         route_name='repo_files_upload_file', request_method='GET',
         renderer='rhodecode:templates/files/files_upload.mako')
     def repo_files_add_file(self):
         _ = self.request.translate
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
         c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
         if c.commit is None:
             c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
 
         if self.rhodecode_vcs_repo.is_empty():
             # for empty repository we cannot check for current branch, we rely on
             # c.commit.branch instead
             _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
         else:
             _branch_name, _sha_commit_id, is_head = \
                 self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
         self.forbid_non_head(is_head, f_path, commit_id=commit_id)
         self.check_branch_permission(_branch_name, commit_id=commit_id)
 
         c.default_message = (_('Added file via RhodeCode Enterprise'))
         c.f_path = f_path.lstrip('/')  # ensure not relative path
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='repo_files_create_file', request_method='POST',
         renderer=None)
     def repo_files_create_file(self):
         _ = self.request.translate
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
         c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
         if c.commit is None:
             c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
 
         # calculate redirect URL
         if self.rhodecode_vcs_repo.is_empty():
             default_redirect_url = h.route_path(
                 'repo_summary', repo_name=self.db_repo_name)
         else:
             default_redirect_url = h.route_path(
                 'repo_commit', repo_name=self.db_repo_name, commit_id='tip')
 
         if self.rhodecode_vcs_repo.is_empty():
             # for empty repository we cannot check for current branch, we rely on
             # c.commit.branch instead
             _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
         else:
             _branch_name, _sha_commit_id, is_head = \
                 self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
         self.forbid_non_head(is_head, f_path, commit_id=commit_id)
         self.check_branch_permission(_branch_name, commit_id=commit_id)
 
         c.default_message = (_('Added file via RhodeCode Enterprise'))
         c.f_path = f_path
 
         r_post = self.request.POST
         message = r_post.get('message') or c.default_message
         filename = r_post.get('filename')
         unix_mode = 0
         content = convert_line_endings(r_post.get('content', ''), unix_mode)
 
         if not filename:
             # If there's no commit, redirect to repo summary
             if type(c.commit) is EmptyCommit:
                 redirect_url = h.route_path(
                     'repo_summary', repo_name=self.db_repo_name)
             else:
                 redirect_url = default_redirect_url
             h.flash(_('No filename specified'), category='warning')
             raise HTTPFound(redirect_url)
 
         root_path = f_path
         pure_path = self.create_pure_path(root_path, filename)
         node_path = safe_unicode(bytes(pure_path).lstrip('/'))
 
         author = self._rhodecode_db_user.full_contact
         nodes = {
             node_path: {
                 'content': content
             }
         }
 
         try:
 
             commit = ScmModel().create_nodes(
                 user=self._rhodecode_db_user.user_id,
                 repo=self.db_repo,
                 message=message,
                 nodes=nodes,
                 parent_commit=c.commit,
                 author=author,
             )
 
             h.flash(_('Successfully committed new file `{}`').format(
                     h.escape(node_path)), category='success')
 
             default_redirect_url = h.route_path(
                 'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
 
         except NonRelativePathError:
             log.exception('Non Relative path found')
             h.flash(_('The location specified must be a relative path and must not '
                       'contain .. in the path'), category='warning')
             raise HTTPFound(default_redirect_url)
         except (NodeError, NodeAlreadyExistsError) as e:
             h.flash(_(h.escape(e)), category='error')
         except Exception:
             log.exception('Error occurred during commit')
             h.flash(_('Error occurred during commit'), category='error')
 
         raise HTTPFound(default_redirect_url)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='repo_files_upload_file', request_method='POST',
         renderer='json_ext')
     def repo_files_upload_file(self):
         _ = self.request.translate
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
         c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
         if c.commit is None:
             c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
 
         # calculate redirect URL
         if self.rhodecode_vcs_repo.is_empty():
             default_redirect_url = h.route_path(
                 'repo_summary', repo_name=self.db_repo_name)
         else:
             default_redirect_url = h.route_path(
                 'repo_commit', repo_name=self.db_repo_name, commit_id='tip')
 
         if self.rhodecode_vcs_repo.is_empty():
             # for empty repository we cannot check for current branch, we rely on
             # c.commit.branch instead
             _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
         else:
             _branch_name, _sha_commit_id, is_head = \
                 self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
         error = self.forbid_non_head(is_head, f_path, json_mode=True)
         if error:
             return {
                 'error': error,
                 'redirect_url': default_redirect_url
             }
         error = self.check_branch_permission(_branch_name, json_mode=True)
         if error:
             return {
                 'error': error,
                 'redirect_url': default_redirect_url
             }
 
         c.default_message = (_('Uploaded file via RhodeCode Enterprise'))
         c.f_path = f_path
 
         r_post = self.request.POST
 
         message = c.default_message
         user_message = r_post.getall('message')
         if isinstance(user_message, list) and user_message:
             # we take the first from duplicated results if it's not empty
             message = user_message[0] if user_message[0] else message
 
         nodes = {}
 
         for file_obj in r_post.getall('files_upload') or []:
             content = file_obj.file
             filename = file_obj.filename
 
             root_path = f_path
             pure_path = self.create_pure_path(root_path, filename)
             node_path = safe_unicode(bytes(pure_path).lstrip('/'))
 
             nodes[node_path] = {
                 'content': content
             }
 
         if not nodes:
             error = 'missing files'
             return {
                 'error': error,
                 'redirect_url': default_redirect_url
             }
 
         author = self._rhodecode_db_user.full_contact
 
         try:
             commit = ScmModel().create_nodes(
                 user=self._rhodecode_db_user.user_id,
                 repo=self.db_repo,
                 message=message,
                 nodes=nodes,
                 parent_commit=c.commit,
                 author=author,
             )
             if len(nodes) == 1:
                 flash_message = _('Successfully committed {} new files').format(len(nodes))
             else:
                 flash_message = _('Successfully committed 1 new file')
 
             h.flash(flash_message, category='success')
 
             default_redirect_url = h.route_path(
                 'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
 
         except NonRelativePathError:
             log.exception('Non Relative path found')
             error = _('The location specified must be a relative path and must not '
                       'contain .. in the path')
             h.flash(error, category='warning')
 
             return {
                 'error': error,
                 'redirect_url': default_redirect_url
             }
         except (NodeError, NodeAlreadyExistsError) as e:
             error = h.escape(e)
             h.flash(error, category='error')
 
             return {
                 'error': error,
                 'redirect_url': default_redirect_url
             }
         except Exception:
             log.exception('Error occurred during commit')
             error = _('Error occurred during commit')
             h.flash(error, category='error')
             return {
                 'error': error,
                 'redirect_url': default_redirect_url
             }
 
         return {
             'error': None,
             'redirect_url': default_redirect_url
         }

rhodecode/apps/repository/views/repo_forks.py

@@ -1,266 +1,266 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import logging
 import datetime
 import formencode
 import formencode.htmlfill
 
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 from pyramid.renderers import render
 from pyramid.response import Response
 
 from rhodecode import events
 from rhodecode.apps._base import RepoAppView, DataGridAppView
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator, NotAnonymous,
     HasRepoPermissionAny, HasPermissionAnyDecorator, CSRFRequired)
 import rhodecode.lib.helpers as h
 from rhodecode.lib.celerylib.utils import get_task_id
 from rhodecode.model.db import coalesce, or_, Repository, RepoGroup
 from rhodecode.model.permission import PermissionModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.forms import RepoForkForm
 from rhodecode.model.scm import ScmModel, RepoGroupList
 from rhodecode.lib.utils2 import safe_int, safe_unicode
 
 log = logging.getLogger(__name__)
 
 
 class RepoForksView(RepoAppView, DataGridAppView):
 
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
         c.rhodecode_repo = self.rhodecode_vcs_repo
 
         acl_groups = RepoGroupList(
             RepoGroup.query().all(),
             perm_set=['group.write', 'group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: safe_unicode(k[0]), c.repo_groups)
 
         c.personal_repo_group = c.rhodecode_user.personal_repo_group
 
         return c
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_forks_show_all', request_method='GET',
         renderer='rhodecode:templates/forks/forks.mako')
     def repo_forks_show_all(self):
         c = self.load_default_context()
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_forks_data', request_method='GET',
         renderer='json_ext', xhr=True)
     def repo_forks_data(self):
         _ = self.request.translate
         self.load_default_context()
         column_map = {
             'fork_name': 'repo_name',
             'fork_date': 'created_on',
             'last_activity': 'updated_on'
         }
         draw, start, limit = self._extract_chunk(self.request)
         search_q, order_by, order_dir = self._extract_ordering(
             self.request, column_map=column_map)
 
         acl_check = HasRepoPermissionAny(
             'repository.read', 'repository.write', 'repository.admin')
         repo_id = self.db_repo.repo_id
         allowed_ids = [-1]
         for f in Repository.query().filter(Repository.fork_id == repo_id):
             if acl_check(f.repo_name, 'get forks check'):
                 allowed_ids.append(f.repo_id)
 
         forks_data_total_count = Repository.query()\
             .filter(Repository.fork_id == repo_id)\
             .filter(Repository.repo_id.in_(allowed_ids))\
             .count()
 
         # json generate
         base_q = Repository.query()\
             .filter(Repository.fork_id == repo_id)\
             .filter(Repository.repo_id.in_(allowed_ids))\
 
         if search_q:
             like_expression = u'%{}%'.format(safe_unicode(search_q))
             base_q = base_q.filter(or_(
                 Repository.repo_name.ilike(like_expression),
                 Repository.description.ilike(like_expression),
             ))
 
         forks_data_total_filtered_count = base_q.count()
 
         sort_col = getattr(Repository, order_by, None)
         if sort_col:
             if order_dir == 'asc':
                 # handle null values properly to order by NULL last
                 if order_by in ['last_activity']:
                     sort_col = coalesce(sort_col, datetime.date.max)
                 sort_col = sort_col.asc()
             else:
                 # handle null values properly to order by NULL last
                 if order_by in ['last_activity']:
                     sort_col = coalesce(sort_col, datetime.date.min)
                 sort_col = sort_col.desc()
 
         base_q = base_q.order_by(sort_col)
         base_q = base_q.offset(start).limit(limit)
 
         fork_list = base_q.all()
 
         def fork_actions(fork):
             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')
 
         def fork_name(fork):
             return h.link_to(fork.repo_name,
                       h.route_path('repo_summary', repo_name=fork.repo_name))
 
         forks_data = []
         for fork in fork_list:
             forks_data.append({
                 "username": h.gravatar_with_user(self.request, fork.user.username),
                 "fork_name": fork_name(fork),
                 "description": fork.description_safe,
                 "fork_date": h.age_component(fork.created_on, time_is_local=True),
                 "last_activity": h.format_date(fork.updated_on),
                 "action": fork_actions(fork),
             })
 
         data = ({
             'draw': draw,
             'data': forks_data,
             'recordsTotal': forks_data_total_count,
             'recordsFiltered': forks_data_total_filtered_count,
         })
 
         return data
 
     @LoginRequired()
     @NotAnonymous()
     @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_fork_new', request_method='GET',
         renderer='rhodecode:templates/forks/forks.mako')
     def repo_fork_new(self):
         c = self.load_default_context()
 
         defaults = RepoModel()._get_defaults(self.db_repo_name)
         # alter the description to indicate a fork
         defaults['description'] = (
             'fork of repository: %s \n%s' % (
                 defaults['repo_name'], defaults['description']))
         # add suffix to fork
         defaults['repo_name'] = '%s-fork' % defaults['repo_name']
 
         data = render('rhodecode:templates/forks/fork.mako',
                       self._get_template_context(c), self.request)
         html = formencode.htmlfill.render(
             data,
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
         return Response(html)
 
     @LoginRequired()
     @NotAnonymous()
     @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='repo_fork_create', request_method='POST',
         renderer='rhodecode:templates/forks/fork.mako')
     def repo_fork_create(self):
         _ = self.request.translate
         c = self.load_default_context()
 
         _form = RepoForkForm(self.request.translate,
                              old_data={'repo_type': self.db_repo.repo_type},
                              repo_groups=c.repo_groups_choices)()
         post_data = dict(self.request.POST)
 
         # forbid injecting other repo by forging a request
         post_data['fork_parent_id'] = self.db_repo.repo_id
         post_data['landing_rev'] = self.db_repo._landing_revision
 
         form_result = {}
         task_id = None
         try:
             form_result = _form.to_python(post_data)
             copy_permissions = form_result.get('copy_permissions')
             # create fork is done sometimes async on celery, db transaction
             # management is handled there.
             task = RepoModel().create_fork(
                 form_result, c.rhodecode_user.user_id)
 
             task_id = get_task_id(task)
         except formencode.Invalid as errors:
             c.rhodecode_db_repo = self.db_repo
 
             data = render('rhodecode:templates/forks/fork.mako',
                           self._get_template_context(c), self.request)
             html = formencode.htmlfill.render(
                 data,
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False
             )
             return Response(html)
         except Exception:
             log.exception(
                 u'Exception while trying to fork the repository %s', self.db_repo_name)
             msg = _('An error occurred during repository forking %s') % (self.db_repo_name, )
             h.flash(msg, category='error')
             raise HTTPFound(h.route_path('home'))
 
         repo_name = form_result.get('repo_name_full', self.db_repo_name)
 
         affected_user_ids = [self._rhodecode_user.user_id]
         if copy_permissions:
             # permission flush is done in repo creating
             pass
 
         PermissionModel().trigger_permission_flush(affected_user_ids)
 
         raise HTTPFound(
             h.route_path('repo_creating', repo_name=repo_name,
                          _query=dict(task_id=task_id)))

rhodecode/i18n/rhodecode.pot

@@ -1,11099 +1,11328 b''
 # Translations template for rhodecode-enterprise-ce.
 # Copyright (C) 2020 RhodeCode GmbH
 # This file is distributed under the same license as the rhodecode-enterprise-ce project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rhodecode-enterprise-ce 4.18.0\n"
+"Project-Id-Version: rhodecode-enterprise-ce 4.19.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2020-01-08 13:56+0000\n"
+"POT-Creation-Date: 2020-05-22 09:45+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
 #: rhodecode/apps/admin/views/defaults.py:90
 msgid "Default settings updated successfully"
 msgstr ""
 
 #: rhodecode/apps/admin/views/defaults.py:108
 msgid "Error occurred during update of default values"
 msgstr ""
 
 #: rhodecode/apps/admin/views/exception_tracker.py:156
 msgid "Removed {} Exceptions"
 msgstr ""
 
 #: rhodecode/apps/admin/views/exception_tracker.py:173
 msgid "Removed Exception {}"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:121
 msgid "Application permissions updated successfully"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:142
 #: rhodecode/apps/admin/views/permissions.py:218
 #: rhodecode/apps/admin/views/permissions.py:320
 msgid "Error occurred during update of permissions"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:198
 msgid "Object permissions updated successfully"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:300
 msgid "Global permissions updated successfully"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:485
 #: rhodecode/templates/admin/gists/gist_show.mako:50
 #: rhodecode/templates/admin/integrations/list.mako:172
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:7
 #: rhodecode/templates/base/issue_tracker_settings.mako:137
 #: rhodecode/templates/data_table/_dt_elements.mako:173
-#: rhodecode/templates/data_table/_dt_elements.mako:249
-#: rhodecode/templates/data_table/_dt_elements.mako:262
-#: rhodecode/templates/data_table/_dt_elements.mako:263
-#: rhodecode/templates/data_table/_dt_elements.mako:276
+#: rhodecode/templates/data_table/_dt_elements.mako:251
+#: rhodecode/templates/data_table/_dt_elements.mako:266
+#: rhodecode/templates/data_table/_dt_elements.mako:267
+#: rhodecode/templates/data_table/_dt_elements.mako:282
 #: rhodecode/templates/debug_style/buttons.html:128
-#: rhodecode/templates/files/files_add.mako:57
+#: rhodecode/templates/files/files_add.mako:56
 #: rhodecode/templates/files/files_edit.mako:58
 #: rhodecode/templates/files/files_source.mako:29
 #: rhodecode/templates/files/files_source.mako:42
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:74
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:302
 #: rhodecode/templates/user_group/profile.mako:8
 #: rhodecode/templates/users/user_profile.mako:8
 msgid "Edit"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:513
 msgid "Updated SSH keys file: {}"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:516
 msgid "SSH key support is disabled in .ini file"
 msgstr ""
 
 #: rhodecode/apps/admin/views/repo_groups.py:328
 #, python-format
 msgid "Created repository group %s"
 msgstr ""
 
 #: rhodecode/apps/admin/views/repo_groups.py:346
 #, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr ""
 
 #: rhodecode/apps/admin/views/sessions.py:92
 msgid "Cleaned up old sessions"
 msgstr ""
 
 #: rhodecode/apps/admin/views/sessions.py:97
 msgid "Failed to cleanup up old sessions"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:162
 #: rhodecode/apps/admin/views/settings.py:317
 #: rhodecode/apps/admin/views/settings.py:392
 #: rhodecode/apps/admin/views/settings.py:726
 #: rhodecode/apps/repository/views/repo_settings_vcs.py:124
 msgid "Some form inputs contain invalid data."
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:189
 #: rhodecode/apps/admin/views/settings.py:353
 msgid "Error occurred during updating application settings"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:193
 #: rhodecode/apps/repository/views/repo_settings_vcs.py:143
 msgid "Updated VCS settings"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:267
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:349
 msgid "Updated application settings"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:431
 msgid "Updated visualisation settings"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:434
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:496
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:127
 msgid "Invalid issue tracker pattern: {}"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:513
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:136
 msgid "Updated issue tracker entries"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:533
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:91
 msgid "Removed issue tracker entry."
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:571
 msgid "Please enter email address"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:588
 msgid "Send email task created"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:638
 msgid "Added new hook"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:653
 msgid "Updated hooks"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:657
 msgid "Error occurred during hook creation"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:750
 msgid "Error occurred during updating labs settings"
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:755
 msgid "Updated Labs settings"
 msgstr ""
 
 #: rhodecode/apps/admin/views/svn_config.py:46
-msgid "Apache configuration for Subversion generated."
+msgid "Apache configuration for Subversion generated at `{}`."
 msgstr ""
 
 #: rhodecode/apps/admin/views/svn_config.py:54
 msgid "Failed to generate the Apache configuration for Subversion."
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:79
 msgid "Note: please make sure this server can access `${url}` for the update link to work"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:90
 msgid "Update info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:92
 msgid "Check for updates"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:97
 msgid "RhodeCode Version"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:98
 msgid "Latest version"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:99
 msgid "RhodeCode Base URL"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:100
 msgid "RhodeCode Server IP"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:101
 msgid "RhodeCode Server ID"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:102
 msgid "RhodeCode Configuration"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:103
 msgid "RhodeCode Certificate"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:104
 msgid "Workers"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:105
 msgid "Worker Type"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:109
 msgid "Database"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:110
 msgid "Database version"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:114
 msgid "Platform"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:115
 msgid "Platform UUID"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:116
 msgid "Lang"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:117
 msgid "Python version"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:118
 msgid "Python path"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:122
 msgid "CPU"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:123
 msgid "Load"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:124
 msgid "Memory"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:125
 msgid "Uptime"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:129
 msgid "Ulimit"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:132
 msgid "Storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:133
 msgid "Storage info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:134
 msgid "Storage inodes"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:136
 msgid "Gist storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:137
 msgid "Gist storage info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:139
 msgid "Archive cache storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:140
 msgid "Archive cache info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:142
 msgid "Temp storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:143
 msgid "Temp storage info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:145
 msgid "Search info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:146
 msgid "Search location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:150
 msgid "VCS Backends"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:151
 #: rhodecode/templates/admin/settings/settings_system.mako:32
 msgid "VCS Server"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:152
 msgid "GIT"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:153
 msgid "HG"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:154
 msgid "SVN"
 msgstr ""
 
 #: rhodecode/apps/admin/views/user_groups.py:238
 #, python-format
 msgid "Created user group %(user_group_link)s"
 msgstr ""
 
 #: rhodecode/apps/admin/views/user_groups.py:260
 #, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:221
+#: rhodecode/apps/admin/views/users.py:222
 #, python-format
 msgid "Created user %(user_link)s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:242
+#: rhodecode/apps/admin/views/users.py:243
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:344
+#: rhodecode/apps/admin/views/users.py:345
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:362
+#: rhodecode/apps/admin/views/users.py:363
 #, python-format
 msgid "Error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:391
-#, python-format
-msgid "Detached %s repositories"
-msgstr ""
-
 #: rhodecode/apps/admin/views/users.py:394
 #, python-format
+msgid "Detached %s repositories"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:397
+#, python-format
 msgid "Deleted %s repositories"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:400
-#, python-format
-msgid "Detached %s repository groups"
-msgstr ""
-
 #: rhodecode/apps/admin/views/users.py:403
 #, python-format
+msgid "Detached %s repository groups"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:406
+#, python-format
 msgid "Deleted %s repository groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:409
-#, python-format
-msgid "Detached %s user groups"
-msgstr ""
-
 #: rhodecode/apps/admin/views/users.py:412
 #, python-format
+msgid "Detached %s user groups"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:415
+#, python-format
 msgid "Deleted %s user groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:418
-#, python-format
-msgid "Detached %s artifacts"
-msgstr ""
-
 #: rhodecode/apps/admin/views/users.py:421
 #, python-format
+msgid "Detached %s pull requests"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:424
+#, python-format
+msgid "Deleted %s pull requests"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:430
+#, python-format
+msgid "Detached %s artifacts"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:433
+#, python-format
 msgid "Deleted %s artifacts"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:454
+#: rhodecode/apps/admin/views/users.py:482
 msgid "Successfully deleted user `{}`"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:460
+#: rhodecode/apps/admin/views/users.py:489
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:525
+#: rhodecode/apps/admin/views/users.py:558
 msgid ""
 "The user participates as reviewer in {} pull request and cannot be deleted. \n"
 "You can set the user to \"{}\" instead of deleting it."
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:531
+#: rhodecode/apps/admin/views/users.py:564
 msgid ""
 "The user participates as reviewer in {} pull requests and cannot be deleted. \n"
 "You can set the user to \"{}\" instead of deleting it."
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:620
+#: rhodecode/apps/admin/views/users.py:653
 msgid "User global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:638
+#: rhodecode/apps/admin/views/users.py:671
 #: rhodecode/apps/user_group/views/__init__.py:479
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:661
+#: rhodecode/apps/admin/views/users.py:694
 msgid "Force password change enabled for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:669
-#: rhodecode/apps/admin/views/users.py:699
+#: rhodecode/apps/admin/views/users.py:702
+#: rhodecode/apps/admin/views/users.py:732
 msgid "An error occurred during password reset for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:690
+#: rhodecode/apps/admin/views/users.py:723
 msgid "Force password change disabled for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:737
+#: rhodecode/apps/admin/views/users.py:796
 #, python-format
 msgid "Linked repository group `%s` as personal"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:743
+#: rhodecode/apps/admin/views/users.py:802
 #, python-format
 msgid "Created repository group `%s`"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:747
+#: rhodecode/apps/admin/views/users.py:806
 #, python-format
 msgid "Repository group `%s` is already taken"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:752
+#: rhodecode/apps/admin/views/users.py:811
 msgid "An error occurred during repository group creation for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:775
-#: rhodecode/apps/my_account/views/my_account.py:160
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16
+#: rhodecode/apps/admin/views/users.py:834
+#: rhodecode/apps/my_account/views/my_account.py:161
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:22
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27
 msgid "Role"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:814
-#: rhodecode/apps/my_account/views/my_account.py:195
+#: rhodecode/apps/admin/views/users.py:892
+#: rhodecode/apps/my_account/views/my_account.py:217
 msgid "Auth token successfully created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:843
-#: rhodecode/apps/my_account/views/my_account.py:219
+#: rhodecode/apps/admin/views/users.py:921
+#: rhodecode/apps/my_account/views/my_account.py:241
 msgid "Auth token successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:916
-#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:114
+#: rhodecode/apps/admin/views/users.py:997
+#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117
 msgid "Ssh Key successfully created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:922
-#: rhodecode/apps/admin/views/users.py:926
-#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:120
-#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:124
+#: rhodecode/apps/admin/views/users.py:1003
+#: rhodecode/apps/admin/views/users.py:1007
+#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:123
+#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:127
 msgid "An error occurred during ssh key saving: {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:960
-#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:154
+#: rhodecode/apps/admin/views/users.py:1041
+#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:157
 msgid "Ssh key successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1006
+#: rhodecode/apps/admin/views/users.py:1087
 #, python-format
 msgid "Added new email address `%s` for user account"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1012
+#: rhodecode/apps/admin/views/users.py:1093
 msgid "Email `{}` is already registered for another user."
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1016
+#: rhodecode/apps/admin/views/users.py:1097
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1043
+#: rhodecode/apps/admin/views/users.py:1124
 msgid "Removed email address from user account"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1089
+#: rhodecode/apps/admin/views/users.py:1170
 #, python-format
 msgid "An error occurred during ip saving:%s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1111
+#: rhodecode/apps/admin/views/users.py:1192
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1115
+#: rhodecode/apps/admin/views/users.py:1196
 #, python-format
 msgid "Added ips %s to user whitelist"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1145
+#: rhodecode/apps/admin/views/users.py:1226
 msgid "Removed ip address from user whitelist"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1210
+#: rhodecode/apps/admin/views/users.py:1291
 msgid "Groups successfully changed"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1330
+#: rhodecode/apps/admin/views/users.py:1411
 msgid "Deleted {} cache keys"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51
 msgid "forever"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:58
 msgid "5 minutes"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:59
 msgid "1 hour"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:60
 msgid "1 day"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:61
 msgid "1 month"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:50068
+#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:46848
 #: rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
-#: rhodecode/public/js/src/rhodecode.js:621
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
+#: rhodecode/public/js/src/rhodecode.js:625
 msgid "Lifetime"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:66
 msgid "Requires registered account"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:67
 msgid "Can be accessed by anonymous users"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:218
 msgid "Error occurred during gist creation"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:242
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:330
-#: rhodecode/templates/admin/gists/gist_show.mako:73
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:36
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:36
-#: rhodecode/templates/data_table/_dt_elements.mako:333
+#: rhodecode/templates/admin/gists/gist_show.mako:76
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:44
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:49
+#: rhodecode/templates/data_table/_dt_elements.mako:341
 msgid "never"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:336
 #, python-format
 msgid "%(expiry)s - current value"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:381
 msgid "Successfully updated gist content"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:386
 msgid "Successfully updated gist data"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:389
 msgid "Error occurred during update of gist {}: {}"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:393
 #, python-format
 msgid "Error occurred during update of gist %s"
 msgstr ""
 
-#: rhodecode/apps/home/views.py:397
-#: rhodecode/apps/repository/views/repo_pull_requests.py:879
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:199
+#: rhodecode/apps/home/views.py:452
+#: rhodecode/apps/repository/views/repo_pull_requests.py:914
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:209
 #: rhodecode/templates/admin/repos/repo_add.mako:15
 #: rhodecode/templates/admin/repos/repo_add.mako:19
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12
 #: rhodecode/templates/base/base.mako:107
 #: rhodecode/templates/base/base.mako:126
-#: rhodecode/templates/base/base.mako:1111
+#: rhodecode/templates/base/base.mako:1172
 msgid "Repositories"
 msgstr ""
 
-#: rhodecode/apps/home/views.py:424
+#: rhodecode/apps/home/views.py:479
 #: rhodecode/templates/admin/integrations/form.mako:17
 #: rhodecode/templates/admin/integrations/list.mako:10
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:31
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:198
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:208
 msgid "Repository Groups"
 msgstr ""
 
 #: rhodecode/apps/journal/views.py:133 rhodecode/apps/journal/views.py:179
 msgid "public journal"
 msgstr ""
 
 #: rhodecode/apps/journal/views.py:137 rhodecode/apps/journal/views.py:183
 msgid "journal"
 msgstr ""
 
 #: rhodecode/apps/login/views.py:304 rhodecode/apps/login/views.py:403
 msgid "Bad captcha"
 msgstr ""
 
 #: rhodecode/apps/login/views.py:330
 msgid "You have successfully registered with RhodeCode. You can log-in now."
 msgstr ""
 
 #: rhodecode/apps/login/views.py:334
 msgid "Please use the {identity} button to log-in"
 msgstr ""
 
 #: rhodecode/apps/login/views.py:372
 msgid "If such email exists, a password reset link was sent to it."
 msgstr ""
 
 #: rhodecode/apps/login/views.py:385
 msgid "Password reset has been disabled."
 msgstr ""
 
 #: rhodecode/apps/login/views.py:474
 msgid "Given reset token is invalid"
 msgstr ""
 
 #: rhodecode/apps/login/views.py:482
 msgid "Your password reset was successful, a new password has been sent to your email"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:135
+#: rhodecode/apps/my_account/views/my_account.py:136
 msgid "Error occurred during update of user password"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:142
+#: rhodecode/apps/my_account/views/my_account.py:143
 msgid "Successfully updated password"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:283
+#: rhodecode/apps/my_account/views/my_account.py:305
 msgid "Error occurred during adding email"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:286
-msgid "Successfully added email"
-msgstr ""
-
 #: rhodecode/apps/my_account/views/my_account.py:308
+msgid "Successfully added email"
+msgstr ""
+
+#: rhodecode/apps/my_account/views/my_account.py:330
 msgid "Email successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:518
+#: rhodecode/apps/my_account/views/my_account.py:540
 msgid "Position {} is defined twice. Please correct this error."
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:531
+#: rhodecode/apps/my_account/views/my_account.py:553
 msgid "Update Bookmarks"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:533
+#: rhodecode/apps/my_account/views/my_account.py:555
 msgid "Failed to update bookmarks. Make sure an unique position is used."
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:685
+#: rhodecode/apps/my_account/views/my_account.py:707
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:692
+#: rhodecode/apps/my_account/views/my_account.py:714
 msgid "Error occurred during update of user"
 msgstr ""
 
 #: rhodecode/apps/repo_group/views/repo_group_advanced.py:57
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:77
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:85
 msgid "updated commit cache"
 msgstr ""
 
 #: rhodecode/apps/repo_group/views/repo_group_advanced.py:105
 #, python-format
 msgid "Removed repository group `%s`"
 msgstr ""
 
 #: rhodecode/apps/repo_group/views/repo_group_advanced.py:109
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_permissions.py:74
+#: rhodecode/apps/repo_group/views/repo_group_permissions.py:75
 #: rhodecode/apps/user_group/views/__init__.py:346
 msgid "Cannot change permission for yourself as admin"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_permissions.py:98
+#: rhodecode/apps/repo_group/views/repo_group_permissions.py:99
 msgid "Repository Group permissions updated"
 msgstr ""
 
 #: rhodecode/apps/repo_group/views/repo_group_settings.py:174
 msgid "Repository Group `{}` updated successfully"
 msgstr ""
 
 #: rhodecode/apps/repo_group/views/repo_group_settings.py:179
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_caches.py:80
 msgid "Cache invalidation successful"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_caches.py:84
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_changelog.py:66
 #: rhodecode/apps/repository/views/repo_compare.py:64
-#: rhodecode/apps/repository/views/repo_pull_requests.py:728
+#: rhodecode/apps/repository/views/repo_pull_requests.py:763
 msgid "There are no commits yet"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_changelog.py:71
 #: rhodecode/apps/repository/views/repo_files.py:185
 #: rhodecode/apps/repository/views/repo_files.py:205
 msgid "No such commit exists for this repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_checks.py:103
 #, python-format
 msgid "Created repository %s from %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_checks.py:112
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_checks.py:115
 #, python-format
 msgid "Created repository %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_commits.py:111
 msgid "No such commit exists. Org exception: `{}`"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_commits.py:330
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1362
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1399
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_commits.py:375
 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_compare.py:102
 msgid "Select commit"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_compare.py:173
 msgid "Could not find the source repo: `{}`"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_compare.py:181
 msgid "Could not find the target repo: `{}`"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_compare.py:192
 msgid "The comparison of two different kinds of remote repos is not available"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_compare.py:225
 msgid "Could not compare repos with different large file settings"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_compare.py:271
 #, python-format
 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_feed.py:68
 #, python-format
 msgid "Changes on %s repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_feed.py:69
 #, python-format
 msgid "%s %s feed"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:96
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:109
 msgid "Cannot modify file. Given commit `{}` is not head of a branch."
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:127
 msgid "Branch `{}` changes forbidden by rule {}."
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:175
 msgid "Click here to add a new file."
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:180
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:341
 msgid "Downloads disabled"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:347
 msgid "Unknown archive type for: `{}`"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:353
 msgid "Unknown commit_id {}"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:356
 msgid "Empty repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:361
 msgid "No node at path {} for this repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:410
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:989
+#: rhodecode/apps/repository/views/repo_files.py:990
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1010
+#: rhodecode/apps/repository/views/repo_files.py:1011
 #: rhodecode/apps/repository/views/repo_summary.py:264
-#: rhodecode/model/pull_request.py:1572 rhodecode/model/scm.py:995
+#: rhodecode/model/pull_request.py:1740 rhodecode/model/scm.py:995
 #: rhodecode/templates/base/vcs_settings.mako:235
 #: rhodecode/templates/summary/components.mako:10
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1014
+#: rhodecode/apps/repository/views/repo_files.py:1015
 #: rhodecode/model/scm.py:1012 rhodecode/templates/base/vcs_settings.mako:260
 #: rhodecode/templates/summary/components.mako:34
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1118
-#: rhodecode/apps/repository/views/repo_files.py:1146
+#: rhodecode/apps/repository/views/repo_files.py:1169
+#: rhodecode/apps/repository/views/repo_files.py:1197
 msgid "Deleted file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1167
+#: rhodecode/apps/repository/views/repo_files.py:1218
 msgid "Successfully deleted file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1171
-#: rhodecode/apps/repository/views/repo_files.py:1288
-#: rhodecode/apps/repository/views/repo_files.py:1419
-#: rhodecode/apps/repository/views/repo_files.py:1542
+#: rhodecode/apps/repository/views/repo_files.py:1222
+#: rhodecode/apps/repository/views/repo_files.py:1339
+#: rhodecode/apps/repository/views/repo_files.py:1470
+#: rhodecode/apps/repository/views/repo_files.py:1593
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1203
-#: rhodecode/apps/repository/views/repo_files.py:1234
+#: rhodecode/apps/repository/views/repo_files.py:1254
+#: rhodecode/apps/repository/views/repo_files.py:1285
 msgid "Edited file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1257
+#: rhodecode/apps/repository/views/repo_files.py:1308
 msgid "No changes detected on {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1281
+#: rhodecode/apps/repository/views/repo_files.py:1332
 msgid "Successfully committed changes to file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1322
-#: rhodecode/apps/repository/views/repo_files.py:1363
+#: rhodecode/apps/repository/views/repo_files.py:1373
+#: rhodecode/apps/repository/views/repo_files.py:1414
 msgid "Added file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1379
+#: rhodecode/apps/repository/views/repo_files.py:1430
 msgid "No filename specified"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1404
+#: rhodecode/apps/repository/views/repo_files.py:1455
 msgid "Successfully committed new file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1412
-#: rhodecode/apps/repository/views/repo_files.py:1524
+#: rhodecode/apps/repository/views/repo_files.py:1463
+#: rhodecode/apps/repository/views/repo_files.py:1575
 msgid "The location specified must be a relative path and must not contain .. in the path"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1469
+#: rhodecode/apps/repository/views/repo_files.py:1520
 msgid "Uploaded file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1513
+#: rhodecode/apps/repository/views/repo_files.py:1564
 msgid "Successfully committed {} new files"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1515
+#: rhodecode/apps/repository/views/repo_files.py:1566
 msgid "Successfully committed 1 new file"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_forks.py:146
 msgid "Compare fork"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_forks.py:251
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_permissions.py:55
+#: rhodecode/apps/repository/views/repo_permissions.py:57
 msgid "Explicitly add user or user group with write+ permission to modify their branch permissions."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_permissions.py:90
+#: rhodecode/apps/repository/views/repo_permissions.py:92
 msgid "Repository access permissions updated"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_permissions.py:112
+#: rhodecode/apps/repository/views/repo_permissions.py:126
 msgid "Repository `{}` private mode set successfully"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_permissions.py:116
+#: rhodecode/apps/repository/views/repo_permissions.py:134
 #: rhodecode/apps/repository/views/repo_settings.py:176
 msgid "Error occurred during update of repository {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:758
+#: rhodecode/apps/repository/views/repo_pull_requests.py:287
+msgid "Pull Request state was force changed to `{}`"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_pull_requests.py:793
 msgid "Commit does not exist"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:910
+#: rhodecode/apps/repository/views/repo_pull_requests.py:945
 msgid "Error creating pull request: {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:929
+#: rhodecode/apps/repository/views/repo_pull_requests.py:965
 msgid "source_repo or target repo not found"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:940
+#: rhodecode/apps/repository/views/repo_pull_requests.py:976
 msgid "Not Enough permissions to source repo `{}`."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:955
+#: rhodecode/apps/repository/views/repo_pull_requests.py:991
 msgid "Not Enough permissions to target repo `{}`."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1018
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1055
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1021
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1058
 msgid "Error occurred during creation of this pull request."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1053
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1108
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1090
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1145
 msgid "Cannot update closed pull requests."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1075
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1112
 msgid "Cannot update pull requests commits in state other than `{}`. Current state is: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1114
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1151
 msgid "Pull request title & description updated."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1136
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1173
 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1150
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1187
 msgid "Reload page"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1185
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1222
 msgid "Cannot merge pull requests in state other than `{}`. Current state is: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1231
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1268
 msgid "Pull request was successfully merged and closed."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1255
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1292
 msgid "Pull request reviewers updated."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1288
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1325
 msgid "Successfully deleted pull request"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:172
 msgid "Repository `{}` updated successfully"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:209
 msgid "Unlocked"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:214
 msgid "Locked"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:216
 #, python-format
 msgid "Repository has been %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:220
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:297
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:305
 msgid "An error occurred during unlocking"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:264
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:106
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:114
 #, python-format
 msgid "Archived repository `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:111
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:119
 #, python-format
 msgid "An error occurred during archiving of `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:149
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:157
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:151
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:159
 #, python-format
 msgid "Deleted %s forks"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:160
-#, python-format
-msgid "Deleted repository `%s`"
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:167
-msgid "detach or delete"
-msgstr ""
-
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:168
+#, python-format
+msgid "Deleted repository `%s`"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:175
+msgid "detach or delete"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:176
 msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:183
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:191
 msgid "Cannot delete `{repo}` it still contains {num} attached pull requests. Consider archiving the repository instead."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:192
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:200
 #, python-format
 msgid "An error occurred during deletion of `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:217
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:225
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:221
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:229
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:257
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:265
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:260
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:268
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:267
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:275
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:291
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:299
 msgid "Locked repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:294
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:302
 msgid "Unlocked repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:314
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:322
 msgid "installed updated hooks into this repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_fields.py:86
 msgid "An error occurred during creation of field"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_fields.py:108
 msgid "An error occurred during removal of field"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:86
 msgid "Error occurred during deleting issue tracker entry"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_remote.py:64
 msgid "Pulled from remote location"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_remote.py:67
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_vcs.py:147
 msgid "Error occurred during updating repository VCS settings"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_summary.py:240
 #: rhodecode/templates/admin/permissions/permissions.mako:42
 #: rhodecode/templates/summary/components.mako:8
 msgid "Branch"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_summary.py:241
 #: rhodecode/templates/summary/components.mako:32
 msgid "Tag"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_summary.py:242
 #: rhodecode/templates/summary/components.mako:44
 msgid "Bookmark"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_summary.py:265
 msgid "Closed branches"
 msgstr ""
 
 #: rhodecode/apps/ssh_support/events.py:29
 msgid "RhodeCode SSH Key files changed."
 msgstr ""
 
 #: rhodecode/apps/svn_support/events.py:30
 msgid "Configuration for Apache mad_dav_svn changed."
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:188
 #, python-format
 msgid "Updated user group %s"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:224
 #, python-format
 msgid "Error occurred during update of user group %s"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:250
 msgid "Successfully deleted user group"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:255
 msgid "An error occurred during deletion of user group"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:359
 msgid "Target group cannot be the same"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:374
 msgid "User Group permissions updated"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:459
 msgid "User Group global permissions updated successfully"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:541
 msgid "User Group synchronization updated successfully"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:545
 msgid "An error occurred during synchronization update"
 msgstr ""
 
 #: rhodecode/authentication/routes.py:61
 #: rhodecode/templates/admin/auth/plugin_settings.mako:14
 msgid "Authentication Plugins"
 msgstr ""
 
 #: rhodecode/authentication/schema.py:36
 msgid "Enable or disable this authentication plugin."
 msgstr ""
 
 #: rhodecode/authentication/schema.py:38 rhodecode/integrations/schema.py:32
-#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115
-#: rhodecode/model/permission.py:119 rhodecode/model/permission.py:123
-#: rhodecode/model/permission.py:127 rhodecode/model/permission.py:131
+#: rhodecode/model/permission.py:110 rhodecode/model/permission.py:114
+#: rhodecode/model/permission.py:118 rhodecode/model/permission.py:122
+#: rhodecode/model/permission.py:126 rhodecode/model/permission.py:130
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:195
 #: rhodecode/templates/admin/auth/auth_settings.mako:64
 #: rhodecode/templates/admin/integrations/list.mako:71
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:23
 msgid "Enabled"
 msgstr ""
 
 #: rhodecode/authentication/schema.py:44
 msgid ""
 "Amount of seconds to cache the authentication and permissions check response call for this plugin. \n"
 "Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)."
 msgstr ""
 
 #: rhodecode/authentication/schema.py:49
 msgid "Auth Cache TTL"
 msgstr ""
 
 #: rhodecode/authentication/views.py:92
 msgid "Errors exist when saving plugin settings. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/authentication/views.py:104 rhodecode/authentication/views.py:163
+#: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:164
 msgid "Auth settings updated successfully."
 msgstr ""
 
-#: rhodecode/authentication/views.py:166
+#: rhodecode/authentication/views.py:167
 msgid "Errors exist when saving plugin setting. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/authentication/views.py:174
+#: rhodecode/authentication/views.py:175
 msgid "Error occurred during update of auth settings."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:60
 msgid "The FQDN or IP of the Atlassian CROWD Server"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:62
 msgid "Host"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:67
 msgid "The Port in use by the Atlassian CROWD Server"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:69
-#: rhodecode/authentication/plugins/auth_ldap.py:254
+#: rhodecode/authentication/plugins/auth_ldap.py:270
 msgid "Port"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:75
 msgid "The Application Name to authenticate to CROWD"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:77
 msgid "Application Name"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:82
 msgid "The password to authenticate to CROWD"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:84
 msgid "Application Password"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:89
 msgid "A comma separated list of group names that identify users as RhodeCode Administrators"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:93
 msgid "Admin Groups"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:217
 msgid "CROWD"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:54
 msgid "Header to extract the user from"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:56
 msgid "Header"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:61
 msgid "Header to extract the user from when main one fails"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:63
 msgid "Fallback header"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:68
 msgid "Perform cleaning of user, if passed user has @ in username then first part before @ is taken. If there's \\ in the username only the part after  \\ is taken"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:73
 msgid "Clean username"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:99
 msgid "Headers"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_jasig_cas.py:62
 msgid "The url of the Jasig CAS REST service"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_jasig_cas.py:64
 msgid "URL"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_jasig_cas.py:93
 msgid "Jasig-CAS"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:242
+#: rhodecode/authentication/plugins/auth_ldap.py:258
 msgid ""
 "Host[s] of the LDAP Server \n"
 "(e.g., 192.168.2.154, or ldap-server.domain.com.\n"
 " Multiple servers can be specified using commas"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:246
+#: rhodecode/authentication/plugins/auth_ldap.py:262
 msgid "LDAP Host"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:251
-msgid "Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)"
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:261
+#: rhodecode/authentication/plugins/auth_ldap.py:267
+msgid "Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS (SSL)"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:277
 msgid "Timeout for LDAP connection"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:263
+#: rhodecode/authentication/plugins/auth_ldap.py:279
 msgid "Connection timeout"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:270
+#: rhodecode/authentication/plugins/auth_ldap.py:286
 msgid ""
 "Optional user DN/account to connect to LDAP if authentication is required. \n"
 "e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or [e-mail]"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:275
-msgid "Account"
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:280
+#: rhodecode/authentication/plugins/auth_ldap.py:291
+msgid "Bind account"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:296
 msgid "Password to authenticate for given user DN."
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:283
-#: rhodecode/integrations/types/webhook.py:89 rhodecode/templates/login.mako:51
-#: rhodecode/templates/register.mako:62
-#: rhodecode/templates/admin/my_account/my_account.mako:31
-#: rhodecode/templates/admin/users/user_add.mako:44
-#: rhodecode/templates/debug_style/login.html:45
-msgid "Password"
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:288
+#: rhodecode/authentication/plugins/auth_ldap.py:299
+msgid "Bind account password"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:304
 msgid "TLS Type"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:289
+#: rhodecode/authentication/plugins/auth_ldap.py:305
 msgid "Connection Security"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:295
+#: rhodecode/authentication/plugins/auth_ldap.py:311
 msgid ""
 "Require Cert over TLS?. Self-signed and custom certificates can be used when\n"
 " `RhodeCode Certificate` found in admin > settings > system info page is extended."
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:298
+#: rhodecode/authentication/plugins/auth_ldap.py:314
 msgid "Certificate Checks"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:304
-msgid ""
-"This specifies the PEM-format file path containing certificates for use in TLS connection.\n"
-"If not specified `TLS Cert dir` will be used"
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:307
-msgid "TLS Cert file"
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:313
-msgid "This specifies the path of a directory that contains individual CA certificates in separate files."
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:315
-msgid "TLS Cert dir"
-msgstr ""
-
 #: rhodecode/authentication/plugins/auth_ldap.py:320
 msgid ""
-"Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials \n"
+"This specifies the PEM-format file path containing certificates for use in TLS connection.\n"
+"If not specified `TLS Cert dir` will be used"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:323
+msgid "TLS Cert file"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:329
+msgid "This specifies the path of a directory that contains individual CA certificates in separate files."
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:331
+msgid "TLS Cert dir"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:336
+msgid ""
+"Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user username \n"
 "(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:325
+#: rhodecode/authentication/plugins/auth_ldap.py:341
 msgid "Base DN"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:330
+#: rhodecode/authentication/plugins/auth_ldap.py:346
 msgid ""
 "Filter to narrow results \n"
 "(e.g., (&(objectCategory=Person)(objectClass=user)), or \n"
 "(memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:335
+#: rhodecode/authentication/plugins/auth_ldap.py:351
 msgid "LDAP Search Filter"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:341
+#: rhodecode/authentication/plugins/auth_ldap.py:357
 msgid "How deep to search LDAP. If unsure set to SUBTREE"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:342
+#: rhodecode/authentication/plugins/auth_ldap.py:358
 msgid "LDAP Search Scope"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:348
+#: rhodecode/authentication/plugins/auth_ldap.py:364
 msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:350
+#: rhodecode/authentication/plugins/auth_ldap.py:366
 msgid "Login Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:351
+#: rhodecode/authentication/plugins/auth_ldap.py:367
 msgid "The LDAP Login attribute of the CN must be specified"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:356
+#: rhodecode/authentication/plugins/auth_ldap.py:372
 msgid ""
 "LDAP Attribute to map to email address (e.g., mail).\n"
 "Emails are a crucial part of RhodeCode. \n"
 "If possible add a valid email attribute to ldap users."
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:361
+#: rhodecode/authentication/plugins/auth_ldap.py:377
 msgid "Email Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:366
+#: rhodecode/authentication/plugins/auth_ldap.py:382
 msgid "LDAP Attribute to map to first name (e.g., givenName)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:369
+#: rhodecode/authentication/plugins/auth_ldap.py:385
 msgid "First Name Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:374
+#: rhodecode/authentication/plugins/auth_ldap.py:390
 msgid "LDAP Attribute to map to last name (e.g., sn)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:377
+#: rhodecode/authentication/plugins/auth_ldap.py:393
 msgid "Last Name Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:409
+#: rhodecode/authentication/plugins/auth_ldap.py:425
 msgid "LDAP"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:60
 msgid "PAM service name to use for authentication."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:62
 msgid "PAM service name"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:67
 msgid "Regular expression for extracting user name/email etc. from Unix userinfo."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:70
 msgid "Gecos Regex"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:99
 msgid "PAM"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:79
 msgid "RhodeCode Internal"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:200
 msgid "Allowed user types for authentication using this plugin."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:201
 msgid "User restriction"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:209
 msgid "Allowed protocols for authentication using this plugin. VCS means GIT/HG/SVN. HTTP is web based login."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:211
 #: rhodecode/authentication/plugins/auth_token.py:173
 msgid "Scope restriction"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_token.py:77
 msgid "Rhodecode Token"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_token.py:172
 msgid "Choose operation scope restriction when authenticating."
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:79
 msgid "pullrequest created"
 msgstr ""
 
-#: rhodecode/events/pullrequest.py:88
+#: rhodecode/events/pullrequest.py:80
+msgid "Event triggered after pull request was created"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:89
 msgid "pullrequest closed"
 msgstr ""
 
-#: rhodecode/events/pullrequest.py:97
+#: rhodecode/events/pullrequest.py:90
+msgid "Event triggered after pull request was closed"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:99
 msgid "pullrequest commits updated"
 msgstr ""
 
-#: rhodecode/events/pullrequest.py:106
+#: rhodecode/events/pullrequest.py:100
+msgid "Event triggered after pull requests was updated"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:109
 msgid "pullrequest review changed"
 msgstr ""
 
-#: rhodecode/events/pullrequest.py:119
+#: rhodecode/events/pullrequest.py:110
+msgid "Event triggered after a review status of a pull requests has changed to other."
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:124
 msgid "pullrequest merged"
 msgstr ""
 
-#: rhodecode/events/pullrequest.py:128
+#: rhodecode/events/pullrequest.py:125
+msgid "Event triggered after a successful merge operation was executed on a pull request"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:135
 msgid "pullrequest commented"
 msgstr ""
 
-#: rhodecode/events/repo.py:190
+#: rhodecode/events/pullrequest.py:136
+msgid "Event triggered after a comment was made on a code in the pull request"
+msgstr ""
+
+#: rhodecode/events/repo.py:191
+msgid "repository commit comment"
+msgstr ""
+
+#: rhodecode/events/repo.py:192
+msgid "Event triggered after a comment was made on commit inside a repository"
+msgstr ""
+
+#: rhodecode/events/repo.py:224
 msgid "repository pre create"
 msgstr ""
 
-#: rhodecode/events/repo.py:199
+#: rhodecode/events/repo.py:225
+msgid "Event triggered before repository is created"
+msgstr ""
+
+#: rhodecode/events/repo.py:234
 msgid "repository created"
 msgstr ""
 
-#: rhodecode/events/repo.py:208
+#: rhodecode/events/repo.py:235
+msgid "Event triggered after repository was created"
+msgstr ""
+
+#: rhodecode/events/repo.py:244
 msgid "repository pre delete"
 msgstr ""
 
-#: rhodecode/events/repo.py:217
+#: rhodecode/events/repo.py:245
+msgid "Event triggered before a repository is deleted"
+msgstr ""
+
+#: rhodecode/events/repo.py:254
 msgid "repository deleted"
 msgstr ""
 
-#: rhodecode/events/repo.py:257
+#: rhodecode/events/repo.py:255
+msgid "Event triggered after repository was deleted"
+msgstr ""
+
+#: rhodecode/events/repo.py:295
 msgid "repository pre pull"
 msgstr ""
 
-#: rhodecode/events/repo.py:266
+#: rhodecode/events/repo.py:296
+msgid "Event triggered before repository code is pulled"
+msgstr ""
+
+#: rhodecode/events/repo.py:305
 msgid "repository pull"
 msgstr ""
 
-#: rhodecode/events/repo.py:275
+#: rhodecode/events/repo.py:306
+msgid "Event triggered after repository code was pulled"
+msgstr ""
+
+#: rhodecode/events/repo.py:315
 msgid "repository pre push"
 msgstr ""
 
-#: rhodecode/events/repo.py:286
+#: rhodecode/events/repo.py:316
+msgid "Event triggered before the code is pushed to a repository"
+msgstr ""
+
+#: rhodecode/events/repo.py:328
 msgid "repository push"
 msgstr ""
 
+#: rhodecode/events/repo.py:329
+msgid "Event triggered after the code was pushed to a repository"
+msgstr ""
+
 #: rhodecode/events/repo_group.py:62
 msgid "repository group created"
 msgstr ""
 
-#: rhodecode/events/repo_group.py:71
+#: rhodecode/events/repo_group.py:63
+msgid "Event triggered after a repository group was created"
+msgstr ""
+
+#: rhodecode/events/repo_group.py:72
 msgid "repository group deleted"
 msgstr ""
 
-#: rhodecode/events/repo_group.py:80
+#: rhodecode/events/repo_group.py:73
+msgid "Event triggered after a repository group was deleted"
+msgstr ""
+
+#: rhodecode/events/repo_group.py:82
 msgid "repository group update"
 msgstr ""
 
+#: rhodecode/events/repo_group.py:83
+msgid "Event triggered after a repository group was updated"
+msgstr ""
+
 #: rhodecode/events/user.py:37
 msgid "user registered"
 msgstr ""
 
 #: rhodecode/events/user.py:52
 msgid "user pre create"
 msgstr ""
 
 #: rhodecode/events/user.py:66
 msgid "user post create"
 msgstr ""
 
 #: rhodecode/events/user.py:80
 msgid "user pre update"
 msgstr ""
 
 #: rhodecode/events/user.py:100
 msgid "user permissions change"
 msgstr ""
 
 #: rhodecode/forms/__init__.py:35
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:72
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:97
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:73
 #: rhodecode/templates/admin/permissions/permissions_application.mako:60
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:64
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:60
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:207
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:217
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66
-#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:192
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:244
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:201
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:251
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44
 #: rhodecode/templates/admin/settings/settings_global.mako:141
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16
 #: rhodecode/templates/admin/settings/settings_labs.mako:49
 #: rhodecode/templates/admin/settings/settings_vcs.mako:14
 #: rhodecode/templates/admin/settings/settings_visual.mako:215
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:193
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:88
-#: rhodecode/templates/admin/users/user_edit_emails.mako:63
-#: rhodecode/templates/admin/users/user_edit_ips.mako:71
-#: rhodecode/templates/admin/users/user_edit_profile.mako:146
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:67
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:207
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:101
+#: rhodecode/templates/admin/users/user_edit_emails.mako:66
+#: rhodecode/templates/admin/users/user_edit_ips.mako:76
+#: rhodecode/templates/admin/users/user_edit_profile.mako:155
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:72
 #: rhodecode/templates/base/default_perms_box.mako:89
 msgid "Reset"
 msgstr ""
 
-#: rhodecode/forms/__init__.py:36
-#: rhodecode/templates/admin/gists/gist_show.mako:57
+#: rhodecode/forms/__init__.py:36 rhodecode/public/js/scripts.js:37802
+#: rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/utils/ajax.js:158
+#: rhodecode/templates/admin/gists/gist_show.mako:59
 #: rhodecode/templates/admin/integrations/list.mako:179
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:50
-#: rhodecode/templates/admin/my_account/my_account_emails.mako:32
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:33
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59
+#: rhodecode/templates/admin/my_account/my_account_emails.mako:33
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:34
 #: rhodecode/templates/admin/notifications/notifications_data.mako:22
 #: rhodecode/templates/admin/notifications/notifications_show.mako:37
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:29
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25
 #: rhodecode/templates/admin/settings/settings_hooks.mako:46
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:50
-#: rhodecode/templates/admin/users/user_edit_emails.mako:31
-#: rhodecode/templates/admin/users/user_edit_ips.mako:35
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:30
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63
+#: rhodecode/templates/admin/users/user_edit_emails.mako:34
+#: rhodecode/templates/admin/users/user_edit_ips.mako:40
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35
 #: rhodecode/templates/base/issue_tracker_settings.mako:146
 #: rhodecode/templates/base/vcs_settings.mako:244
 #: rhodecode/templates/base/vcs_settings.mako:269
 #: rhodecode/templates/changeset/changeset_file_comment.mako:140
 #: rhodecode/templates/changeset/changeset_file_comment.mako:142
 #: rhodecode/templates/changeset/changeset_file_comment.mako:145
-#: rhodecode/templates/data_table/_dt_elements.mako:179
-#: rhodecode/templates/data_table/_dt_elements.mako:253
-#: rhodecode/templates/data_table/_dt_elements.mako:268
-#: rhodecode/templates/data_table/_dt_elements.mako:280
-#: rhodecode/templates/data_table/_dt_elements.mako:426
+#: rhodecode/templates/data_table/_dt_elements.mako:436
 #: rhodecode/templates/debug_style/buttons.html:132
 #: rhodecode/templates/files/files_source.mako:30
 #: rhodecode/templates/files/files_source.mako:37
 #: rhodecode/templates/files/files_source.mako:43
 msgid "Delete"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:30
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:193
 msgid "Enable or disable this integration."
 msgstr ""
 
 #: rhodecode/integrations/schema.py:37
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:174
 msgid "Short name for this integration."
 msgstr ""
 
 #: rhodecode/integrations/schema.py:39
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:176
 msgid "Integration name"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:51
 msgid "Limit integrations to to work only on the direct children repositories of this repository group (no subgroups)"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:55
 msgid "Limit to childen repos only"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:63
 msgid "Limit integrations to to work only on root level repositories"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:66
 msgid "Root repositories only"
 msgstr ""
 
 #: rhodecode/integrations/views.py:147
 msgid "{repo_name} repository"
 msgstr ""
 
 #: rhodecode/integrations/views.py:150
 msgid "{repo_group_name} repo group"
 msgstr ""
 
 #: rhodecode/integrations/views.py:153
 #: rhodecode/templates/admin/permissions/permissions.mako:36
 msgid "Global"
 msgstr ""
 
 #: rhodecode/integrations/views.py:157
 msgid "{name} integration"
 msgstr ""
 
 #: rhodecode/integrations/views.py:172
 msgid "Integration {integration_name} deleted successfully."
 msgstr ""
 
 #: rhodecode/integrations/views.py:305
 msgid "Errors exist when saving integration settings. Please check the form inputs."
 msgstr ""
 
 #: rhodecode/integrations/views.py:330
 msgid "Integration {integration_name} updated successfully."
 msgstr ""
 
-#: rhodecode/integrations/types/email.py:156
+#: rhodecode/integrations/types/email.py:157
 msgid "Recipients"
 msgstr ""
 
-#: rhodecode/integrations/types/email.py:157
+#: rhodecode/integrations/types/email.py:158
 msgid "Email addresses to send push events to"
 msgstr ""
 
-#: rhodecode/integrations/types/email.py:162
 #: rhodecode/integrations/types/email.py:163
+#: rhodecode/integrations/types/email.py:164
 msgid "Email address"
 msgstr ""
 
-#: rhodecode/integrations/types/email.py:174
+#: rhodecode/integrations/types/email.py:175
 #: rhodecode/templates/register.mako:95
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:67
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:78
 #: rhodecode/templates/admin/users/user_add.mako:86
-#: rhodecode/templates/admin/users/user_edit_profile.mako:62
+#: rhodecode/templates/admin/users/user_edit_profile.mako:65
 #: rhodecode/templates/admin/users/users.mako:76
 #: rhodecode/templates/email_templates/user_registration.mako:50
 #: rhodecode/templates/users/user_profile.mako:69
 msgid "Email"
 msgstr ""
 
-#: rhodecode/integrations/types/email.py:175
+#: rhodecode/integrations/types/email.py:176
 msgid "Send repo push summaries to a list of recipients via email"
 msgstr ""
 
-#: rhodecode/integrations/types/hipchat.py:62
-msgid "Yellow"
-msgstr ""
-
 #: rhodecode/integrations/types/hipchat.py:63
-msgid "Red"
+msgid "Yellow"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:64
-msgid "Green"
+msgid "Red"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:65
-msgid "Purple"
+msgid "Green"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:66
+msgid "Purple"
+msgstr ""
+
+#: rhodecode/integrations/types/hipchat.py:67
 msgid "Gray"
 msgstr ""
 
-#: rhodecode/integrations/types/hipchat.py:71
-msgid "Hipchat server URL"
-msgstr ""
-
 #: rhodecode/integrations/types/hipchat.py:72
+msgid "Hipchat server URL"
+msgstr ""
+
+#: rhodecode/integrations/types/hipchat.py:73
 msgid "Hipchat integration url."
 msgstr ""
 
-#: rhodecode/integrations/types/hipchat.py:82
-msgid "Notify"
-msgstr ""
-
 #: rhodecode/integrations/types/hipchat.py:83
+msgid "Notify"
+msgstr ""
+
+#: rhodecode/integrations/types/hipchat.py:84
 msgid "Make a notification to the users in room."
 msgstr ""
 
-#: rhodecode/integrations/types/hipchat.py:89
-msgid "Color"
-msgstr ""
-
 #: rhodecode/integrations/types/hipchat.py:90
+msgid "Color"
+msgstr ""
+
+#: rhodecode/integrations/types/hipchat.py:91
 msgid "Background color of message."
 msgstr ""
 
-#: rhodecode/integrations/types/hipchat.py:101
-msgid "Hipchat"
-msgstr ""
-
 #: rhodecode/integrations/types/hipchat.py:102
+msgid "Hipchat"
+msgstr ""
+
+#: rhodecode/integrations/types/hipchat.py:103
 msgid "Send events such as repo pushes and pull requests to your hipchat channel."
 msgstr ""
 
-#: rhodecode/integrations/types/slack.py:71
-msgid "Slack service URL"
-msgstr ""
-
 #: rhodecode/integrations/types/slack.py:72
+msgid "Slack service URL"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:73
 msgid "This can be setup at the <a href=\"https://my.slack.com/services/new/incoming-webhook/\">slack app manager</a>"
 msgstr ""
 
-#: rhodecode/integrations/types/slack.py:85
-#: rhodecode/integrations/types/webhook.py:79 rhodecode/templates/login.mako:44
+#: rhodecode/integrations/types/slack.py:86
+#: rhodecode/integrations/types/webhook.py:81 rhodecode/templates/login.mako:44
 #: rhodecode/templates/register.mako:48
 #: rhodecode/templates/admin/admin_log_base.mako:7
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:27
-#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:23
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:38
+#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:29
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:74
 #: rhodecode/templates/admin/users/user_add.mako:35
-#: rhodecode/templates/admin/users/user_edit_profile.mako:36
+#: rhodecode/templates/admin/users/user_edit_profile.mako:39
 #: rhodecode/templates/admin/users/users.mako:74
 #: rhodecode/templates/debug_style/login.html:36
 #: rhodecode/templates/email_templates/user_registration.mako:42
 #: rhodecode/templates/user_group/profile.mako:61
 #: rhodecode/templates/users/user_profile.mako:29
 msgid "Username"
 msgstr ""
 
-#: rhodecode/integrations/types/slack.py:86
+#: rhodecode/integrations/types/slack.py:87
 msgid "Username to show notifications coming from."
 msgstr ""
 
-#: rhodecode/integrations/types/slack.py:95
-msgid "Channel"
-msgstr ""
-
 #: rhodecode/integrations/types/slack.py:96
+msgid "Channel"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:97
 msgid "Channel to send notifications to."
 msgstr ""
 
-#: rhodecode/integrations/types/slack.py:105
-msgid "Emoji"
-msgstr ""
-
 #: rhodecode/integrations/types/slack.py:106
+msgid "Emoji"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:107
 msgid "Emoji to use eg. :studio_microphone:"
 msgstr ""
 
-#: rhodecode/integrations/types/slack.py:117
-msgid "Slack"
-msgstr ""
-
 #: rhodecode/integrations/types/slack.py:118
+msgid "Slack"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:119
 msgid "Send events such as repo pushes and pull requests to your slack channel."
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:48
+#: rhodecode/integrations/types/webhook.py:49
 msgid "Webhook URL"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:50
+#: rhodecode/integrations/types/webhook.py:51
 msgid "URL to which Webhook should submit data. If used some of the variables would trigger multiple calls, like ${branch} or ${commit_id}. Webhook will be called as many times as unique objects in data in such cases."
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:68
+#: rhodecode/integrations/types/webhook.py:70
 msgid "Secret Token"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:69
+#: rhodecode/integrations/types/webhook.py:71
 msgid "Optional string used to validate received payloads. It will be sent together with event data in JSON"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:80
+#: rhodecode/integrations/types/webhook.py:82
 msgid "Optional username to authenticate the call."
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:90
+#: rhodecode/integrations/types/webhook.py:91 rhodecode/templates/login.mako:51
+#: rhodecode/templates/register.mako:62
+#: rhodecode/templates/admin/my_account/my_account.mako:31
+#: rhodecode/templates/admin/users/user_add.mako:44
+#: rhodecode/templates/debug_style/login.html:45
+msgid "Password"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:92
 msgid "Optional password to authenticate the call."
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:100
+#: rhodecode/integrations/types/webhook.py:102
 msgid "Custom Header Key"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:101
+#: rhodecode/integrations/types/webhook.py:103
 msgid "Custom Header name to be set when calling endpoint."
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:110
+#: rhodecode/integrations/types/webhook.py:112
 msgid "Custom Header Value"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:111
+#: rhodecode/integrations/types/webhook.py:113
 msgid "Custom Header value to be set when calling endpoint."
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:120
+#: rhodecode/integrations/types/webhook.py:122
 msgid "Call Method"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:121
+#: rhodecode/integrations/types/webhook.py:123
 msgid "Select a HTTP method to use when calling the Webhook."
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:133
+#: rhodecode/integrations/types/webhook.py:135
 msgid "Webhook"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:134
+#: rhodecode/integrations/types/webhook.py:136
 msgid "send JSON data to a url endpoint"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:93
 msgid "[deleted] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114
 msgid "[created] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:99
 msgid "[created] repository as fork"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117
 msgid "[forked] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120
 msgid "[updated] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:108
 msgid "[downloaded] archive from repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:111
 msgid "[delete] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:123
 msgid "[created] user"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:126
 msgid "[updated] user"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:129
 msgid "[created] user group"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:132
 msgid "[updated] user group"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:135
 msgid "[commented] on commit in repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:138
 msgid "[commented] on pull request for"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:141
 msgid "[closed] pull request for"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:144
 msgid "[merged] pull request for"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:147
 msgid "[pushed] into"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:150
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:153
 msgid "[pulled from remote] into repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:156
 msgid "[pulled] from"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:159
 msgid "[started following] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:162
 msgid "[stopped following] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:172
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:191
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:226
 #, python-format
 msgid "Show all combined commits %s->%s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:231
 msgid "compare view"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:238
 #, python-format
 msgid " and %(num)s more commits"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:293
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:296
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:309
 msgid "Commit not found"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1672
+#: rhodecode/lib/auth.py:1760
 msgid "IP {} not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1764
+#: rhodecode/lib/auth.py:1852
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1808
+#: rhodecode/lib/auth.py:1896
 msgid "You need to be signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:902
+#: rhodecode/lib/diffs.py:903
 msgid "Click to select line"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1706
+#: rhodecode/lib/helpers.py:1721
 msgid ""
 "Example filter terms:\n"
 "     repository:vcs\n"
 "     username:marcin\n"
 "     username:(NOT marcin)\n"
 "     action:*push*\n"
 "     ip:127.0.0.1\n"
 "     date:20120101\n"
 "     date:[20120101100000 TO 20120102]\n"
 "\n"
 "Actions: {actions}\n"
 "\n"
 "Generate wildcards using '*' character:\n"
 "     \"repository:vcs*\" - search everything starting with 'vcs'\n"
 "     \"repository:*vcs*\" - search for repository containing 'vcs'\n"
 "\n"
 "Optional AND / OR operators in queries\n"
 "     \"repository:vcs OR repository:test\"\n"
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1730
+#: rhodecode/lib/helpers.py:1745
 #, python-format
 msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:542
 msgid "in ${ago}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:548
 msgid "${ago} ago"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:557
 msgid "${val}, ${detail}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:559
 msgid "${val}, ${detail} ago"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:561
 msgid "in ${val}, ${detail}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:563
 msgid "${val} and ${detail}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:565
 msgid "${val} and ${detail} ago"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:567
 msgid "in ${val} and ${detail}"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:571 rhodecode/public/js/scripts.js:25634
+#: rhodecode/lib/utils2.py:571 rhodecode/public/js/scripts.js:22115
 #: rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:111
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
 msgid "just now"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:568
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:581
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:598
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:681
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:656
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:658
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:681
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:682
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:699
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:716
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:732
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:764
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:774
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:815
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2587
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2653
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2739
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2772
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2772
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2987
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3073
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2275
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2267
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2266
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2270
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2270
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2321
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2322
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:3061
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:3079
 msgid "Repository no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:682
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:657
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:659
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:682
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:683
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:700
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:717
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:733
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:736
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2588
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2654
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2740
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2773
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2773
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2988
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3074
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2276
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2268
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2267
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2271
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2271
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2322
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2323
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:3062
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:3080
 msgid "Repository read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:658
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:660
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:684
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:701
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:718
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:734
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:739
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:739
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2589
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2655
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2741
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2774
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2774
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2989
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3075
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2269
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2268
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2272
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2272
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2323
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2324
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:3063
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:3081
 msgid "Repository write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:659
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:661
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:685
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:702
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:719
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2590
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2656
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2742
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2775
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2775
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2990
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3076
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2270
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2269
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2324
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2325
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:3064
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:3082
 msgid "Repository admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:586
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:603
 msgid "Repositories Group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604
 msgid "Repositories Group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605
 msgid "Repositories Group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606
 msgid "Repositories Group admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:591
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:608
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:691
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:654
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:656
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:679
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:680
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:697
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:714
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:730
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:733
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:735
 msgid "RhodeCode Administrator"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:692
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:677
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:679
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:702
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:703
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:720
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:785
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:795
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2608
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2679
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2765
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2798
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2798
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3013
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3099
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:3087
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:3105
 msgid "Repository creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:693
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:678
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:680
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:703
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:704
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:721
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:754
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:757
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2609
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2680
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2766
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2799
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2799
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3014
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3100
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:3088
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:3106
 msgid "Repository creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:680
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:682
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:705
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:706
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:723
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:763
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:763
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:790
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:800
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2613
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2684
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2770
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2803
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2803
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3018
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3104
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:3092
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:3110
 msgid "Repository forking disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:681
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:706
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:707
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:724
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:741
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:762
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:764
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:764
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2614
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2685
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2771
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2804
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2804
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3019
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3105
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:3093
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:3111
 msgid "Repository forking enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696
 msgid "Register disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:587
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:600
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:617
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:864
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:873
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:956
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:994
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:996
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1019
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1020
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1037
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1054
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1073
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1076
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1087
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1090
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1120
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1134
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1194
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1316
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1341
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3295
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3378
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3491
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3524
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3525
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3757
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3843
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2915
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2907
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2907
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2910
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2910
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3011
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3012
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3230 rhodecode/model/db.py:3831
-#: rhodecode/public/js/scripts.js:44680 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:320
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3230 rhodecode/model/db.py:3859
+#: rhodecode/public/js/scripts.js:41391 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:350
 msgid "Not Reviewed"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:957
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:995
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:997
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1020
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1021
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1038
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1055
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1074
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1077
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1088
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1091
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3296
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3379
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3492
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3525
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3526
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3758
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3844
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2916
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2908
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2908
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2911
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2911
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3012
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3013
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3832
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3860
 msgid "Approved"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:958
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:996
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:998
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1021
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1022
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1039
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1056
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1075
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1078
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1089
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1092
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3297
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3380
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3493
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3526
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3527
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3759
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3845
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2917
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2909
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2909
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2912
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2912
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3013
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3014
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3833
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3861
 msgid "Rejected"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:997
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:999
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1022
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1023
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1040
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1057
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1076
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1079
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1090
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1093
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3298
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3381
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3494
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3527
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3528
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3760
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3846
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2918
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2913
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2913
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3014
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3015
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3834
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3862
 msgid "Under Review"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:661
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:663
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:686
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:687
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:704
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:721
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:769
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:779
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2592
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2658
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2744
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2777
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2777
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2992
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3078
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2280
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2272
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2271
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2275
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2275
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2326
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2327
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:3066
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:3084
 msgid "Repository group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:662
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:664
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:688
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:705
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:722
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:741
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2593
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2659
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2745
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2778
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2778
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2993
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3079
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2281
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2272
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2276
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2276
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2327
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2328
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:3067
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:3085
 msgid "Repository group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:688
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:663
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:665
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:688
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:689
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:706
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:723
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:739
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2594
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2660
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2746
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2779
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2779
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2994
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3080
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2274
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2328
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2329
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:3068
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:3086
 msgid "Repository group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:689
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:664
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:666
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:689
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:690
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:707
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:724
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2595
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2661
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2747
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2780
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2780
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2995
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3081
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2283
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2275
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2274
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2329
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2330
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:3069
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:3087
 msgid "Repository group admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:666
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:668
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:691
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:692
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:709
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:726
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:774
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:784
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2597
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2663
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2749
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2782
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2782
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2997
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3083
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2276
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2280
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2280
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:3071
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:3089
 msgid "User group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:667
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:669
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:692
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:693
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:710
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:727
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:746
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2598
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2664
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2750
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2783
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2783
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2998
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3084
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2286
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2332
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2333
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:3072
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:3090
 msgid "User group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:668
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:670
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:693
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:694
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:711
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:728
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:749
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:749
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2599
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2665
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2751
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2784
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2784
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2999
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3085
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:3073
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:3091
 msgid "User group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:669
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:671
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:694
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:695
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:712
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:729
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2600
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2666
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2752
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2785
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2785
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3000
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3086
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:3074
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:3092
 msgid "User group admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:671
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:673
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:696
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:697
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:714
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:731
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:752
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:752
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:779
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:789
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2602
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2673
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2759
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2792
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2792
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3007
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3093
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:3081
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:3099
 msgid "Repository Group creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:672
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:674
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:697
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:698
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:715
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:732
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:751
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2603
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2674
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2760
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2793
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2793
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3008
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3094
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:3082
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:3100
 msgid "Repository Group creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:674
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:676
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:699
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:700
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:717
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:734
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:755
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:755
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:782
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:792
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2605
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2676
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2762
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2795
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2795
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3010
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3096
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:3084
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:3102
 msgid "User Group creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:675
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:677
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:700
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:701
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:718
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:751
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:754
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2606
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2677
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2763
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2796
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2796
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3011
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3097
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:3085
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:3103
 msgid "User Group creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:685
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:708
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:709
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:726
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:764
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:793
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:803
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2616
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2687
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2773
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2806
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2806
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3021
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3107
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:3095
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:3113
 msgid "Registration disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:686
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:709
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:710
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:727
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:762
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:765
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:767
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:767
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2617
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2688
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2774
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2807
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2807
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3022
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3108
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:3096
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:3114
 msgid "User Registration with manual account activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:685
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:710
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:711
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:728
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:763
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:768
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:768
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2618
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2689
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2775
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2808
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2808
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3023
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3109
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:3097
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:3115
 msgid "User Registration with automatic account activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:689
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:712
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:713
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:730
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:765
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:768
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:770
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:770
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:797
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:807
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2624
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2695
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2781
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2814
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2814
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3029
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3115
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3103
-#: rhodecode/model/permission.py:106
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3121
+#: rhodecode/model/permission.py:105
 msgid "Manual activation of external account"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:688
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:690
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:713
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:714
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:731
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:769
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:771
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:771
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2625
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2696
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2782
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2815
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2815
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3030
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3116
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3104
-#: rhodecode/model/permission.py:107
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3122
+#: rhodecode/model/permission.py:106
 msgid "Automatic activation of external account"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:755
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:760
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:760
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2610
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2681
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2767
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2800
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2800
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3015
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3101
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:3089
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:3107
 msgid "Repository creation enabled with write permission to a repository group"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2611
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2682
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2768
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2801
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2801
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3016
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3102
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:3090
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:3108
 msgid "Repository creation disabled with write permission to a repository group"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:762
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:772
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:813
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:813
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:814
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:814
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:942
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:967
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2585
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2651
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2737
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2770
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2770
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2985
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3071
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2265
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2264
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2268
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2268
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2319
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2320
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:3059
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:3077
 msgid "RhodeCode Super Administrator"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:810
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2627
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2698
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2784
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2817
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2817
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3032
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3118
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3106
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3124
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2628
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2699
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2785
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2818
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2818
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3033
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3119
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3107
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3125
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1107
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1118
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1120
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1120
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1137
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1189
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1195
 msgid "all"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1108
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1119
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1121
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1121
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1138
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1190
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1196
 msgid "http/web interface"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1109
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1120
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1122
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1122
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1139
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1191
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1180
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1197
 msgid "vcs (git/hg/svn protocol)"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1110
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1121
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1123
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1123
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1140
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1192
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1181
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1198
 msgid "api calls"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1111
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1122
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1124
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1124
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1141
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1193
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1199
 msgid "feed access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2348
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2414
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2488
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2511
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2511
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2638
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:2729
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2051
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2043
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2042
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2046
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2046
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2090
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2091
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2717
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2735
 msgid "No parent"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2620
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2691
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2777
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2810
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2810
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3025
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3111
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:3099
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:3117
 msgid "Password reset enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2621
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2692
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2778
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2811
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2811
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3026
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3112
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:3100
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:3118
 msgid "Password reset hidden"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2622
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2693
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2779
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2812
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2812
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3027
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3113
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:3101
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:3119
 msgid "Password reset disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2668
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2754
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2787
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2787
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3002
-#: rhodecode/model/db.py:3076
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3088
+#: rhodecode/model/db.py:3094
 msgid "Branch no permissions"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2669
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2755
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2788
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2788
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3003
-#: rhodecode/model/db.py:3077
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3089
+#: rhodecode/model/db.py:3095
 msgid "Branch access by web merge"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2670
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2756
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2789
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2789
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3004
-#: rhodecode/model/db.py:3078
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3090
+#: rhodecode/model/db.py:3096
 msgid "Branch access by push"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2671
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2757
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2790
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2790
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3005
-#: rhodecode/model/db.py:3079
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3091
+#: rhodecode/model/db.py:3097
 msgid "Branch access by push with force"
 msgstr ""
 
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1194
+#: rhodecode/model/db.py:1200
+msgid "artifacts downloads"
+msgstr ""
+
 #: rhodecode/lib/index/whoosh.py:189
 msgid "Index Type"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:192
 msgid "File Index"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:193 rhodecode/lib/index/whoosh.py:199
 msgid "Indexed documents"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:194 rhodecode/lib/index/whoosh.py:200
 msgid "Last update"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:198
 msgid "Commit index"
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:150
 msgid "This pull request can be automatically merged."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:152
 msgid "This pull request cannot be merged because of an unhandled exception. {exception}"
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:155
 msgid "This pull request cannot be merged because of merge conflicts. {unresolved_files}"
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:157
 msgid "This pull request could not be merged because push to target:`{target}@{merge_commit}` failed."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:160
 msgid "This pull request cannot be merged because the target `{target_ref.name}` is not a head."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:163
 msgid "This pull request cannot be merged because the source contains more branches than the target."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:166
 msgid "This pull request cannot be merged because the target `{target_ref.name}` has multiple heads: `{heads}`."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:169
 msgid "This pull request cannot be merged because the target repository is locked by {locked_by}."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:173
 msgid "This pull request cannot be merged because the target reference `{target_ref.name}` is missing."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:176
 msgid "This pull request cannot be merged because the source reference `{source_ref.name}` is missing."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:179
 msgid "This pull request cannot be merged because of conflicts related to sub repositories."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:184
 msgid "This pull request cannot be merged because the target or the source reference is missing."
 msgstr ""
 
 #: rhodecode/model/auth_token.py:53
 msgid "5 minutes {end_date}"
 msgstr ""
 
 #: rhodecode/model/auth_token.py:55
 msgid "1 hour {end_date}"
 msgstr ""
 
 #: rhodecode/model/auth_token.py:57
 msgid "1 day {end_date}"
 msgstr ""
 
 #: rhodecode/model/auth_token.py:59
 msgid "1 month {end_date}"
 msgstr ""
 
 #: rhodecode/model/comment.py:473
 msgid "made a comment"
 msgstr ""
 
 #: rhodecode/model/comment.py:474
 msgid "Show it now"
 msgstr ""
 
-#: rhodecode/model/db.py:1183
-msgid "artifacts downloads"
-msgstr ""
-
 #: rhodecode/model/forms.py:88
 msgid "Please enter a login"
 msgstr ""
 
 #: rhodecode/model/forms.py:89
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
 #: rhodecode/model/forms.py:99
 msgid "Please enter a password"
 msgstr ""
 
 #: rhodecode/model/forms.py:100
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/notification.py:245
+#: rhodecode/model/notification.py:246
 #, python-format
 msgid "%(user)s commented on commit %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:246
+#: rhodecode/model/notification.py:247
 #, python-format
 msgid "%(user)s commented on commit at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:249
-#, python-format
-msgid "%(user)s sent message %(date_or_age)s"
-msgstr ""
-
 #: rhodecode/model/notification.py:250
 #, python-format
+msgid "%(user)s sent message %(date_or_age)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:251
+#, python-format
 msgid "%(user)s sent message at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:253
-#, python-format
-msgid "%(user)s mentioned you %(date_or_age)s"
-msgstr ""
-
 #: rhodecode/model/notification.py:254
 #, python-format
+msgid "%(user)s mentioned you %(date_or_age)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:255
+#, python-format
 msgid "%(user)s mentioned you at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:257
-#, python-format
-msgid "%(user)s registered in RhodeCode %(date_or_age)s"
-msgstr ""
-
 #: rhodecode/model/notification.py:258
 #, python-format
+msgid "%(user)s registered in RhodeCode %(date_or_age)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:259
+#, python-format
 msgid "%(user)s registered in RhodeCode at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:261
-#, python-format
-msgid "%(user)s opened new pull request %(date_or_age)s"
-msgstr ""
-
 #: rhodecode/model/notification.py:262
 #, python-format
+msgid "%(user)s opened new pull request %(date_or_age)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:263
+#, python-format
 msgid "%(user)s opened new pull request at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:265
-#, python-format
-msgid "%(user)s updated pull request %(date_or_age)s"
-msgstr ""
-
 #: rhodecode/model/notification.py:266
 #, python-format
+msgid "%(user)s updated pull request %(date_or_age)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:267
+#, python-format
 msgid "%(user)s updated pull request at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:269
-#, python-format
-msgid "%(user)s commented on pull request %(date_or_age)s"
-msgstr ""
-
 #: rhodecode/model/notification.py:270
 #, python-format
+msgid "%(user)s commented on pull request %(date_or_age)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:271
+#, python-format
 msgid "%(user)s commented on pull request at %(date_or_age)s"
 msgstr ""
 
+#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77
+#: rhodecode/model/permission.py:83
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:207
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15
+msgid "None"
+msgstr ""
+
 #: rhodecode/model/permission.py:72 rhodecode/model/permission.py:78
 #: rhodecode/model/permission.py:84
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:197
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11
-msgid "None"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:16
+msgid "Read"
 msgstr ""
 
 #: rhodecode/model/permission.py:73 rhodecode/model/permission.py:79
 #: rhodecode/model/permission.py:85
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12
-msgid "Read"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:17
+#: rhodecode/templates/changeset/changeset_file_comment.mako:272
+#: rhodecode/templates/changeset/changeset_file_comment.mako:323
+#: rhodecode/templates/data_table/_dt_elements.mako:450
+msgid "Write"
 msgstr ""
 
 #: rhodecode/model/permission.py:74 rhodecode/model/permission.py:80
 #: rhodecode/model/permission.py:86
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13
-#: rhodecode/templates/changeset/changeset_file_comment.mako:268
-#: rhodecode/templates/changeset/changeset_file_comment.mako:319
-#: rhodecode/templates/data_table/_dt_elements.mako:440
-msgid "Write"
-msgstr ""
-
-#: rhodecode/model/permission.py:75 rhodecode/model/permission.py:81
-#: rhodecode/model/permission.py:87
 #: rhodecode/templates/admin/auth/plugin_settings.mako:12
 #: rhodecode/templates/admin/defaults/defaults.mako:12
 #: rhodecode/templates/admin/integrations/base.mako:21
 #: rhodecode/templates/admin/integrations/form.mako:15
 #: rhodecode/templates/admin/integrations/form.mako:28
 #: rhodecode/templates/admin/integrations/global.mako:12
 #: rhodecode/templates/admin/integrations/list.mako:8
 #: rhodecode/templates/admin/integrations/list.mako:14
 #: rhodecode/templates/admin/integrations/new.mako:11
 #: rhodecode/templates/admin/permissions/permissions.mako:12
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14
 #: rhodecode/templates/admin/repos/repo_add.mako:13
 #: rhodecode/templates/admin/repos/repo_add.mako:17
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:14
 #: rhodecode/templates/admin/settings/settings.mako:12
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:11
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:12
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:14
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:18
 #: rhodecode/templates/admin/users/user_add.mako:11
 #: rhodecode/templates/admin/users/user_edit.mako:12
-#: rhodecode/templates/base/base.mako:801
+#: rhodecode/templates/base/base.mako:832
 msgid "Admin"
 msgstr ""
 
+#: rhodecode/model/permission.py:89
+msgid "Protected/No Access"
+msgstr ""
+
 #: rhodecode/model/permission.py:90
-msgid "Protected/No Access"
+msgid "Web merge"
 msgstr ""
 
 #: rhodecode/model/permission.py:91
-msgid "Web merge"
+msgid "Push"
 msgstr ""
 
 #: rhodecode/model/permission.py:92
-msgid "Push"
-msgstr ""
-
-#: rhodecode/model/permission.py:93
 msgid "Force Push"
 msgstr ""
 
-#: rhodecode/model/permission.py:96 rhodecode/model/permission.py:110
-#: rhodecode/model/permission.py:114 rhodecode/model/permission.py:118
-#: rhodecode/model/permission.py:122 rhodecode/model/permission.py:126
-#: rhodecode/model/permission.py:130
+#: rhodecode/model/permission.py:95 rhodecode/model/permission.py:109
+#: rhodecode/model/permission.py:113 rhodecode/model/permission.py:117
+#: rhodecode/model/permission.py:121 rhodecode/model/permission.py:125
+#: rhodecode/model/permission.py:129
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:27
 msgid "Disabled"
 msgstr ""
 
+#: rhodecode/model/permission.py:96
+msgid "Allowed with manual account activation"
+msgstr ""
+
 #: rhodecode/model/permission.py:97
-msgid "Allowed with manual account activation"
-msgstr ""
-
-#: rhodecode/model/permission.py:98
 msgid "Allowed with automatic account activation"
 msgstr ""
 
+#: rhodecode/model/permission.py:100
+msgid "Allow password recovery"
+msgstr ""
+
 #: rhodecode/model/permission.py:101
-msgid "Allow password recovery"
+msgid "Hide password recovery link"
 msgstr ""
 
 #: rhodecode/model/permission.py:102
-msgid "Hide password recovery link"
-msgstr ""
-
-#: rhodecode/model/permission.py:103
 msgid "Disable password recovery"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:90
+#: rhodecode/model/pull_request.py:215
 msgid "Pull request update successful."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:92
+#: rhodecode/model/pull_request.py:217
 msgid "Pull request update failed because of an unknown error."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:94
+#: rhodecode/model/pull_request.py:219
 msgid "No update needed because the source and target have not changed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:96
+#: rhodecode/model/pull_request.py:221
 msgid "Pull request cannot be updated because the reference type is not supported for an update. Only Branch, Tag or Bookmark is allowed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:99
+#: rhodecode/model/pull_request.py:224
 msgid "This pull request cannot be updated because the target reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:102
+#: rhodecode/model/pull_request.py:227
 msgid "This pull request cannot be updated because the source reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1355
+#: rhodecode/model/pull_request.py:1518
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1357
+#: rhodecode/model/pull_request.py:1521
 msgid "This pull request is closed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1371
+#: rhodecode/model/pull_request.py:1535
 msgid "Pull request merging is not supported."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1390
+#: rhodecode/model/pull_request.py:1552
 msgid "Target repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1393
+#: rhodecode/model/pull_request.py:1555
 msgid "Source repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1571 rhodecode/model/scm.py:1004
+#: rhodecode/model/pull_request.py:1739 rhodecode/model/scm.py:1004
 #: rhodecode/templates/admin/my_account/my_account.mako:32
-#: rhodecode/templates/base/base.mako:633
+#: rhodecode/templates/base/base.mako:629
 #: rhodecode/templates/summary/components.mako:46
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1576
-msgid "Commit IDs"
-msgstr ""
-
-#: rhodecode/model/pull_request.py:1579
-#: rhodecode/templates/summary/components.mako:22
-msgid "Closed Branches"
-msgstr ""
-
 #: rhodecode/model/pull_request.py:1744
+msgid "Commit IDs"
+msgstr ""
+
+#: rhodecode/model/pull_request.py:1747
+#: rhodecode/templates/summary/components.mako:22
+msgid "Closed Branches"
+msgstr ""
+
+#: rhodecode/model/pull_request.py:1929
 msgid "WIP marker in title prevents from accidental merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1755
+#: rhodecode/model/pull_request.py:1939
 msgid "User `{}` not allowed to perform merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1773
+#: rhodecode/model/pull_request.py:1957
 msgid "Target branch `{}` changes rejected by rule {}."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1787
+#: rhodecode/model/pull_request.py:1971
 msgid "Pull request reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1801
+#: rhodecode/model/pull_request.py:1985
 msgid "Cannot merge, {} TODO still not resolved."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1804
+#: rhodecode/model/pull_request.py:1988
 msgid "Cannot merge, {} TODOs still not resolved."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1839
+#: rhodecode/model/pull_request.py:2043
 msgid "Merge strategy: rebase"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1844
+#: rhodecode/model/pull_request.py:2048
 msgid "Merge strategy: explicit merge commit"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1852
+#: rhodecode/model/pull_request.py:2056
 msgid "Source branch will be closed after merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1854
+#: rhodecode/model/pull_request.py:2058
 msgid "Source branch will be deleted after merge."
 msgstr ""
 
 #: rhodecode/model/validators.py:93 rhodecode/model/validators.py:94
 msgid "Value cannot be an empty list"
 msgstr ""
 
 #: rhodecode/model/validators.py:140
 msgid "Pattern already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:161
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:163
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
 #: rhodecode/model/validators.py:165
 #: rhodecode/model/validation_schema/schemas/user_schema.py:71
 msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character or underscore"
 msgstr ""
 
 #: rhodecode/model/validators.py:196
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
 #: rhodecode/model/validators.py:197
 #, python-format
 msgid "Username %(username)s is disabled"
 msgstr ""
 
 #: rhodecode/model/validators.py:222
 msgid "Invalid user group name"
 msgstr ""
 
 #: rhodecode/model/validators.py:223
 #, python-format
 msgid "User group `%(usergroup)s` already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:225
 msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
 #: rhodecode/model/validators.py:265
 msgid "Cannot assign this group as parent"
 msgstr ""
 
 #: rhodecode/model/validators.py:266
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:267
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:269
 msgid "no permission to store repository groupin this location"
 msgstr ""
 
 #: rhodecode/model/validators.py:271
 msgid "no permission to store repository group in root location"
 msgstr ""
 
 #: rhodecode/model/validators.py:388
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
 #: rhodecode/model/validators.py:407
 msgid "Passwords do not match"
 msgstr ""
 
 #: rhodecode/model/validators.py:427
 msgid "invalid password"
 msgstr ""
 
 #: rhodecode/model/validators.py:428
 msgid "invalid user name"
 msgstr ""
 
 #: rhodecode/model/validators.py:429
 msgid "Your account is disabled"
 msgstr ""
 
 #: rhodecode/model/validators.py:465
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr ""
 
 #: rhodecode/model/validators.py:467
 #, python-format
 msgid "Repository with name %(repo)s already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:469
 #, python-format
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:472
 #, python-format
 msgid "Repository with name %(repo)s exists in group \"%(group)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:474
 #, python-format
 msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:567
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:230
 msgid "Repository name cannot end with .git"
 msgstr ""
 
 #: rhodecode/model/validators.py:627
 #, python-format
 msgid "invalid clone url for %(rtype)s repository"
 msgstr ""
 
 #: rhodecode/model/validators.py:628
 #, python-format
 msgid "Invalid clone url, provide a valid clone url starting with one of %(allowed_prefixes)s"
 msgstr ""
 
 #: rhodecode/model/validators.py:660
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
 #: rhodecode/model/validators.py:677
 msgid "You do not have the permission to create repositories in this group."
 msgstr ""
 
 #: rhodecode/model/validators.py:680
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:136
 msgid "You do not have the permission to store repositories in the root location."
 msgstr ""
 
 #: rhodecode/model/validators.py:740
 msgid "This username or user group name is not valid"
 msgstr ""
 
 #: rhodecode/model/validators.py:853
 msgid "This is not a valid path"
 msgstr ""
 
 #: rhodecode/model/validators.py:871
 #: rhodecode/model/validation_schema/schemas/user_schema.py:144
 #: rhodecode/model/validation_schema/schemas/user_schema.py:148
 msgid "This e-mail address is already taken"
 msgstr ""
 
 #: rhodecode/model/validators.py:893
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
 #: rhodecode/model/validators.py:914
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
 #: rhodecode/model/validators.py:947
 #: rhodecode/model/validation_schema/validators.py:41
 #: rhodecode/model/validation_schema/validators.py:54
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
 #: rhodecode/model/validators.py:948
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
 #: rhodecode/model/validators.py:976
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 
 #: rhodecode/model/validators.py:993
 #, python-format
 msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
 msgstr ""
 
 #: rhodecode/model/validators.py:996
 #, python-format
 msgid "The plugin \"%(plugin_id)s\" is missing an includeme function."
 msgstr ""
 
 #: rhodecode/model/validators.py:999
 #, python-format
 msgid "Can not load plugin \"%(plugin_id)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:1001
 #, python-format
 msgid "No plugin available with ID \"%(plugin_id)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:1069
 msgid "Url must start with http or /"
 msgstr ""
 
 #: rhodecode/model/validation_schema/validators.py:62
 msgid "Invalid glob pattern"
 msgstr ""
 
 #: rhodecode/model/validation_schema/validators.py:71
 msgid "Name must start with a letter or number. Got `{}`"
 msgstr ""
 
 #: rhodecode/model/validation_schema/validators.py:142
 msgid "invalid clone url for {repo_type} repository"
 msgstr ""
 
 #: rhodecode/model/validation_schema/validators.py:151
 msgid "Please enter a valid json object"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/comment_schema.py:42
 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89
 msgid "Gist with name {} already exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/comment_schema.py:48
 #: rhodecode/model/validation_schema/schemas/gist_schema.py:95
 msgid "Filename {} cannot be inside a directory"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/gist_schema.py:132
 msgid "Duplicated value for filename found: `{}`"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:36
 msgid "Pick a scope:"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:39
 msgid "Global (all repositories)"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:40
 msgid "Top level repositories only"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:79
 msgid "Only repo admins can create integrations"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:86
 msgid "Only repogroup admins can create integrations"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:91
 msgid "Only superadmins can create global integrations"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:181
 msgid "Scope of the integration. Recursive means the integration  runs on all repos of that group and children recursively."
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:184
 msgid "Integration scope"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:214
 msgid "General integration options"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:217
 msgid "{integration_type} settings"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56
 msgid "Parent repository group `{}` does not exist"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:58
 msgid "You do not have the permission to store repository groups in the root location."
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:118
 msgid "Repo group owner with id `{}` does not exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:215
 msgid "Repository with name `{}` already exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:220
 msgid "Repository group with name `{}` already exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:60
 msgid "Repo owner with id `{}` does not exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:102
 msgid "Fork with id `{}` does not exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:105
 msgid "Cannot set fork of parameter of this repository to itself"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:130
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:134
 msgid "Repository group `{}` does not exist"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_group_schema.py:32
 msgid "Allowed in name are letters, numbers, and `-`, `_`, `.` Name must start with a letter or number. Got `{}`"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_group_schema.py:48
 msgid "User group owner with id `{}` does not exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_schema.py:39
 msgid "Password is incorrect"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_schema.py:62
 msgid "New password must be different to old password"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_schema.py:183
 msgid "Additional emails can be specified at <a href=\"{}\">extra emails</a> page."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:19
-msgid ": , "
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:24109 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
+#: rhodecode/public/js/scripts.js:20588 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87
 msgid "No results"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25569 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:130
+#: rhodecode/public/js/scripts.js:22050 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:144
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109
 msgid "{0} year"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25570 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:120
+#: rhodecode/public/js/scripts.js:22051 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:132
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110
 msgid "{0} month"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25571 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:115
+#: rhodecode/public/js/scripts.js:22052 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:127
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111
 msgid "{0} day"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25572 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:117
+#: rhodecode/public/js/scripts.js:22053 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:129
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112
 msgid "{0} hour"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25573 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:119
+#: rhodecode/public/js/scripts.js:22054 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:131
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113
 msgid "{0} min"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25574 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:127
+#: rhodecode/public/js/scripts.js:22055 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:141
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114
 msgid "{0} sec"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25594 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
+#: rhodecode/public/js/scripts.js:22075 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134
 msgid "in {0}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25602 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112
+#: rhodecode/public/js/scripts.js:22083 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:124
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142
 msgid "{0} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25614 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:132
+#: rhodecode/public/js/scripts.js:22095 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:146
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154
 msgid "{0}, {1} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25616 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
+#: rhodecode/public/js/scripts.js:22097 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156
 msgid "in {0}, {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25620 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113
+#: rhodecode/public/js/scripts.js:22101 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:125
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160
 msgid "{0} and {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25622 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:114
+#: rhodecode/public/js/scripts.js:22103 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:126
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162
 msgid "{0} and {1} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25624 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
+#: rhodecode/public/js/scripts.js:22105 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164
 msgid "in {0} and {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40622 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
+#: rhodecode/public/js/scripts.js:37103 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4
 msgid "Loading more results..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40625 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
+#: rhodecode/public/js/scripts.js:37106 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7
 msgid "Searching..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40628 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
+#: rhodecode/public/js/scripts.js:37109 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10
 msgid "No matches found"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40631 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
+#: rhodecode/public/js/scripts.js:37112 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13
 msgid "Loading failed"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40635 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
+#: rhodecode/public/js/scripts.js:37116 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17
 msgid "One result is available, press enter to select it."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40637 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:126
+#: rhodecode/public/js/scripts.js:37118 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:140
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19
 msgid "{0} results are available, use up and down arrow keys to navigate."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40642 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
+#: rhodecode/public/js/scripts.js:37123 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24
 msgid "Please enter {0} or more character"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40644 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
+#: rhodecode/public/js/scripts.js:37125 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26
 msgid "Please enter {0} or more characters"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40649 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
+#: rhodecode/public/js/scripts.js:37130 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31
 msgid "Please delete {0} character"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40651 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
+#: rhodecode/public/js/scripts.js:37132 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33
 msgid "Please delete {0} characters"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40655 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86
+#: rhodecode/public/js/scripts.js:37136 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37
 msgid "You can only select {0} item"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40657 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
+#: rhodecode/public/js/scripts.js:37138 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39
 msgid "You can only select {0} items"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41595 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104
+#: rhodecode/public/js/scripts.js:37780 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/utils/ajax.js:136
+msgid "Ajax Request Error"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:38178 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:116
 #: rhodecode/public/js/src/rhodecode/changelog.js:35
 msgid "showing {0} out of {1} commit"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41597 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105
+#: rhodecode/public/js/scripts.js:38180 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:117
 #: rhodecode/public/js/src/rhodecode/changelog.js:37
 msgid "showing {0} out of {1} commits"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42136 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
+#: rhodecode/public/js/scripts.js:38718 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
 #: rhodecode/public/js/src/rhodecode/codemirror.js:363
 msgid "Set status to Approved"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42156 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
+#: rhodecode/public/js/scripts.js:38738 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
 #: rhodecode/public/js/src/rhodecode/codemirror.js:383
 msgid "Set status to Rejected"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42175 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
+#: rhodecode/public/js/scripts.js:38757 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88
 #: rhodecode/public/js/src/rhodecode/codemirror.js:402
 msgid "TODO comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42195 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
+#: rhodecode/public/js/scripts.js:38777 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
 #: rhodecode/public/js/src/rhodecode/codemirror.js:422
 msgid "Note Comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42496 rhodecode/public/js/scripts.js:42850
+#: rhodecode/public/js/scripts.js:39078 rhodecode/public/js/scripts.js:39432
 #: rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
 #: rhodecode/public/js/src/rhodecode/codemirror.js:723
 #: rhodecode/public/js/src/rhodecode/comments.js:233
 msgid "Status Review"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42511 rhodecode/public/js/scripts.js:42865
+#: rhodecode/public/js/scripts.js:39093 rhodecode/public/js/scripts.js:39447
 #: rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
 #: rhodecode/public/js/src/rhodecode/codemirror.js:738
 #: rhodecode/public/js/src/rhodecode/comments.js:248
 msgid "Comment text will be set automatically based on currently selected status ({0}) ..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42592 rhodecode/public/js/scripts.js:43061
-#: rhodecode/public/js/scripts.js:44066 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
+#: rhodecode/public/js/scripts.js:39174 rhodecode/public/js/scripts.js:39642
+#: rhodecode/public/js/scripts.js:40669 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36
 #: rhodecode/public/js/src/rhodecode/codemirror.js:819
-#: rhodecode/public/js/src/rhodecode/comments.js:444
-#: rhodecode/public/js/src/rhodecode/files.js:495
-#: rhodecode/templates/files/files_browser_tree.mako:55
+#: rhodecode/public/js/src/rhodecode/comments.js:443
+#: rhodecode/public/js/src/rhodecode/files.js:499
+#: rhodecode/templates/files/files_browser_tree.mako:54
 msgid "Loading ..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42766 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
+#: rhodecode/public/js/scripts.js:39348 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:115
 #: rhodecode/public/js/src/rhodecode/comments.js:149
 msgid "resolve comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43010 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
-#: rhodecode/public/js/src/rhodecode/comments.js:393
+#: rhodecode/public/js/scripts.js:39591 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
+#: rhodecode/public/js/src/rhodecode/comments.js:392
 msgid "Submitting..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43175 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
-#: rhodecode/public/js/src/rhodecode/comments.js:560
-msgid "Delete this comment?"
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:43249 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
-msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}"
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:43415 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
-#: rhodecode/public/js/src/rhodecode/comments.js:800
+#: rhodecode/public/js/scripts.js:39794 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/comments.js:595
+msgid "Yes, delete comment #{0}!"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39849 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
+#: rhodecode/public/js/src/rhodecode/comments.js:650
+msgid "Leave a resolution comment, or click resolve button to resolve TODO comment #{0}"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:40015 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32
+#: rhodecode/public/js/src/rhodecode/comments.js:816
 msgid "Leave a comment on line {0}."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43541 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77
-#: rhodecode/public/js/src/rhodecode/comments.js:926
+#: rhodecode/public/js/scripts.js:40140 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
+#: rhodecode/public/js/src/rhodecode/comments.js:941
 msgid "TODO from comment {0} was fixed."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43819 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
+#: rhodecode/public/js/scripts.js:40418 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:119
 #: rhodecode/public/js/src/rhodecode/files.js:248
 msgid "truncated result"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43821 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
+#: rhodecode/public/js/scripts.js:40420 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:120
 #: rhodecode/public/js/src/rhodecode/files.js:250
 msgid "truncated results"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43830 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
+#: rhodecode/public/js/scripts.js:40429 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
 #: rhodecode/public/js/src/rhodecode/files.js:259
 msgid "No matching files"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43888 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
+#: rhodecode/public/js/scripts.js:40487 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
 #: rhodecode/public/js/src/rhodecode/files.js:317
 msgid "Selection link"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43981 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:40584 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
-#: rhodecode/public/js/src/rhodecode/files.js:410
+#: rhodecode/public/js/src/rhodecode/files.js:414
 msgid "All Authors"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44117 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
+#: rhodecode/public/js/scripts.js:40734 rhodecode/public/js/scripts.js:40737
+#: rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/files.js:564
+#: rhodecode/public/js/src/rhodecode/files.js:567
+msgid "File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:40740 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/files.js:570
+msgid "There is an existing path `{0}` at this commit."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:40743 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/files.js:573
+msgid "There is a later version of file tree available. Click {0} to create a file at the latest tree."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:40797 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
 #: rhodecode/public/js/src/rhodecode/followers.js:26
 msgid "Stopped watching this repository"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44118 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
+#: rhodecode/public/js/scripts.js:40798 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
 #: rhodecode/public/js/src/rhodecode/followers.js:27
 #: rhodecode/templates/base/base.mako:301
 msgid "Watch"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44121 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
+#: rhodecode/public/js/scripts.js:40801 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
 #: rhodecode/public/js/src/rhodecode/followers.js:30
 msgid "Started watching this repository"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44122 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
+#: rhodecode/public/js/scripts.js:40802 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93
 #: rhodecode/public/js/src/rhodecode/followers.js:31
 #: rhodecode/templates/base/base.mako:299
 msgid "Unwatch"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44495 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:41182 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:135
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:141
 msgid "All reviewers must vote."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44504 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:41191 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:144
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:150
 msgid "All individual reviewers must vote."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44509 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:149
-msgid "At least {0} reviewer must vote."
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:44515 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:41196 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:155
+msgid "At least {0} reviewer must vote."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41202 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:161
 msgid "At least {0} reviewers must vote."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44531 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:171
+#: rhodecode/public/js/scripts.js:41218 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:177
 msgid "Reviewers picked from source code changes."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44538 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:41225 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:178
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:184
 msgid "Adding new reviewers is forbidden."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44545 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:185
+#: rhodecode/public/js/scripts.js:41232 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:191
 msgid "Author is not allowed to be a reviewer."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44559 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:199
+#: rhodecode/public/js/scripts.js:41246 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:205
 msgid "Commit Authors are not allowed to be a reviewer."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44667 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:307
+#: rhodecode/public/js/scripts.js:41268 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:227
+msgid "Loading diff ..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41307 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:266
+msgid "no commits"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41378 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:337
 msgid "User `{0}` not allowed to be a reviewer"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44673 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:313
+#: rhodecode/public/js/scripts.js:41384 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:343
 msgid "User `{0}` already in reviewers"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44773 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:413
+#: rhodecode/public/js/scripts.js:41487 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:446
 msgid "added manually by \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44777 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:417
+#: rhodecode/public/js/scripts.js:41491 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:450
 msgid "member of \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44953 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:608
+#: rhodecode/public/js/scripts.js:41682 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:641
 msgid "Updating..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44963 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:618
+#: rhodecode/public/js/scripts.js:41692 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:651
 msgid "Force updating..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:49591 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93
+#: rhodecode/public/js/scripts.js:46140 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/users.js:54
+msgid "Show this authentication token?"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:46142 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/users.js:56
+msgid "Show"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:46178 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/users.js:92
+msgid "Authentication Token"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:46367 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105
 #: rhodecode/public/js/src/rhodecode.js:144
 msgid "file"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:49735 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:46511 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
 #: rhodecode/public/js/src/rhodecode.js:288
 msgid "Loading..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:50104 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90
-#: rhodecode/public/js/src/rhodecode.js:657
+#: rhodecode/public/js/scripts.js:46884 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102
+#: rhodecode/public/js/src/rhodecode.js:661
 msgid "date not in future"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:50112 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
-#: rhodecode/public/js/src/rhodecode.js:665
+#: rhodecode/public/js/scripts.js:46892 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
+#: rhodecode/public/js/src/rhodecode.js:669
 msgid "Specified expiration date"
 msgstr ""
 
+#: rhodecode/public/js/scripts.min.js:1
+msgid "action"
+msgstr ""
+
+#: rhodecode/public/js/scripts.min.js:1
+msgid "target"
+msgstr ""
+
+#: rhodecode/public/js/scripts.min.js:1
+msgid "text"
+msgstr ""
+
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2
 msgid "(from usergroup {0})"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
-#: rhodecode/templates/codeblocks/diffs.mako:594
-#: rhodecode/templates/codeblocks/diffs.mako:598
+#: rhodecode/templates/codeblocks/diffs.mako:606
+#: rhodecode/templates/codeblocks/diffs.mako:610
 msgid "Add another comment"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
-msgid "Changed files"
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
+msgid "Are you sure to close this pull request without merging?"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
+msgid "Changed files"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
 #: rhodecode/public/js/src/i18n_messages.js:5
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:288
 msgid "Close"
 msgstr ""
 
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
+#: rhodecode/templates/codeblocks/diffs.mako:131
+msgid "Collapse all files"
+msgstr ""
+
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
-msgid "Context file: "
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
-msgid "Diff to Commit "
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
-msgid "Fetching repository state failed. Error code: {0} {1}. Try <a href=\"{2}\">refreshing</a> this page."
+msgid "Collapse {0} commit"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
+msgid "Collapse {0} commits"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
-msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page."
+msgid "Context file: "
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
-msgid "Follow"
+msgid "Delete this comment?"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
-msgid "Hide full context diff"
+msgid "Diff to Commit "
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
-msgid "Hide whitespace changes"
+#: rhodecode/templates/codeblocks/diffs.mako:129
+msgid "Expand all files"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
-#: rhodecode/public/js/src/i18n_messages.js:4
-msgid "Invite reviewers to this discussion"
+msgid "Expand {0} commit"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
+msgid "Expand {0} commits"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
+msgid "Fetching repository state failed. Error code: {0} {1}. Try <a href=\"{2}\">refreshing</a> this page."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
+msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
+msgid "Follow"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
+msgid "Hide full context diff"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30
-msgid "No bookmarks available yet."
+msgid "Hide whitespace changes"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31
-msgid "No branches available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32
-msgid "No forks available yet."
+#: rhodecode/public/js/src/i18n_messages.js:4
+msgid "Invite reviewers to this discussion"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
-msgid "No gists available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36
-msgid "No pull requests available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37
-msgid "No repositories available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
-msgid "No repository groups available yet."
+msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:40
-msgid "No ssh keys available yet."
+msgid "No bookmarks available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
-msgid "No tags available yet."
+msgid "No branches available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:42
-msgid "No user groups available yet."
+msgid "No forks available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:43
-msgid "No users available yet."
+msgid "No gists available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
+msgid "No pull requests available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
-#: rhodecode/templates/commits/changelog.mako:78
-msgid "Open new pull request"
+msgid "No repositories available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
-msgid "Open new pull request for selected commit"
+msgid "No repositories present."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
+msgid "No repository groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
+msgid "No repository groups present."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
+msgid "No ssh keys available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
+msgid "No tags available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
-msgid "Saving..."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
-#: rhodecode/public/js/src/i18n_messages.js:6
-#: rhodecode/templates/admin/settings/settings_email.mako:50
-msgid "Send"
+msgid "No user groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
+msgid "No users available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
+#: rhodecode/templates/commits/changelog.mako:78
+msgid "Open new pull request"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
-msgid "Show at Commit "
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
-msgid "Show commit range {0} ... {1}"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
-msgid "Show full context diff"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:39
-msgid "Show more"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
-msgid "Show selected commit __S"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
-msgid "Show selected commits __S ... __E"
+msgid "Open new pull request for selected commit"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
-msgid "Show whitespace changes"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
-msgid "Start following this repository"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
-msgid "Stop following this repository"
+msgid "Saving..."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
+#: rhodecode/public/js/src/i18n_messages.js:6
+#: rhodecode/templates/admin/settings/settings_email.mako:50
+msgid "Send"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
+msgid "Show at Commit "
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
+msgid "Show commit range {0} ... {1}"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:74
-#: rhodecode/public/js/src/i18n_messages.js:7
-msgid "Switch to chat"
+msgid "Show full context diff"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:75
-#: rhodecode/public/js/src/i18n_messages.js:8
-msgid "Switch to comment"
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:40
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
+msgid "Show selected commit __S"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77
+msgid "Show selected commits __S ... __E"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:78
-msgid "There are currently no open pull requests requiring your participation."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
-msgid "Toggle Wide Mode diff"
+msgid "Show whitespace changes"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:80
-msgid "Unfollow"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88
-#: rhodecode/templates/admin/auth/auth_settings.mako:69
-msgid "activated"
+msgid "Start following this repository"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
+msgid "Stop following this repository"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86
+#: rhodecode/public/js/src/i18n_messages.js:7
+msgid "Switch to chat"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
+#: rhodecode/public/js/src/i18n_messages.js:8
+msgid "Switch to comment"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90
+msgid "There are currently no open pull requests requiring your participation."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:91
-msgid "disabled"
+msgid "Toggle Wide Mode diff"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:92
-msgid "enabled"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
-msgid "files"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95
-msgid "go to numeric commit"
+msgid "Unfollow"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:100
-#: rhodecode/templates/pullrequests/pullrequest.mako:136
-msgid "loading..."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102
 #: rhodecode/templates/admin/auth/auth_settings.mako:69
-msgid "not active"
+msgid "activated"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104
+msgid "enabled"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:106
-msgid "specify commit"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109
-msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
-msgid "{0} ({1} inactive) of {2} users ({3} inactive)"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:111
-msgid "{0} active out of {1} users"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:116
-msgid "{0} days"
+msgid "files"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
+msgid "go to numeric commit"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112
+#: rhodecode/templates/index_base.mako:27
+#: rhodecode/templates/pullrequests/pullrequest.mako:136
+msgid "loading..."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:114
+#: rhodecode/templates/admin/auth/auth_settings.mako:69
+msgid "not active"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:118
-msgid "{0} hours"
+msgid "specify commit"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:121
-msgid "{0} months"
+msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:122
-msgid "{0} of {1} repository groups"
+msgid "{0} ({1} inactive) of {2} users ({3} inactive)"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:123
-msgid "{0} out of {1} ssh keys"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:124
-msgid "{0} out of {1} users"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:125
-msgid "{0} repository groups"
+msgid "{0} active out of {1} users"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:128
+msgid "{0} days"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:130
+msgid "{0} hours"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:133
+msgid "{0} months"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:134
+msgid "{0} of {1} repositories"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:135
+msgid "{0} of {1} repository groups"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:136
+msgid "{0} out of {1} ssh keys"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:137
+msgid "{0} out of {1} users"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:138
+msgid "{0} repositories"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:139
+msgid "{0} repository groups"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:142
 msgid "{0} user groups ({1} inactive)"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:129
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:143
 msgid "{0} users ({1} inactive)"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:131
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:145
 msgid "{0} years"
 msgstr ""
 
 #: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19
 msgid "HelpDialog"
 msgstr ""
 
 #: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19
 msgid "MathML"
 msgstr ""
 
-#: rhodecode/public/js/src/rhodecode/comments.js:634
-msgid "Leave a resolution comment, or click resolve button to resolve TODO comment #{0}"
-msgstr ""
-
 #: rhodecode/templates/index.mako:5
 msgid "Dashboard"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:20
+#: rhodecode/templates/index_base.mako:21
 msgid "No repositories or repositories groups exists here."
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:62
-#: rhodecode/templates/index_base.mako:153
+#: rhodecode/templates/index_base.mako:80
+#: rhodecode/templates/index_base.mako:167
 #: rhodecode/templates/admin/gists/gist_index.mako:107
 #: rhodecode/templates/admin/integrations/list.mako:72
 #: rhodecode/templates/admin/my_account/my_account_repos.mako:28
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:39
 #: rhodecode/templates/admin/my_account/my_account_watched.mako:28
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:74
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16
 #: rhodecode/templates/admin/repos/repos.mako:76
 #: rhodecode/templates/admin/user_groups/user_groups.mako:76
-#: rhodecode/templates/admin/users/user_edit_groups.mako:54
+#: rhodecode/templates/admin/users/user_edit_groups.mako:57
 #: rhodecode/templates/base/perms_summary.mako:168
 #: rhodecode/templates/base/perms_summary.mako:242
 #: rhodecode/templates/bookmarks/bookmarks.mako:57
 #: rhodecode/templates/branches/branches.mako:56
 #: rhodecode/templates/files/files_browser_tree.mako:13
 #: rhodecode/templates/tags/tags.mako:57
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:71
-#: rhodecode/templates/index_base.mako:162
+#: rhodecode/templates/index_base.mako:89
+#: rhodecode/templates/index_base.mako:176
 #: rhodecode/templates/admin/gists/gist_index.mako:109
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:72
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:57
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:21
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:68
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:57
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:58
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:44
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:53
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:77
-#: rhodecode/templates/admin/repos/repo_add_base.mako:66
-#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29
+#: rhodecode/templates/admin/repos/repo_add_base.mako:83
+#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:30
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:170
 #: rhodecode/templates/admin/repos/repos.mako:84
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:42
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:46
 #: rhodecode/templates/admin/user_groups/user_groups.mako:78
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:72
-#: rhodecode/templates/admin/users/user_edit_groups.mako:59
-#: rhodecode/templates/admin/users/user_edit_ips.mako:12
-#: rhodecode/templates/admin/users/user_edit_profile.mako:71
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:52
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85
+#: rhodecode/templates/admin/users/user_edit_groups.mako:62
+#: rhodecode/templates/admin/users/user_edit_ips.mako:17
+#: rhodecode/templates/admin/users/user_edit_profile.mako:74
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:15
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57
 #: rhodecode/templates/base/issue_tracker_settings.mako:78
-#: rhodecode/templates/compare/compare_commits.mako:21
+#: rhodecode/templates/compare/compare_commits.mako:19
 #: rhodecode/templates/email_templates/pull_request_review.mako:43
 #: rhodecode/templates/email_templates/pull_request_review.mako:123
 #: rhodecode/templates/email_templates/pull_request_update.mako:43
 #: rhodecode/templates/email_templates/pull_request_update.mako:135
 #: rhodecode/templates/forks/fork.mako:56
 #: rhodecode/templates/forks/forks.mako:62
 #: rhodecode/templates/pullrequests/pullrequest.mako:50
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:547
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:562
 #: rhodecode/templates/summary/components.mako:159
 #: rhodecode/templates/user_group/profile.mako:25
 #: rhodecode/templates/users/user_profile.mako:59
 msgid "Description"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:78
-#: rhodecode/templates/index_base.mako:169
+#: rhodecode/templates/index_base.mako:96
+#: rhodecode/templates/index_base.mako:183
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:80
 #: rhodecode/templates/admin/repos/repos.mako:91
 msgid "Last Change"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:91
-#: rhodecode/templates/index_base.mako:182
+#: rhodecode/templates/index_base.mako:109
+#: rhodecode/templates/index_base.mako:196
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:8
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:84
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:152
 #: rhodecode/templates/admin/repos/repos.mako:104
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:28
 #: rhodecode/templates/admin/user_groups/user_groups.mako:86
-#: rhodecode/templates/admin/users/user_edit_groups.mako:65
+#: rhodecode/templates/admin/users/user_edit_groups.mako:68
 #: rhodecode/templates/forks/forks.mako:58
 #: rhodecode/templates/summary/components.mako:148
 #: rhodecode/templates/user_group/profile.mako:35
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:176
+#: rhodecode/templates/index_base.mako:190
 #: rhodecode/templates/admin/repos/repos.mako:98
 #: rhodecode/templates/bookmarks/bookmarks.mako:64
 #: rhodecode/templates/branches/branches.mako:63
-#: rhodecode/templates/compare/compare_commits.mako:19
+#: rhodecode/templates/compare/compare_commits.mako:17
 #: rhodecode/templates/email_templates/commit_comment.mako:56
 #: rhodecode/templates/email_templates/commit_comment.mako:109
 #: rhodecode/templates/email_templates/commit_comment.mako:135
 #: rhodecode/templates/files/file_authors_box.mako:28
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:545
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:560
 #: rhodecode/templates/search/search_commit.mako:9
 #: rhodecode/templates/summary/components.mako:117
 #: rhodecode/templates/summary/components.mako:125
 #: rhodecode/templates/summary/summary_commits.mako:8
 #: rhodecode/templates/tags/tags.mako:64
 msgid "Commit"
 msgstr ""
 
 #: rhodecode/templates/index_repo_group.mako:5
 #, python-format
 msgid "%s Repository group dashboard"
 msgstr ""
 
 #: rhodecode/templates/index_repo_group.mako:13
-#: rhodecode/templates/base/base.mako:773
-#: rhodecode/templates/base/base.mako:774
+#: rhodecode/templates/base/base.mako:804
+#: rhodecode/templates/base/base.mako:805
 msgid "Home"
 msgstr ""
 
 #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:91
 #: rhodecode/templates/debug_style/login.html:60
 msgid "Sign In"
 msgstr ""
 
 #: rhodecode/templates/login.mako:39
 msgid "Sign In using username/password"
 msgstr ""
 
 #: rhodecode/templates/login.mako:53
 msgid "Forgot your password?"
 msgstr ""
 
 #: rhodecode/templates/login.mako:66
 msgid "Remember my indefinitely"
 msgstr ""
 
 #: rhodecode/templates/login.mako:68
 msgid "Remember me for {}"
 msgstr ""
 
 #: rhodecode/templates/login.mako:74
 msgid "Create a new account."
 msgstr ""
 
 #: rhodecode/templates/login.mako:81
 msgid "Password reset is disabled."
 msgstr ""
 
 #: rhodecode/templates/login.mako:82
 msgid "Please contact "
 msgstr ""
 
 #: rhodecode/templates/login.mako:84 rhodecode/templates/password_reset.mako:39
 #: rhodecode/templates/base/base.mako:59
 msgid "Support"
 msgstr ""
 
 #: rhodecode/templates/login.mako:85 rhodecode/templates/password_reset.mako:40
 msgid "or"
 msgstr ""
 
 #: rhodecode/templates/login.mako:87 rhodecode/templates/password_reset.mako:42
 msgid "an administrator if you need help."
 msgstr ""
 
 #: rhodecode/templates/login.mako:91
 msgid "Sign in to {}"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:5
 msgid "Reset Password"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:37
 msgid "Password reset is disabled. Please contact "
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:49
 msgid "Reset your Password"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:50
 msgid "Go to the login page to sign in."
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:54
 msgid "Email Address"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:60
 msgid "Password reset link will be sent to matching email address"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:64
 #: rhodecode/templates/register.mako:104
 msgid "Captcha"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:75
 msgid "Send password reset email"
 msgstr ""
 
 #: rhodecode/templates/register.mako:5
 msgid "Create an Account"
 msgstr ""
 
 #: rhodecode/templates/register.mako:38
 msgid "Create an account linked with {}"
 msgstr ""
 
 #: rhodecode/templates/register.mako:40
 msgid "Create an account"
 msgstr ""
 
 #: rhodecode/templates/register.mako:43
 msgid "Go to the login page to sign in with an existing account."
 msgstr ""
 
 #: rhodecode/templates/register.mako:69
 msgid "Re-enter password"
 msgstr ""
 
 #: rhodecode/templates/register.mako:81
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:37
-#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:32
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:48
+#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:38
 #: rhodecode/templates/admin/users/user_add.mako:68
-#: rhodecode/templates/admin/users/user_edit_profile.mako:44
+#: rhodecode/templates/admin/users/user_edit_profile.mako:47
 #: rhodecode/templates/admin/users/users.mako:78
 msgid "First Name"
 msgstr ""
 
 #: rhodecode/templates/register.mako:88
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:47
-#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:41
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:58
+#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:47
 #: rhodecode/templates/admin/users/user_add.mako:77
-#: rhodecode/templates/admin/users/user_edit_profile.mako:53
+#: rhodecode/templates/admin/users/user_edit_profile.mako:56
 #: rhodecode/templates/admin/users/users.mako:80
 msgid "Last Name"
 msgstr ""
 
 #: rhodecode/templates/register.mako:116
 msgid "Account activation requires admin approval."
 msgstr ""
 
 #: rhodecode/templates/register.mako:123
 msgid "Create Account"
 msgstr ""
 
 #: rhodecode/templates/register.mako:123
 msgid "Create Account in {}"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:6
 msgid "Admin audit log entry"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:26
 msgid "Audit long entry"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:34
 #: rhodecode/templates/users/user.mako:4
 msgid "User"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:46
 #: rhodecode/templates/admin/admin_log_base.mako:11
 #: rhodecode/templates/bookmarks/bookmarks.mako:59
 #: rhodecode/templates/branches/branches.mako:58
 #: rhodecode/templates/tags/tags.mako:59
 msgid "Date"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:54
 #: rhodecode/templates/admin/admin_log_base.mako:12
 msgid "IP"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:63
 #: rhodecode/templates/admin/admin_log_base.mako:8
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:19
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:25
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:13
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:86
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13
 #: rhodecode/templates/admin/repos/repos.mako:116
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:75
 #: rhodecode/templates/admin/user_groups/user_groups.mako:88
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:19
-#: rhodecode/templates/admin/users/user_edit_groups.mako:73
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:13
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:30
+#: rhodecode/templates/admin/users/user_edit_groups.mako:76
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:18
 #: rhodecode/templates/admin/users/users.mako:91
 #: rhodecode/templates/forks/forks.mako:69
 msgid "Action"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:81
 #: rhodecode/templates/admin/admin_log_base.mako:9
 msgid "Action Data"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:89
 #: rhodecode/templates/admin/admin_log_base.mako:47
 msgid "data not available for v1 entries type"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:95
 #: rhodecode/templates/admin/admin_log_base.mako:10
 #: rhodecode/templates/admin/defaults/defaults.mako:32
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:16
+#: rhodecode/templates/base/base.mako:649
+#: rhodecode/templates/base/base.mako:651
 #: rhodecode/templates/base/base.mako:653
-#: rhodecode/templates/base/base.mako:655
-#: rhodecode/templates/base/base.mako:657
 #: rhodecode/templates/search/search_commit.mako:8
 #: rhodecode/templates/search/search_path.mako:7
 msgid "Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:5
 #: rhodecode/templates/base/base.mako:106
 msgid "Admin audit logs"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:25
 msgid "filter..."
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:26
 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:15
-#: rhodecode/templates/admin/users/user_edit_audit.mako:16
+#: rhodecode/templates/admin/users/user_edit_audit.mako:18
 #: rhodecode/templates/journal/journal.mako:13
 msgid "filter"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:27
 #: rhodecode/templates/admin/repos/repo_edit.mako:91
 #: rhodecode/templates/admin/users/user_edit.mako:48
 msgid "Audit logs"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:29
 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:18
-#: rhodecode/templates/admin/users/user_edit_audit.mako:19
+#: rhodecode/templates/admin/users/user_edit_audit.mako:21
 #: rhodecode/templates/journal/journal.mako:16
 msgid "Example Queries"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log_base.mako:6
 msgid "Uid"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log_base.mako:42
 msgid "toggle"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log_base.mako:68
 msgid "No actions yet"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:5
 #: rhodecode/templates/admin/settings/settings.mako:5
 msgid "Settings administration"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:26
 msgid "Administration area"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:30
 msgid "Repositories under administration"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:34
 #: rhodecode/templates/admin/repos/repo_add.mako:22
 #: rhodecode/templates/admin/repos/repos.mako:31
 msgid "Add Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:39
 msgid "Repository groups under administration"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:43
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:16
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:31
 msgid "Add Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:48
 msgid "User groups under administration"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:52
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:15
 #: rhodecode/templates/admin/user_groups/user_groups.mako:31
 msgid "Add User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:5
 #: rhodecode/templates/admin/auth/plugin_settings.mako:5
 msgid "Authentication Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:42
 msgid "Enabled and Available Plugins"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:48
 msgid "Ordered Activated Plugins"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:53
 msgid ""
 "List of plugins, separated by commas.\n"
 "The order of the plugins is also the order in which RhodeCode Enterprise will try to authenticate a user."
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:60
 msgid "Activate"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:61
 msgid "Plugin Name"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:62
 msgid "Documentation"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:63
 msgid "Plugin ID"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:85
 #: rhodecode/templates/admin/auth/plugin_settings.mako:96
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:63
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:109
 #: rhodecode/templates/admin/permissions/permissions_application.mako:59
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:59
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:206
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:71
-#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:191
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:243
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:216
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:77
+#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:66
+#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:84
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:200
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:250
 #: rhodecode/templates/admin/settings/settings_hooks.mako:63
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:192
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102
-#: rhodecode/templates/admin/users/user_edit_groups.mako:27
-#: rhodecode/templates/admin/users/user_edit_profile.mako:145
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:206
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:106
+#: rhodecode/templates/admin/users/user_edit_groups.mako:30
+#: rhodecode/templates/admin/users/user_edit_profile.mako:154
 #: rhodecode/templates/base/default_perms_box.mako:88
 msgid "Save"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/plugin_settings.mako:46
 msgid "Plugin"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.mako:5
 #: rhodecode/templates/admin/defaults/defaults.mako:14
 msgid "Repositories defaults"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:3
 msgid "Default Settings For New Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14
 #: rhodecode/templates/admin/gists/gist_index.mako:105
 #: rhodecode/templates/admin/integrations/list.mako:73
-#: rhodecode/templates/admin/repos/repo_add_base.mako:57
+#: rhodecode/templates/admin/repos/repo_add_base.mako:58
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12
 msgid "Type"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23
-#: rhodecode/templates/admin/repos/repo_add_base.mako:89
+#: rhodecode/templates/admin/repos/repo_add_base.mako:113
 msgid "Private Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27
-#: rhodecode/templates/admin/repos/repo_add_base.mako:93
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:192
-#: rhodecode/templates/forks/fork.mako:85
+#: rhodecode/templates/admin/repos/repo_add_base.mako:117
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:199
+#: rhodecode/templates/forks/fork.mako:92
 msgid "Private repositories are only visible to people explicitly added as collaborators."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:34
 msgid "Enable Statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:38
 msgid "Enable a statistics window on the repository summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:44
 msgid "Enable Downloads"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:48
 msgid "Enable the download option on the repository summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:54
 msgid "Enable Locking"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:58
 msgid "Enable automatic repository locking. Pulling from a repository will lock it, and it is unlocked by pushing back by the same user."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:5
 msgid "Edit Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:33
 #: rhodecode/templates/admin/gists/gist_new.mako:34
 msgid "Gist lifetime"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:36
 msgid "Gist access level"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:40
 #: rhodecode/templates/admin/gists/gist_new.mako:40
 msgid "Gist description ..."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:54
 #: rhodecode/templates/admin/gists/gist_new.mako:48
-#: rhodecode/templates/files/files_add.mako:68
+#: rhodecode/templates/files/files_add.mako:67
 #: rhodecode/templates/files/files_edit.mako:69
 msgid "plain"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:99
 msgid "Update Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:100
 #: rhodecode/templates/base/issue_tracker_settings.mako:150
-#: rhodecode/templates/changeset/changeset_file_comment.mako:391
-#: rhodecode/templates/codeblocks/diffs.mako:84
+#: rhodecode/templates/changeset/changeset_file_comment.mako:395
+#: rhodecode/templates/codeblocks/diffs.mako:88
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:75
 msgid "Cancel"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:123
 #, python-format
 msgid "Gist was updated since you started editing. Copy your changes and click %(here)s to reload the new version."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:6
 msgid "Private Gists for user {}"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:8
 msgid "Public Gists for user {}"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:10
 msgid "Public Gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:30
 msgid "All gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:32
 msgid "All public"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:34
 msgid "My gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:35
 msgid "My private"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:36
 msgid "My public"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:43
 msgid "Create New Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:54
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:23
 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7
 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:25
 #: rhodecode/templates/admin/repos/repos.mako:25
 #: rhodecode/templates/admin/user_groups/user_groups.mako:25
 #: rhodecode/templates/admin/users/users.mako:26
 #: rhodecode/templates/bookmarks/bookmarks.mako:33
 #: rhodecode/templates/branches/branches.mako:33
 #: rhodecode/templates/journal/journal.mako:12
 #: rhodecode/templates/pullrequests/pullrequests.mako:53
 #: rhodecode/templates/tags/tags.mako:33
 msgid "quick filter..."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:103
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:91
 #: rhodecode/templates/bookmarks/bookmarks.mako:61
 #: rhodecode/templates/branches/branches.mako:60
 #: rhodecode/templates/commits/changelog.mako:119
-#: rhodecode/templates/compare/compare_commits.mako:18
+#: rhodecode/templates/compare/compare_commits.mako:16
 #: rhodecode/templates/files/files_browser_tree.mako:17
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:544
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:559
 #: rhodecode/templates/pullrequests/pullrequests.mako:98
 #: rhodecode/templates/search/search_commit.mako:18
 #: rhodecode/templates/summary/summary_commits.mako:11
 #: rhodecode/templates/tags/tags.mako:61
 msgid "Author"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:111
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:9
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:7
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:7
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:6
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:52
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:16
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:51
 msgid "Created on"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:113
 msgid "Expires"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:5
-#: rhodecode/templates/base/base.mako:572
+#: rhodecode/templates/base/base.mako:568
 msgid "New Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:31
 msgid "Gist id"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:32
 msgid "Auto generated"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:37
 msgid "Private Gist access level"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:47
 msgid "name gist file..."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:61
 msgid "Create Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:69
 #: rhodecode/templates/admin/gists/gist_new.mako:70
-#: rhodecode/templates/data_table/_dt_elements.mako:344
+#: rhodecode/templates/data_table/_dt_elements.mako:352
 msgid "Private Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:70
 msgid "Private Gists are not listed and only accessible through their secret url."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:73
 #: rhodecode/templates/admin/gists/gist_new.mako:74
-#: rhodecode/templates/data_table/_dt_elements.mako:342
+#: rhodecode/templates/data_table/_dt_elements.mako:350
 msgid "Public Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:74
 msgid "Public Gists are accessible to anyone and listed in Gists page."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:14
 #: rhodecode/templates/admin/gists/gist_show.mako:21
 msgid "Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:41
 msgid "Copy the url"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:47
 #: rhodecode/templates/files/files_source.mako:106
 msgid "Copy content"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:52
 msgid "Show as Raw"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/gist_show.mako:57
-msgid "Confirm to delete this Gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/gist_show.mako:70
+#: rhodecode/templates/admin/gists/gist_show.mako:73
 msgid "created"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/gist_show.mako:71
+#: rhodecode/templates/admin/gists/gist_show.mako:74
 msgid "expires"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/gist_show.mako:92
+#: rhodecode/templates/admin/gists/gist_show.mako:95
 #: rhodecode/templates/files/files_delete.mako:58
-#: rhodecode/templates/files/files_source.mako:125
+#: rhodecode/templates/files/files_source.mako:128
 msgid "Show as raw"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/base.mako:14
 msgid "Integrations Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/base.mako:23
 #: rhodecode/templates/admin/integrations/form.mako:8
 #: rhodecode/templates/admin/integrations/form.mako:21
 #: rhodecode/templates/admin/integrations/form.mako:32
 #: rhodecode/templates/admin/integrations/global.mako:14
 #: rhodecode/templates/admin/integrations/list.mako:21
 #: rhodecode/templates/admin/integrations/list.mako:25
 #: rhodecode/templates/admin/integrations/list.mako:29
 #: rhodecode/templates/admin/integrations/list.mako:36
 #: rhodecode/templates/admin/integrations/new.mako:15
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:33
 #: rhodecode/templates/admin/repos/repo_edit.mako:74
 #: rhodecode/templates/base/base.mako:113
 msgid "Integrations"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/form.mako:30
 #: rhodecode/templates/admin/integrations/list.mako:16
 #: rhodecode/templates/admin/integrations/new.mako:7
 #: rhodecode/templates/admin/integrations/new.mako:9
 #: rhodecode/templates/admin/integrations/new.mako:13
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:30
 #: rhodecode/templates/admin/repos/repo_edit.mako:15
 #: rhodecode/templates/admin/repos/repo_edit.mako:42
 #: rhodecode/templates/admin/settings/settings.mako:14
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:9
 #: rhodecode/templates/base/base.mako:115
 msgid "Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/form.mako:60
 #, python-format
 msgid "Create New %(integration_type)s Integration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/global.mako:5
 msgid "Integrations administration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:44
 msgid "Current Integrations for Repository: {repo_name}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:46
 msgid "Repository Group Integrations: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:48
 msgid "Current Integrations"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:65
 #: rhodecode/templates/admin/integrations/new.mako:18
 msgid "Create new integration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:74
 msgid "Scope"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:75
 #: rhodecode/templates/compare/compare_diff.mako:84
 msgid "Actions"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:85
 msgid "No {type} integrations for repo {repo} exist yet."
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:87
 msgid "No {type} integrations for repogroup {repogroup} exist yet."
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:89
 msgid "No {type} integrations exist yet."
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:103
 msgid "Create one"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:132
 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:19
 msgid "repo"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:136
 msgid "repogroup"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:138
 msgid "child repos only"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:140
 msgid "cascade to all"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:145
 msgid "top level repos only"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:147
 msgid "global"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:153
 msgid "unknown integration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/new.mako:23
 msgid "Create New Integration for repository: {repo_name}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/new.mako:25
 msgid "Create New Integration for repository group: {repo_group_name}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/new.mako:27
 msgid "Create New Global Integration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/new.mako:55
 msgid "No description available"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:5
-#: rhodecode/templates/base/base.mako:617
+#: rhodecode/templates/base/base.mako:613
 msgid "My account"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:12
 msgid "My Account"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:29
 #: rhodecode/templates/email_templates/user_registration.mako:54
 msgid "Profile"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:30
 #: rhodecode/templates/admin/users/user_edit.mako:45
 #: rhodecode/templates/debug_style/index.html:55
 msgid "Emails"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:33
 msgid "Auth Tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:34
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3
 #: rhodecode/templates/admin/permissions/permissions.mako:51
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4
 #: rhodecode/templates/admin/users/user_edit.mako:41
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:7
 msgid "SSH Keys"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:35
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5
 msgid "User Group Membership"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:40
 msgid "External Identities"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:43
 msgid "Owned Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:44
 msgid "Watched Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:45
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:42
 #: rhodecode/templates/base/base.mako:376
-#: rhodecode/templates/base/base.mako:621
+#: rhodecode/templates/base/base.mako:617
 msgid "Pull Requests"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:46
 #: rhodecode/templates/admin/permissions/permissions.mako:14
-#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:31
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35
 #: rhodecode/templates/base/base.mako:111
 msgid "Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:47
 msgid "Live Notifications"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:9
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13
 msgid "Authentication Tokens"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:8
-msgid "Authentication tokens can be used to interact with the API, or VCS-over-http. Each token can have a role. Token with a role can be used only in given context, e.g. VCS tokens can be used together with the authtoken auth plugin for git/hg/svn operations only."
-msgstr ""
-
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:19
+msgid "Authentication tokens can be used to interact with the API, or VCS-over-http. Each token can have a role. Token with a role can be used only in given context, e.g. VCS tokens can be used together with the authtoken auth plugin for git/hg/svn operations only."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:20
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:25
 msgid "Token"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:17
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:17
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:28
 msgid "Repository Scope"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:24
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:29
 msgid "Expiration"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:49
-#, python-format
-msgid "Confirm to remove this auth token: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:57
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:57
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:66
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:70
 msgid "No additional auth tokens specified"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:69
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:69
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82
 msgid "New authentication token"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:83
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:92
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:96
 msgid "Repository scope works only with tokens with VCS type."
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:96
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:72
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:63
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:87
-#: rhodecode/templates/admin/users/user_edit_emails.mako:62
-#: rhodecode/templates/admin/users/user_edit_ips.mako:70
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:100
+#: rhodecode/templates/admin/users/user_edit_emails.mako:65
+#: rhodecode/templates/admin/users/user_edit_ips.mako:75
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:71
 msgid "Add"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:120
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:121
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:129
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:134
 msgid "Select or enter expiration date"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:155
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:156
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:164
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:169
 msgid "repository scope"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:7
 msgid "Position"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:17
 msgid "Bookmark title (max 30 characters, optional)"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:24
 msgid "Clear"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:30
 msgid "Server URL is available as ${server_url} variable. E.g. Redirect url: ${server_url}/_admin/exception_tracker"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:34
 msgid "Redirect URL"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:44
 msgid "Repository template"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:50
 msgid "Repository group template"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:56
 msgid "Template Repository or Repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:66
 msgid "Available as ${repo_url}  e.g. Redirect url: ${repo_url}/changelog"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:68
 msgid "Available as ${repo_group_url} e.g. Redirect url: ${repo_group_url}"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:70
 msgid "Available as full url variables in redirect url. i.e: ${repo_url}, ${repo_group_url}."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:80
 msgid "Your Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:85
 msgid "Store upto 10 bookmark links to favorite repositories, external issue tracker or CI server. "
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:87
 msgid "Bookmarks are accessible from your username dropdown or by keyboard shortcut `g 0-9`"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:141
 msgid "repository"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:192
 msgid "repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:5
 msgid "Account Emails"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:17
-#: rhodecode/templates/admin/users/user_edit_emails.mako:16
+#: rhodecode/templates/admin/users/user_edit_emails.mako:19
 msgid "Primary"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_emails.mako:31
-msgid "Confirm to delete this email: {}"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_emails.mako:42
-#: rhodecode/templates/admin/users/user_edit_emails.mako:41
+#: rhodecode/templates/admin/my_account/my_account_emails.mako:43
+#: rhodecode/templates/admin/users/user_edit_emails.mako:44
 msgid "No additional emails specified"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_emails.mako:51
-#: rhodecode/templates/admin/my_account/my_account_password.mako:6
-#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:17
-msgid "Your user account details are managed by an external source. Details cannot be managed here."
-msgstr ""
-
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:52
-#: rhodecode/templates/admin/my_account/my_account_password.mako:7
-#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:18
+#: rhodecode/templates/admin/my_account/my_account_password.mako:6
+msgid "Your user account details are managed by an external source. Details cannot be managed here."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.mako:53
+#: rhodecode/templates/admin/my_account/my_account_password.mako:9
 msgid "Source type"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:4
 msgid "Your Live Notification Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:16
 msgid "Notifications Status"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:40
 msgid "Test Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_password.mako:3
 msgid "Change Your Account Password"
 msgstr ""
 
+#: rhodecode/templates/admin/my_account/my_account_password.mako:7
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:18
+#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:19
+msgid "For VCS access please generate"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:6
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4
 msgid "My Profile"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:13
-#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:54
-#: rhodecode/templates/admin/users/user_edit_profile.mako:23
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:15
+#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:16
+#: rhodecode/templates/admin/users/user_edit_profile.mako:19
+#, python-format
+msgid "This user was created from external source (%s). Editing some of the settings is limited."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:24
+#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:60
+#: rhodecode/templates/admin/users/user_edit_profile.mako:26
 #: rhodecode/templates/users/user_profile.mako:15
 msgid "Photo"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:71
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:82
 #: rhodecode/templates/users/user_profile.mako:73
 msgid "Missing email, please update your user email address."
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:59
+#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:65
 msgid "Change your avatar at"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:6
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:8
-msgid "Show Closed Pull Requests"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:15
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:13
+#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40
+msgid "All"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:14
+msgid "All + Closed"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:33
 msgid "Pull Requests You Participate In"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:51
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:67
 msgid "Target Repo"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:79
 #: rhodecode/templates/pullrequests/pullrequests.mako:94
 msgid "Id"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:85
 #: rhodecode/templates/admin/settings/settings_global.mako:9
 #: rhodecode/templates/email_templates/pull_request_review.mako:41
 #: rhodecode/templates/email_templates/pull_request_update.mako:41
 #: rhodecode/templates/pullrequests/pullrequest.mako:38
 #: rhodecode/templates/pullrequests/pullrequests.mako:96
 msgid "Title"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:103
 #: rhodecode/templates/pullrequests/pullrequests.mako:102
 msgid "Last Update"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_repos.mako:3
 msgid "Repositories You Own"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:9
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:14
 msgid "Fingerprint"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:17
 msgid "Accessed on"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:16
 msgid "SSH Keys usage is currently disabled, please ask your administrator to enable them."
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:32
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:29
-#, python-format
-msgid "Confirm to remove ssh key %s"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:40
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:37
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:41
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:42
 msgid "No additional ssh keys specified"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:54
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:49
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:54
 msgid "New ssh key"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:59
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:54
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:60
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:59
 msgid "Generate random RSA key"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:66
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:61
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66
 msgid "Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:75
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:76
 msgid "Click add to use this generated SSH key"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:47
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:51
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:51
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:55
 #: rhodecode/templates/admin/user_groups/user_groups.mako:84
 #: rhodecode/templates/admin/users/user_add.mako:97
-#: rhodecode/templates/admin/users/user_edit_groups.mako:64
-#: rhodecode/templates/admin/users/user_edit_profile.mako:101
+#: rhodecode/templates/admin/users/user_edit_groups.mako:67
+#: rhodecode/templates/admin/users/user_edit_profile.mako:110
 #: rhodecode/templates/admin/users/users.mako:85
 #: rhodecode/templates/user_group/profile.mako:44
 msgid "Active"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_watched.mako:3
 msgid "Your Watched Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_data.mako:5
 msgid "My notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_data.mako:26
 msgid "Mark as read"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_data.mako:42
 msgid "No notifications here yet"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show.mako:5
 #: rhodecode/templates/admin/notifications/notifications_show.mako:14
 #: rhodecode/templates/debug_style/email_plain_rendered.mako:5
 #: rhodecode/templates/debug_style/email_plain_rendered.mako:14
 msgid "Show notification"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show.mako:12
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:5
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:20
 #: rhodecode/templates/debug_style/email_plain_rendered.mako:12
 msgid "My Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show.mako:42
 #: rhodecode/templates/debug_style/email_plain_rendered.mako:38
 msgid "Subject"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:25
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:29
 msgid "Mark all as read"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:39
 msgid "Unread"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40
-msgid "All"
-msgstr ""
-
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:41
 #: rhodecode/templates/changeset/changeset.mako:172
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:656
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:671
 msgid "Comments"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:5
 msgid "Permissions Administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:33
 msgid "Application"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:39
 msgid "Object"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:45
 msgid "IP Whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:48
 msgid "AuthToken Access"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:54
 msgid "Overview"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:3
 msgid "System Wide Application Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:12
 msgid "Anonymous Access"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:18
 #, python-format
 msgid "Allow access to RhodeCode Enterprise without requiring users to login. Anonymous users get the %s permission settings."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:24
 msgid "Registration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:33
 msgid "Password Reset"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:42
 msgid "Registration Page Message"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:46
 msgid "Custom message to be displayed on the registration page. HTML syntax is supported."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:52
 msgid "External Authentication Account Activation"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5
 msgid "View whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36
 msgid "List of views available for usage in whitelist access"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_branch.mako:3
 msgid "Default Permissions for Branches."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_branch.mako:6
 #: rhodecode/templates/admin/repos/repo_edit_automation.mako:6
 #: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:6
-#: rhodecode/templates/admin/repos/repo_edit_remote.mako:62
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:67
 #: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6
 #: rhodecode/templates/admin/settings/settings_automation.mako:6
 #: rhodecode/templates/artifacts/artifact_list.mako:24
 msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:5
 msgid "Default IP Whitelist For All Users"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:9
-#: rhodecode/templates/admin/users/user_edit_ips.mako:7
+#: rhodecode/templates/admin/users/user_edit_ips.mako:12
 msgid "Current IP address"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:30
-#: rhodecode/templates/admin/users/user_edit_ips.mako:36
+#: rhodecode/templates/admin/users/user_edit_ips.mako:41
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:37
-#: rhodecode/templates/admin/users/user_edit_ips.mako:44
+#: rhodecode/templates/admin/users/user_edit_ips.mako:49
 msgid "All IP addresses are allowed"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:52
-#: rhodecode/templates/admin/users/user_edit_ips.mako:60
+#: rhodecode/templates/admin/users/user_edit_ips.mako:65
 msgid "New IP Address"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:56
-#: rhodecode/templates/admin/users/user_edit_ips.mako:63
+#: rhodecode/templates/admin/users/user_edit_ips.mako:68
 msgid "Description..."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:57
 msgid ""
 "Enter a comma separated list of IP Addresses like 127.0.0.1,\n"
 "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n"
 "To specify multiple addresses in a range, use the 127.0.0.1-127.0.0.10 syntax"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:3
 msgid "Default Permissions for Repositories, User Groups and Repository Groups."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:7
 msgid "Default access permissions. This defines permissions for the `default` user from which other users inherit permissions."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:9
 msgid "Check the overwrite checkbox to force change all previously defined permissions for `default` user to the new selected value."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:23
 msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:24
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:38
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:52
 msgid "Overwrite Existing Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:37
 msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:45
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:14
 msgid "User Groups"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:51
 msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_perms.mako:1
 msgid "Default User Permissions Overview"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7
 msgid "Update SSH keys file"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5
 msgid "Add repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13
 #: rhodecode/templates/base/base.mako:108
 #: rhodecode/templates/base/base.mako:129
 msgid "Repository groups"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:35
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:15
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:34
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:15
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:19
 msgid "Group name"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:44
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25
 #: rhodecode/templates/admin/repos/repo_add_base.mako:43
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33
-#: rhodecode/templates/base/base.mako:666
-#: rhodecode/templates/data_table/_dt_elements.mako:215
+#: rhodecode/templates/base/base.mako:662
+#: rhodecode/templates/data_table/_dt_elements.mako:217
 #: rhodecode/templates/forks/fork.mako:41
 msgid "Repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:58
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62
-msgid "Plain text format with support of {metatags}"
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:68
-#: rhodecode/templates/admin/repos/repo_add_base.mako:80
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:64
+#: rhodecode/templates/admin/repos/repo_add_base.mako:90
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:179
+#: rhodecode/templates/admin/users/user_edit_profile.mako:81
+#: rhodecode/templates/forks/fork.mako:63
+msgid "Plain text format with {metatags} support."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:62
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:66
+#: rhodecode/templates/admin/repos/repo_add_base.mako:92
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:181
+#: rhodecode/templates/admin/users/user_edit_profile.mako:83
+#: rhodecode/templates/forks/fork.mako:65
+msgid "Plain text format."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:74
+#: rhodecode/templates/admin/repos/repo_add_base.mako:104
 msgid "Copy Parent Group Permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72
-#: rhodecode/templates/admin/repos/repo_add_base.mako:84
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78
+#: rhodecode/templates/admin/repos/repo_add_base.mako:108
 msgid "Copy permissions from parent repository group."
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:77
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:83
 msgid "Create Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:5
 #, python-format
 msgid "%s repository group settings"
 msgstr ""
 
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:31
+#: rhodecode/templates/admin/repos/repo_edit.mako:45
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:8
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:30
+msgid "Access Permissions"
+msgstr ""
+
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:32
 #: rhodecode/templates/admin/repos/repo_edit.mako:51
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:24
 #: rhodecode/templates/admin/users/user_edit.mako:42
 msgid "Advanced"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:7
 msgid "Repository Group ID"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:10
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:8
 msgid "Updated on"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:11
 msgid "Cached Commit source"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:12
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9
 msgid "Cached Commit id"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:13
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:10
 msgid "Cached Commit date"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:15
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:11
 msgid "Cached Commit data"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:17
 msgid "Is Personal Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:19
 msgid "Total repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:20
 msgid "Top level repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:22
 msgid "Children groups"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:28
 msgid "Repository Group Advanced: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:38
 msgid "Delete repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:67
 #, python-format
 msgid "Confirm to delete this group: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:68
 msgid "Delete this repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5
 msgid "Repository Group Permissions: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:19
 msgid "User/User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:32
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:31
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:33
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:37
 msgid "super-admin"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:35
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:34
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:36
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:40
 msgid "owner"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:64
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:86
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:66
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:109
-msgid "permission for all other users"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:66
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:114
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:92
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:72
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120
+msgid "permission for other logged in and anonymous users"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:68
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:111
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:90
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:70
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:113
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:94
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:74
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:122
+msgid "permission for other logged in users"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:73
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:99
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:79
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:127
 msgid "inactive duplicate"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:77
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:157
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:155
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:82
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:167
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:115
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:164
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:46
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:79
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:158
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:88
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:172
 msgid "Remove"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:114
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:116
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:130
 msgid "delegated admin"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:152
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:150
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:153
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:162
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:159
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:167
 msgid "members"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:184
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:182
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:184
-msgid "Add user/user group"
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:194
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:191
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:198
+msgid "Add user/user group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:204
 msgid "Apply to children"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:200
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:210
 msgid "Both"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:201
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:211
 msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:6
 msgid "Repository Group Settings: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31
 msgid "Optional select a parent group to move this repository group into."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49
 msgid "Change owner of this repository group."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:5
 msgid "Repository groups administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:82
 msgid "Number of top level repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add.mako:5
 msgid "Add repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:9
 msgid "Repository name"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:14
 msgid "Import Existing Repository ?"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:23
 #: rhodecode/templates/base/base.mako:323
 msgid "Clone from"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:49
 #: rhodecode/templates/forks/fork.mako:47
 #, python-format
 msgid "Select my personal group (%(repo_group_name)s)"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:52
 #: rhodecode/templates/forks/fork.mako:50
 msgid "Optionally select a group to put this repository into."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.mako:61
+#: rhodecode/templates/admin/repos/repo_add_base.mako:78
 msgid "Set the type of repository to create."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.mako:71
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:177
-#: rhodecode/templates/admin/users/user_edit_profile.mako:76
-#: rhodecode/templates/forks/fork.mako:61
-msgid "Plain text format with support of {metatags}. Add a README file for longer descriptions"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.mako:97
+#: rhodecode/templates/admin/repos/repo_add_base.mako:94
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:183
+#: rhodecode/templates/forks/fork.mako:67
+msgid "Add a README file for longer descriptions"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.mako:121
 msgid "Create Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.mako:5
 msgid "{} Creating repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.mako:12
 msgid "Creating repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.mako:26
 #, python-format
 msgid "Repository \"%(repo_name)s\" is being created, you will be redirected when this process is finished.repo_name"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:8
 msgid "{} repository settings"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:45
-msgid "Access Permissions"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.mako:48
 msgid "Branch Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:54
 msgid "VCS"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:57
 msgid "Extra Fields"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:60
 msgid "Issue Tracker"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:63
 #: rhodecode/templates/admin/users/user_edit.mako:49
-#: rhodecode/templates/admin/users/user_edit_caches.mako:5
+#: rhodecode/templates/admin/users/user_edit_caches.mako:7
 msgid "Caches"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:67
 msgid "Remote sync"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:71
 msgid "Statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:78
 msgid "Reviewer Rules"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:82
 msgid "Automation"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:85
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3
 msgid "Maintenance"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:88
 msgid "Strip"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5
 msgid "Repository ID"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:12
 msgid "Attached scoped tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:13
 msgid "Pull requests source"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14
 msgid "Pull requests target"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15
 msgid "Attached Artifacts"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:21
 #, python-format
 msgid "Repository: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31
 msgid "Fork Reference"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37
 #, python-format
 msgid "This repository is a fork of %(repo_link)s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:43
 msgid "Set"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:46
 msgid "Manually set this repository as a fork of another from the list"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55
 msgid "Public Journal Visibility"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:62
 msgid "Remove from Public Journal"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:66
 msgid "Add to Public Journal"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:71
 msgid "All actions made on this repository will be visible to everyone following the public journal."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:80
 msgid "Locking state"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89
 msgid "This Repository is not currently locked."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96
-msgid "Confirm to unlock repository."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99
 msgid "Unlock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:103
-msgid "Confirm to lock repository."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:107
 msgid "Lock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:111
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113
 msgid "Force repository locking. This only works when anonymous access is disabled. Pulling from the repository locks the repository to that user until the same user pushes to that repository again."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:121
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:123
 msgid "Hooks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125
-msgid "Hook type"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:126
-msgid "Hook version"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:127
+msgid "Hook type"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:128
+msgid "Hook version"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129
 msgid "Current version"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:132
 msgid "PRE HOOK"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:135
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:137
 msgid "POST HOOK"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:143
 msgid "Unable to read hook information from VCS Server"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:147
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:149
 msgid "Confirm to reinstall hooks for this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:148
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:150
 msgid "Update Hooks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:155
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:154
+msgid "Outdated hooks detected, please update hooks using `Update Hooks` action."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:162
 msgid "Archive repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:164
-#, python-format
-msgid "Confirm to archive this repository: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:165
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:173
 msgid "Archive this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:170
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:178
 msgid "Archiving the repository will make it entirely read-only. The repository cannot be committed to.It is hidden from the search results and dashboard. "
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:182
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:190
 msgid "Delete repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:193
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:201
 msgid "Detach forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:198
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:206
 msgid "Delete forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:208
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:216
 msgid "Consider to archive this repository instead."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:219
-#: rhodecode/templates/data_table/_dt_elements.mako:180
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:220
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:229
 msgid "Delete this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:225
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:234
 msgid "This repository will be renamed in a special way in order to make it inaccessible to RhodeCode Enterprise and its VCS systems. If you need to fully delete it from the file system, please do it manually, or with rhodecode-cleanup-repos command available in rhodecode-tools."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:259
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:268
 msgid "Change repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:259
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:268
 msgid "Pick repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:7
 msgid "Repository Audit Logs"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:14
-#: rhodecode/templates/admin/users/user_edit_audit.mako:15
+#: rhodecode/templates/admin/users/user_edit_audit.mako:17
 msgid "audit filter..."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_automation.mako:3
 msgid "Repo Automation"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3
 msgid "Invalidate Cache for Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:7
 msgid "Manually invalidate the repository cache. On the next access a repository cache will be recreated."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:10
 msgid "Cache purge can be automated by such api call. Can be called periodically in crontab etc."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:20
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:23
 msgid "Invalidate repository cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:20
-msgid "Confirm to invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:32
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:36
 msgid "Invalidation keys"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:40
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:84
-#: rhodecode/templates/admin/users/user_edit_caches.mako:19
-msgid "Show all"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:44
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:88
+#: rhodecode/templates/admin/users/user_edit_caches.mako:22
+msgid "Show all"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:48
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:92
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:11
 msgid "Key"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:45
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:49
 msgid "State UID"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:46
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:50
 msgid "Namespace"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:65
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:69
 msgid "Cache keys"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:89
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:93
 msgid "Region"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:106
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:110
 msgid "Shadow Repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:118
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:122
 msgid "No Shadow repositories exist for this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:129
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:133
 msgid "Diff Caches"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:137
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:141
 msgid "Cached diff name"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:145
-msgid "Cached diff files"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:149
+msgid "Cached diff files"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:153
 msgid "Cached diff size"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:3
 msgid "Custom extra fields for this repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:10
 msgid "Label"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:24
 #, python-format
 msgid "Confirm to delete this field: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:40
 msgid "New Field Key"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:48
 msgid "New Field Label"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:51
 msgid "Enter short label"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:57
 msgid "New Field Description"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:60
 msgid "Enter a full description for the field"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:73
 msgid "Extra fields are disabled. You can enable them from the Admin/Settings/Visual page."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:9
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:9
 msgid "Inherit from global settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:14
 msgid "Select to inherit global patterns for issue tracker."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:24
 msgid "Inherited Issue Tracker Patterns"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:30
+#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:31
 #: rhodecode/templates/base/issue_tracker_settings.mako:79
 #: rhodecode/templates/base/perms_summary.mako:169
 msgid "Pattern"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:31
+#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32
 #: rhodecode/templates/base/issue_tracker_settings.mako:80
 msgid "Url"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32
+#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:33
 msgid "Prefix"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:70
+#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:75
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:5
 msgid "Issue Tracker / Wiki Patterns"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:91
+#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:95
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:24
 msgid "Test Patterns"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:8
 msgid "Perform maintenance tasks for this repo"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:10
 msgid "Following tasks will be performed"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:17
 msgid "Maintenance can be automated by such api call. Can be called periodically in crontab etc."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:25
 msgid "No maintenance tasks for this repo available"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:34
 msgid "Run Maintenance"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:49
 msgid "Performing Maintenance"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5
 msgid "Repository Access Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:55
 msgid "private repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60
 msgid "only users/user groups explicitly added here will have access"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:94
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:62
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:118
+msgid "Private repositories are only visible to people explicitly added as collaborators. Default permissions wont apply"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:63
+msgid "un-set private mode"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:103
 msgid "used by {} branch rule, requires write+ permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:96
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:105
 msgid "used by {} branch rules, requires write+ permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:119
 msgid "set private mode"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:3
 msgid "Repository Branch Permissions."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:3
 msgid "Remote Sync"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:7
 msgid "Manually pull/push changes from/to external URLs."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:11
 msgid "Pull url"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:16
 msgid "This repository does not have any pull url set."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:17
-#: rhodecode/templates/admin/repos/repo_edit_remote.mako:55
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:60
 msgid "Set remote url."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:26
 msgid "Pull can be automated by such api call. Can be called periodically in crontab etc."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_remote.mako:40
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:44
 msgid "Pull changes from remote location"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_remote.mako:40
-msgid "Confirm to pull changes from remote side"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_remote.mako:49
-msgid "Push url"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:54
+msgid "Push url"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:59
 msgid "This repository does not have any push url set."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:3
 msgid "Default Reviewer Rules"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:6
 #, python-format
 msgid "Settings for Repository: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22
 msgid "permalink id"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22
 msgid "what is that ?"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:24
 msgid "URL by id"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:25
 msgid ""
 "In case this repository is renamed or moved into another group the repository url changes.\n"
 "                               Using above url guarantees that this repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:41
 #, python-format
 msgid "Select my personal group (`%(repo_group_name)s`)"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:44
 msgid "Optional select a group to put this repository into."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:52
 msgid "Remote pull uri"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:60
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102
 #: rhodecode/templates/base/perms_summary.mako:111
 #: rhodecode/templates/base/perms_summary.mako:228
 #: rhodecode/templates/base/perms_summary.mako:306
 #: rhodecode/templates/base/perms_summary.mako:308
 #: rhodecode/templates/debug_style/form-elements.html:45
 msgid "edit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:66
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:108
 msgid "enter new value, or leave empty to remove"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:76
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:118
 msgid "cancel"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:87
 msgid "http[s] url where from repository was imported. This field can used for doing {sync_link}."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:88
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:130
 msgid "This field is stored encrypted inside Database, a format of http://user:[e-mail]/repo_name can be used and will be hidden from display."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:94
 msgid "Remote push uri"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:129
 msgid "http[s] url to sync data back. This field can used for doing {sync_link}."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:141
 msgid "Landing commit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:146
 msgid "The default commit for file pages, downloads, full text search index, and README generation."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:164
 msgid "Change owner of this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:187
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194
 #: rhodecode/templates/data_table/_dt_elements.mako:104
 msgid "Private repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:197
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:204
 #: rhodecode/templates/summary/components.mako:238
 msgid "Enable statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:202
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:209
 msgid "Enable statistics window on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:207
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:214
 #: rhodecode/templates/summary/components.mako:184
 msgid "Enable downloads"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:212
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:219
 msgid "Enable download menu on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:217
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:224
 msgid "Enable automatic locking"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:222
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:229
 msgid "Enable automatic locking on repository. Pulling from this repository creates a lock that can be released by pushing back by the same user"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:3
 msgid "Repository statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:11
 msgid "Processed commits"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:12
 msgid "Processed progress"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:15
 msgid "Reset statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:15
 msgid "Confirm to remove current statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:3
 msgid "Strip commits from repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:7
 #, python-format
 msgid "Please provide up to %d commits commits to strip"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:9
 msgid "In the first step commits will be verified for existance in the repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:10
 msgid "In the second step, correct commits will be available for stripping"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:16
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:52
 msgid "Enter full 40 character commit sha"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:18
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:54
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:95
 msgid "Add another commit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:27
 msgid "Check commits"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:33
 msgid "Sorry this functionality is not available for SVN repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:114
 msgid "Checking commits"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:142
 msgid " commit verified positive"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:154
 msgid " commit verified negative"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:179
 msgid " commit striped successfully"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:182
 msgid " commit strip failed"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13
 msgid "Select to inherit global vcs settings."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43
 #: rhodecode/templates/admin/settings/settings_global.mako:140
 #: rhodecode/templates/admin/settings/settings_labs.mako:48
 #: rhodecode/templates/admin/settings/settings_vcs.mako:13
 #: rhodecode/templates/admin/settings/settings_visual.mako:214
 msgid "Save settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.mako:5
 msgid "Repositories administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.mako:110
 msgid "State"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_automation.mako:3
 msgid "Admin Automation"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:3
 msgid "Email Configuration"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:8
 msgid "Email prefix"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:9
 msgid "Email from"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:11
 msgid "SMTP server"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:12
 msgid "SMTP username"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:13
 msgid "SMTP password"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:14
 msgid "SMTP port"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:16
 msgid "SMTP use TLS"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:17
 msgid "SMTP use SSL"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:28
 msgid "You can adjust those settings in [DEFAULT] section of .ini file located at"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:36
 msgid "Test Email"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:42
 msgid "enter valid email"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:46
 msgid "Send an auto-generated email from this server to above email..."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions.mako:3
 msgid "Exceptions Tracker - Exception ID"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions.mako:8
+#: rhodecode/templates/email_templates/exception_tracker.mako:14
 msgid "Exception `{}` generated on UTC date: {}"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_exceptions.mako:12
-msgid "Unable to Read Exception. It might be removed or non-existing."
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings_exceptions.mako:21
+msgid "Unable to Read Exception. It might be removed or non-existing."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions.mako:30
 msgid "Delete this Exception"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_exceptions.mako:29
-msgid "Confirm to delete this exception"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_exceptions.mako:31
+#: rhodecode/templates/admin/settings/settings_exceptions.mako:40
 msgid "Delete This Exception"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:3
 msgid "Exceptions Tracker "
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:7
 msgid "There is {} stored exception."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:9
 msgid "There are total {} stored exceptions."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:12
 msgid "Store directory"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:19
-msgid "Confirm to delete all exceptions"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:22
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:23
 msgid "Delete All `{}`"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:24
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:25
 msgid "Delete All"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:38
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:39
 msgid "Exceptions Tracker - Showing the last {} Exceptions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:5
 msgid "Branding"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:16
 msgid "Set a custom title for your RhodeCode instance (limited to 40 characters)."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:20
 msgid "HTTP[S] authentication realm"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:27
 msgid "Set a custom text that is shown as authentication message to clients trying to connect."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:36
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:80
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:83
 msgid "Personal Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:41
 msgid "Create Personal Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:44
 msgid "Always create Personal Repository Groups for new users."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:45
 msgid "When creating new users from add user form or API you can still turn this off via a checkbox or flag"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:49
 msgid "Personal Repo Group Pattern"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:55
 msgid "Pattern used to create Personal Repository Groups. Prefix can be other existing repository group path[s], eg. /u/${username}"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:56
 msgid "Available variables are currently ${username} and ${user_id}"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:64
 msgid "Registration Captcha"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:68
 msgid "Google reCaptcha v2 site key."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:75
 msgid "Site key for reCaptcha v2 system."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:80
 msgid "Google reCaptcha v2 secret key."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:87
 msgid "Secret key for reCaptcha v2 system. Setting this value will enable captcha on registration and password reset forms."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:95
 msgid "Custom Header Code"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:100
 #: rhodecode/templates/admin/settings/settings_global.mako:124
 #: rhodecode/templates/debug_style/form-elements-small.html:59
 #: rhodecode/templates/debug_style/form-elements.html:57
 #: rhodecode/templates/debug_style/form-elements.html:82
 #: rhodecode/templates/debug_style/form-elements.html:225
 #: rhodecode/templates/debug_style/form-elements.html:381
 #: rhodecode/templates/debug_style/form-elements.html:407
 #: rhodecode/templates/debug_style/form-elements.html:515
 #: rhodecode/templates/debug_style/form-elements.html:519
 #: rhodecode/templates/debug_style/form-elements.html:537
 #: rhodecode/templates/debug_style/form-elements.html:581
 #: rhodecode/templates/debug_style/form-inline.html:38
 #: rhodecode/templates/debug_style/form-inline.html:139
 #: rhodecode/templates/debug_style/form-inline.html:147
 #: rhodecode/templates/debug_style/form-vertical.html:60
 #: rhodecode/templates/debug_style/forms.html:37
 #: rhodecode/templates/debug_style/forms.html:60
 #: rhodecode/templates/debug_style/forms.html:78
 #: rhodecode/templates/debug_style/forms.html:96
 #: rhodecode/templates/debug_style/layout-form-sidebar.html:44
 msgid "Templates..."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:103
 #: rhodecode/templates/admin/settings/settings_global.mako:127
 #: rhodecode/templates/debug_style/form-elements-small.html:62
 #: rhodecode/templates/debug_style/form-elements.html:60
 #: rhodecode/templates/debug_style/form-elements.html:85
 #: rhodecode/templates/debug_style/form-elements.html:228
 #: rhodecode/templates/debug_style/form-elements.html:384
 #: rhodecode/templates/debug_style/form-elements.html:410
 #: rhodecode/templates/debug_style/form-elements.html:518
 #: rhodecode/templates/debug_style/form-elements.html:522
 #: rhodecode/templates/debug_style/form-elements.html:540
 #: rhodecode/templates/debug_style/form-elements.html:584
 #: rhodecode/templates/debug_style/form-inline.html:41
 #: rhodecode/templates/debug_style/form-inline.html:142
 #: rhodecode/templates/debug_style/form-inline.html:150
 #: rhodecode/templates/debug_style/form-vertical.html:63
 #: rhodecode/templates/debug_style/forms.html:40
 #: rhodecode/templates/debug_style/forms.html:63
 #: rhodecode/templates/debug_style/forms.html:81
 #: rhodecode/templates/debug_style/forms.html:99
 #: rhodecode/templates/debug_style/layout-form-sidebar.html:47
 msgid "Server Announcement"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:104
 msgid "Flash message filtering"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:105
 msgid "Custom logos"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:111
 msgid "Custom js/css code added at the end of the <head/> tag."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:112
 msgid "Use <script/> or <style/> tags to define custom scripting or styling."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:119
 msgid "Custom Footer Code"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:133
 msgid "Custom js/css code added at the end of the <body> tag."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:134
 msgid "Use <script> or <style> tags to define custom scripting or styling."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.mako:3
 msgid "Built in Mercurial hooks - read only"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.mako:19
 msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.mako:27
 msgid "Custom hooks"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_labs.mako:3
 msgid "Labs Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_labs.mako:10
 msgid "There are no Labs settings currently"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:5
 msgid "Import New Groups or Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:10
 msgid "Destroy old data"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:12
 msgid "In case a repository or a group was deleted from the filesystem and it still exists in the database, check this option to remove obsolete data from the database."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:16
 msgid "Invalidate cache for all repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:18
 msgid "Each cache data for repositories will be cleaned with this option selected. Use this to reload data and clear cache keys."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:21
 msgid "Rescan Filesystem"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_open_source.mako:11
 msgid "Licenses of Third Party Packages"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_process_management.mako:3
 #: rhodecode/templates/admin/settings/settings_system.mako:3
 msgid "Checking for updates..."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_process_management.mako:9
 msgid "Gunicorn process management"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_process_management.mako:11
 msgid "start auto refresh"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_process_management.mako:12
 msgid "stop auto refresh"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_search.mako:3
 msgid "RhodeCode Full Text Search"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:3
 msgid "User Sessions Configuration"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:8
 msgid "Session type"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:9
 msgid "Session expiration period"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:11
 msgid "Total sessions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:12
 msgid "Expired sessions ({} days)"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:28
 msgid "Cleanup Old Sessions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:34
 msgid "Cleanup user sessions that were not active during chosen time frame."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:35
 msgid "After performing this action users whose session will be removed will be required to log in again."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:36
 msgid "Picking `All` will log-out you, and all users in the system."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:55
 msgid "Confirm to cleanup user sessions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:56
 msgid "Cleanup sessions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.mako:9
 msgid "System Info"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.mako:11
 msgid "create summary snapshot"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.mako:46
 msgid "Python Packages"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:5
 #: rhodecode/templates/base/vcs_settings.mako:10
 msgid "General"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:10
 msgid "Use repository extra fields"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:12
 msgid "Allows storing additional customized fields per repository."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:17
 msgid "Show RhodeCode version"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:19
 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:26
 msgid "Gravatars"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:31
 msgid "Use Gravatars based avatars"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:33
 msgid "Use gravatar.com as avatar system for RhodeCode accounts. If this is disabled avatars are generated based on initials and email."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:36
 msgid "Gravatar URL"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:44
 msgid ""
 "Gravatar url allows you to use other avatar server application.\n"
 "                                            Following variables of the URL will be replaced accordingly.\n"
 "                                            {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 "                                            {email}     user email,\n"
 "                                            {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 "                                            {size}      size of the image that is expected from the server application,\n"
 "                                            {netloc}    network location/server host of running RhodeCode server"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:59
 msgid "Meta-Tagging"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:64
 msgid "Stylify recognised meta tags"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:66
 msgid "Parses meta tags from repository or repository group description fields and turns them into colored tags."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:77
 msgid "Dashboard Items"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:81
 msgid "Main page dashboard items"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:87
 msgid "Number of items displayed in the main page dashboard before pagination is shown."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:91
 msgid "Admin pages items"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:97
 msgid "Number of items displayed in the admin pages grids before pagination is shown."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:106
 msgid "Commit ID Style"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:110
 msgid "Commit sha length"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:117
 msgid ""
 "Number of chars to show in commit sha displayed in web interface.\n"
 "                                                By default it's shown as r123:9043a6a4c226 this value defines the\n"
 "                                                length of the sha after the `r123:` part."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:125
 msgid "Show commit ID numeric reference"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:125
 msgid "Commit show revision number"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:127
 msgid ""
 "Show revision number in commit sha displayed in web interface.\n"
 "                                        By default it's shown as r123:9043a6a4c226 this value defines the\n"
 "                                        if the `r123:` part is shown."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:136
 #: rhodecode/templates/debug_style/index.html:64
 msgid "Icons"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:141
 msgid "Show public repo icon on repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:147
 msgid "Show private repo icon on repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:149
 msgid "Show public/private icons next to repositories names."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:156
 msgid "Markup Renderer"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:163
 msgid "Default renderer used to render comments, pull request descriptions and other description elements. After change old entries will still work correctly."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:170
 msgid "Clone URL templates"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:181
 msgid ""
 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 "                       {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 "                       {user}   current user username,\n"
 "                       {sys_user} current system user running this process, Useful for ssh,\n"
 "                       {hostname} hostname of this server running RhodeCode,\n"
 "                       {netloc} network location/server host of running RhodeCode server,\n"
 "                       {repo}   full repository name,\n"
 "                       {repoid} ID of repository, can be used to contruct clone-by-id"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:196
 msgid "Custom Support Link"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:204
 #, python-format
 msgid ""
 "Custom url for the support link located at the bottom.\n"
 "                    The default is set to %(default_url)s. In case there's a need\n"
 "                    to change the support link to internal issue tracker, it should be done here.\n"
 "                    "
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:5
 msgid "Add user group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:13
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:14
 #: rhodecode/templates/base/base.mako:110
 #: rhodecode/templates/base/base.mako:132
 msgid "User groups"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:46
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:46
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:50
 msgid "Short, optional description for this user group."
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:59
 msgid "Create User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:5
 msgid "{} user group settings"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37
 #: rhodecode/templates/admin/users/user_edit.mako:43
 msgid "Global permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:38
 #: rhodecode/templates/admin/users/user_edit.mako:44
 msgid "Permissions summary"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5
 msgid "User Group ID"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9
 #: rhodecode/templates/admin/user_groups/user_groups.mako:80
 #: rhodecode/templates/debug_style/form-elements.html:509
 #: rhodecode/templates/user_group/profile.mako:55
 msgid "Members"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10
 msgid "Automatic member sync"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12
 msgid "Assigned to repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:13
 msgid "Assigned to repo groups"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:15
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:19
 msgid "Assigned to review rules"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:21
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6
-#, python-format
-msgid "User Group: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:31
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:22
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:6
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:7
+#: rhodecode/templates/data_table/_dt_elements.mako:305
+#: rhodecode/templates/user_group/user_group.mako:4
+msgid "User group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:35
 msgid "Group members sync"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42
 msgid "This group is set to be automatically synchronised."
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:39
-msgid "This group synchronization was set by"
-msgstr ""
-
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:43
+msgid "This group synchronization was set by"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:47
 msgid "This group is not set to be automatically synchronised"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:56
 msgid "Disable synchronization"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:54
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58
 msgid "Enable synchronization"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:60
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:64
 msgid "Users will be added or removed from this group when they authenticate with RhodeCode system, based on LDAP group membership. This requires `LDAP+User group` authentication plugin to be configured and enabled. (EE only feature)"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:73
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77
 msgid "Delete User Group"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83
 #, python-format
 msgid "Confirm to delete user group `%(ugroup)s` with all permission assignments"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:85
 msgid "Delete This User Group"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:5
-msgid "User Group Permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:36
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:40
 msgid "Change owner of this user group."
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:60
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:64
 msgid "Add members"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:96
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:100
 #: rhodecode/templates/user_group/profile.mako:78
 msgid "No members yet"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_groups.mako:5
-#: rhodecode/templates/admin/users/user_edit_groups.mako:6
+#: rhodecode/templates/admin/users/user_edit_groups.mako:8
 msgid "User groups administration"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_groups.mako:82
 msgid "Sync"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:5
 msgid "Add user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:13
 #: rhodecode/templates/admin/users/user_edit.mako:14
 #: rhodecode/templates/base/base.mako:109
 msgid "Users"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:15
 #: rhodecode/templates/admin/users/users.mako:31
 msgid "Add User"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:53
 msgid "Password confirmation"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:59
 msgid "Generate password"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:106
 msgid "Password change"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:110
 msgid "Force user to change his password on the next login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:116
 msgid "Add personal repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:121
 msgid "New group will be created at: `/{path}`"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:122
 msgid "User will be automatically set as this group owner."
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:128
 msgid "Create User"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:139
 msgid "generated password:"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:5
 msgid "{} user settings"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:31
 msgid "This user is set as disabled"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:39
-#: rhodecode/templates/admin/users/user_edit_profile.mako:5
+#: rhodecode/templates/admin/users/user_edit_profile.mako:7
 #: rhodecode/templates/users/user_profile.mako:6
 msgid "User Profile"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:40
 msgid "Auth tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:46
 msgid "Ip Whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:47
 msgid "User Groups Management"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:5
 msgid "User ID"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:7
 msgid "Source of Record"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:9
 msgid "Last login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:10
 #: rhodecode/templates/admin/users/users.mako:83
 #: rhodecode/templates/forks/forks.mako:67
 msgid "Last activity"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:16
 msgid "Owned Artifacts"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:18
 msgid "Reviewer of pull requests"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:21
 msgid "Member of User groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:22
 msgid "Force password change"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:28
-msgid "User: {}"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:46
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:49
 msgid "Force Password Reset"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:52
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:55
 msgid "Disable forced password reset"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:57
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:60
 msgid "Clear the forced password change flag."
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:64
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:67
 msgid "Confirm to enable forced password change"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:65
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:68
 msgid "Enable forced password reset"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:70
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:73
 msgid "When this is enabled user will have to change they password when they next use RhodeCode system. This will also forbid vcs operations until someone makes a password change in the web interface"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:86
-msgid "Users personal repository group"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:89
+msgid "Users personal repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:92
 msgid "This user currently does not have a personal repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:91
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:94
 #, python-format
 msgid "New group will be created at: `/%(path)s`"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:96
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:99
 msgid "Create personal repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:105
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:108
 msgid "Delete User"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:116
-msgid "Detach repositories"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:119
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:131
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:143
+msgid "Detach repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:122
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:134
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:146
 msgid "Delete repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:128
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:131
 msgid "Detach repository groups"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:140
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:143
 msgid "Detach user groups"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:152
-msgid "Detach Artifacts"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:155
+msgid "Detach pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:158
+msgid "Delete pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:167
+msgid "Detach Artifacts"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:170
 msgid "Delete Artifacts"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:165
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:180
 msgid "New owner for detached objects"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:172
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:188
 msgid "When selecting the detach option, the depending objects owned by this user will be assigned to the above user."
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:174
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:190
 msgid "The delete option will delete the user and all his owned objects!"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:187
-#: rhodecode/templates/data_table/_dt_elements.mako:269
-#, python-format
-msgid "Confirm to delete this user: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:189
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:205
 msgid "Delete this user"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_audit.mako:7
-msgid "User Audit Logs"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_audit.mako:10
+#: rhodecode/templates/admin/users/user_edit_audit.mako:9
+msgid "Audit Logs"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_audit.mako:12
 msgid "Download as JSON"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_caches.mako:33
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:62
+#, python-format
+msgid "Confirm to remove this auth token: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_caches.mako:36
 msgid "Invalidate user cache"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_caches.mako:33
+#: rhodecode/templates/admin/users/user_edit_caches.mako:36
 msgid "Confirm to invalidate user cache"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_emails.mako:5
+#: rhodecode/templates/admin/users/user_edit_emails.mako:7
 msgid "Additional Email Addresses"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_emails.mako:30
+#: rhodecode/templates/admin/users/user_edit_emails.mako:33
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_emails.mako:55
+#: rhodecode/templates/admin/users/user_edit_emails.mako:58
 msgid "New email address"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_groups.mako:12
+#: rhodecode/templates/admin/users/user_edit_groups.mako:15
 #, python-format
 msgid "Add `%s` to user group"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ips.mako:3
+#: rhodecode/templates/admin/users/user_edit_ips.mako:7
 msgid "Custom IP Whitelist"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ips.mako:10
+#: rhodecode/templates/admin/users/user_edit_ips.mako:15
 msgid "IP Address"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ips.mako:11
+#: rhodecode/templates/admin/users/user_edit_ips.mako:16
 msgid "IP Range"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ips.mako:20
+#: rhodecode/templates/admin/users/user_edit_ips.mako:25
 #, python-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ips.mako:64
+#: rhodecode/templates/admin/users/user_edit_ips.mako:69
 msgid ""
 "Enter comma separated list of ip addresses like 10.0.0.1,10.0.0.2.\n"
 "Use a ip address with a mask 127.0.0.1/24, to create a network match pattern.\n"
 "To specify multiple entries on an address range use 127.0.0.1-127.0.0.10 syntax"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:16
-#, python-format
-msgid "This user was created from external source (%s). Editing some of the settings is limited."
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_profile.mako:28
+#: rhodecode/templates/admin/users/user_edit_profile.mako:31
 msgid "Change the avatar at"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:85
+#: rhodecode/templates/admin/users/user_edit_profile.mako:94
 msgid "New Password"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:93
+#: rhodecode/templates/admin/users/user_edit_profile.mako:102
 msgid "New Password Confirmation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:109
+#: rhodecode/templates/admin/users/user_edit_profile.mako:118
 #: rhodecode/templates/admin/users/users.mako:87
 #: rhodecode/templates/base/perms_summary.mako:145
 msgid "Super-admin"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:117
+#: rhodecode/templates/admin/users/user_edit_profile.mako:126
 msgid "Authentication type"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:121
+#: rhodecode/templates/admin/users/user_edit_profile.mako:130
 msgid "When user was created using an external source. He is bound to authentication using this method."
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:126
-msgid "Name in Source of Record"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit_profile.mako:135
+msgid "Name in Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.mako:144
 msgid "Language"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:141
+#: rhodecode/templates/admin/users/user_edit_profile.mako:150
 #, python-format
 msgid "User interface language. Help translate %(rc_link)s into your language."
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:70
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:34
+#, python-format
+msgid "Confirm to remove ssh key %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:75
 msgid "Click add to use this generate SSH key"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:3
+#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7
 msgid "New SSH Key generation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:8
+#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:13
 msgid "Below is a 2048 bit generated SSH RSA key."
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:9
+#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:13
+msgid "If you use older systems please try to generate a"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:13
+msgid "legacy format"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:14
 msgid "If You wish to use it to access RhodeCode via the SSH please save the private key and click `Use this generated key` at the bottom."
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:11
+#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:16
 msgid "Private key"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:27
+#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:32
 msgid "Public key"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:38
-#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:40
+#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:43
+#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:45
 msgid "Use this generated key"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:42
+#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:47
 msgid "Confirmation required on the next screen"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:46
+#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:51
 msgid "SSH key generator has been disabled."
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.mako:5
 msgid "Users administration"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.mako:89
 msgid "Auth type"
 msgstr ""
 
 #: rhodecode/templates/artifacts/artifact_list.mako:5
 msgid "{} Artifacts"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:66
 msgid "RhodeCode instance id: {}"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:94
 msgid "Super-admin Panel"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:96
 msgid "Delegated Admin Panel"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:112
 msgid "Authentication"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:114
 msgid "Defaults"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:154
 #: rhodecode/templates/base/base.mako:194
 #: rhodecode/templates/changeset/changeset.mako:154
 #: rhodecode/templates/files/files_source_header.mako:57
-#: rhodecode/templates/files/files_tree_header.mako:43
+#: rhodecode/templates/files/files_tree_header.mako:44
 #: rhodecode/templates/summary/components.mako:250
 msgid "Show More"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:295
 #: rhodecode/templates/base/base.mako:306
 msgid "RSS Feed"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:297
 msgid "Watch this Repository and actions on it in your personalized journal"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:315
 msgid "Fork of"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:332
 #, python-format
 msgid "Repository locked by %(user)s"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:337
 msgid "Repository not locked. Pull repository to lock it."
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:353
 msgid "This repository has been archived. It is now read-only."
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:366
 #: rhodecode/templates/data_table/_dt_elements.mako:58
 #: rhodecode/templates/data_table/_dt_elements.mako:59
-#: rhodecode/templates/data_table/_dt_elements.mako:205
+#: rhodecode/templates/data_table/_dt_elements.mako:207
 msgid "Summary"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:367
 #: rhodecode/templates/data_table/_dt_elements.mako:63
 #: rhodecode/templates/data_table/_dt_elements.mako:64
 #: rhodecode/templates/files/file_authors_box.mako:30
 #: rhodecode/templates/search/search.mako:99
 #: rhodecode/templates/summary/components.mako:119
 #: rhodecode/templates/summary/components.mako:127
 msgid "Commits"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:368
 #: rhodecode/templates/data_table/_dt_elements.mako:68
 #: rhodecode/templates/data_table/_dt_elements.mako:69
 #: rhodecode/templates/files/files.mako:15
 #: rhodecode/templates/search/search.mako:99
 msgid "Files"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:369
 #: rhodecode/templates/bookmarks/bookmarks.mako:66
 #: rhodecode/templates/branches/branches.mako:65
 #: rhodecode/templates/tags/tags.mako:66
 msgid "Compare"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:374
 #, python-format
 msgid "Show Pull Requests for %s"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:385
 msgid "Artifacts"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:391
 msgid "Repository Settings"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:397
-#: rhodecode/templates/base/base.mako:410
 msgid "Options"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:402
 msgid "Unlock Repository"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:404
 msgid "Lock Repository"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:461
+#: rhodecode/templates/base/base.mako:457
 msgid "Group Home"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:465
+#: rhodecode/templates/base/base.mako:461
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:465
+#: rhodecode/templates/base/base.mako:461
 msgid "Group Settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:508
+#: rhodecode/templates/base/base.mako:504
 msgid "Create"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:516
+#: rhodecode/templates/base/base.mako:512
 msgid "This Repository"
 msgstr ""
 
+#: rhodecode/templates/base/base.mako:514
+msgid "Create Pull Request"
+msgstr ""
+
 #: rhodecode/templates/base/base.mako:518
-msgid "Create Pull Request"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:522
 msgid "Fork this repository"
 msgstr ""
 
+#: rhodecode/templates/base/base.mako:525
+msgid "This Repository Group"
+msgstr ""
+
 #: rhodecode/templates/base/base.mako:529
-msgid "This Repository Group"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:533
-#: rhodecode/templates/base/base.mako:549
-#: rhodecode/templates/base/base.mako:561
+#: rhodecode/templates/base/base.mako:545
+#: rhodecode/templates/base/base.mako:557
 msgid "New Repository"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:539
-#: rhodecode/templates/base/base.mako:553
-#: rhodecode/templates/base/base.mako:567
+#: rhodecode/templates/base/base.mako:535
+#: rhodecode/templates/base/base.mako:549
+#: rhodecode/templates/base/base.mako:563
 msgid "New Repository Group"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:594
+#: rhodecode/templates/base/base.mako:590
 msgid "Sign in"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:619
+#: rhodecode/templates/base/base.mako:615
 msgid "My personal group"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:625
+#: rhodecode/templates/base/base.mako:621
 #: rhodecode/templates/debug_style/alerts.html:5
 #: rhodecode/templates/debug_style/buttons.html:5
 #: rhodecode/templates/debug_style/code-block.html:6
 #: rhodecode/templates/debug_style/collapsable-content.html:5
 #: rhodecode/templates/debug_style/emails.html:5
 #: rhodecode/templates/debug_style/form-elements-small.html:5
 #: rhodecode/templates/debug_style/form-elements.html:5
 #: rhodecode/templates/debug_style/form-inline.html:5
 #: rhodecode/templates/debug_style/form-vertical.html:5
 #: rhodecode/templates/debug_style/forms.html:5
 #: rhodecode/templates/debug_style/icons.html:5
 #: rhodecode/templates/debug_style/index.html:12
 #: rhodecode/templates/debug_style/labels.html:5
 #: rhodecode/templates/debug_style/layout-form-sidebar.html:5
 #: rhodecode/templates/debug_style/login.html:6
 #: rhodecode/templates/debug_style/panels.html:5
 #: rhodecode/templates/debug_style/tables-wide.html:5
 #: rhodecode/templates/debug_style/tables.html:5
 #: rhodecode/templates/debug_style/typography.html:5
 msgid "Style"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:626
+#: rhodecode/templates/base/base.mako:622
 msgid "[Style]"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:643
+#: rhodecode/templates/base/base.mako:639
 msgid "No Bookmarks yet."
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:681
+#: rhodecode/templates/base/base.mako:677
 msgid "Sign Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:737
+#: rhodecode/templates/base/base.mako:725
+msgid "dismiss"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:766
 msgid "search / go to..."
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:780
+#: rhodecode/templates/base/base.mako:811
 msgid "Show activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:781
+#: rhodecode/templates/base/base.mako:812
 #: rhodecode/templates/journal/journal.mako:4
 #: rhodecode/templates/journal/journal.mako:14
 msgid "Journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:786
+#: rhodecode/templates/base/base.mako:817
 msgid "Show Public activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:787
+#: rhodecode/templates/base/base.mako:818
 msgid "Public journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:793
+#: rhodecode/templates/base/base.mako:824
 msgid "Show Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:794
+#: rhodecode/templates/base/base.mako:825
 msgid "Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:800
+#: rhodecode/templates/base/base.mako:831
 msgid "Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:1074
+#: rhodecode/templates/base/base.mako:1135
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:1082
+#: rhodecode/templates/base/base.mako:1143
 msgid "Site-wide shortcuts"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:14
 msgid "Inherited Permissions"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:15
 msgid "Custom Permissions"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:17
 msgid "Default Global Permissions"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:23
 msgid "The following options configure the default permissions each user or group will inherit. You can override these permissions for each individual user or user group using individual permissions settings."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:27
 msgid "Repository Creation"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:32
 msgid "Permission to create root level repositories. When disabled, users can still create repositories inside their own repository groups."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:37
 msgid "Repository Creation With Group Write Access"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:42
 msgid "Write permission given on a repository group will allow creating repositories inside that group."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:47
 msgid "Repository Forking"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:52
 msgid "Permission to create root level repository forks. When disabled, users can still fork repositories inside their own repository groups."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:57
 msgid "Repository Group Creation"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:62
 msgid "Permission to create root level repository groups. When disabled, repository group admins can still create repository subgroups within their repository groups."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:67
 msgid "User Group Creation"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:72
 msgid "Permission to allow user group creation."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:78
 msgid "Inherit Permissions From The Default User"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:83
 msgid "Inherit default permissions from the default user. Turn off this option to force explicit permissions for users, even if they are more restrictive than the default user permissions."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:102
 msgid "Inherit from default settings"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:107
 #, python-format
 msgid ""
 "Select to inherit permissions from %s permissions settings, including default IP address whitelist and inheritance of \n"
 "permission by members of user groups."
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:81
 msgid "Extra Prefix"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:92
 msgid "show examples"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:160
 msgid "Add new"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:168
 msgid "New Entry"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:172
 msgid "Confirm to remove this pattern:"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:293
-#: rhodecode/templates/changeset/changeset_file_comment.mako:271
-#: rhodecode/templates/changeset/changeset_file_comment.mako:322
-#: rhodecode/templates/data_table/_dt_elements.mako:443
-#: rhodecode/templates/files/files_add.mako:61
+#: rhodecode/templates/changeset/changeset_file_comment.mako:275
+#: rhodecode/templates/changeset/changeset_file_comment.mako:326
+#: rhodecode/templates/data_table/_dt_elements.mako:453
+#: rhodecode/templates/files/files_add.mako:60
 #: rhodecode/templates/files/files_edit.mako:62
 msgid "Preview"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:294
 msgid "Test Pattern Preview"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:26
 msgid "in JSON format"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:35
 #: rhodecode/templates/base/perms_summary.mako:43
 msgid "show"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:36
 #: rhodecode/templates/base/perms_summary.mako:44
 msgid "none"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:37
 #: rhodecode/templates/commits/changelog_elements.mako:102
-#: rhodecode/templates/files/base.mako:11
+#: rhodecode/templates/files/base.mako:26
 msgid "merge"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:38
 msgid "push"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:39
 msgid "push force"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:45
 msgid "read"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:46
 msgid "write"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:47
 msgid "admin"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:55
 msgid "No permissions defined"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:63
 #: rhodecode/templates/base/perms_summary.mako:170
 #: rhodecode/templates/base/perms_summary.mako:243
 msgid "Permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:65
 #: rhodecode/templates/base/perms_summary.mako:245
 msgid "Edit Permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:119
 #: rhodecode/templates/base/perms_summary.mako:128
 msgid "edit global"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:136
 msgid "Repository default permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:139
 msgid "Repository group default permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:142
 msgid "User group default permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:148
 msgid "Inherit permissions"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:151
 msgid "Create repositories"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:154
 msgid "Fork repositories"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:157
 msgid "Create repository groups"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:160
 msgid "Create user groups"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:172
 msgid "Edit Branch Permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:286
 msgid "overridden by"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:321
 msgid "No matching permission defined"
 msgstr ""
 
-#: rhodecode/templates/base/root.mako:155
+#: rhodecode/templates/base/root.mako:156
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:16
 msgid "Require SSL for vcs operations"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:19
 msgid "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:29
 msgid "Main Storage Location"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:37
 msgid "Click to unlock. You must restart RhodeCode in order to make this setting take effect."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:41
 msgid "Repository location change is disabled. You can enable this by changing the `allow_repo_location_change` inside .ini file."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:48
 msgid "Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:57
 msgid "Internal Hooks"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:63
 msgid "Show repository size after push"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:67
 msgid "Trigger a hook that calculates repository size after each push."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:71
 msgid "Execute pre/post push hooks"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:74
 msgid "Execute Built in pre/post push hooks. This also executes rcextensions hooks."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:78
 msgid "Execute pre/post pull hooks"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:81
 msgid "Execute Built in pre/post pull hooks. This also executes rcextensions hooks."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:91
 msgid "Mercurial Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:96
 msgid "Enable largefiles extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:100
 msgid "Enable Largefiles extensions for all repositories."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:102
 msgid "Enable Largefiles extensions for this repository."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:113
 msgid "Filesystem location where Mercurial largefile objects should be stored."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:119
 msgid "Set repositories as publishing"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:119
 msgid "Set repository as publishing"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:122
 msgid "When this is enabled all commits in the repository are seen as public commits by clients."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:127
 msgid "Enable hgsubversion extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:130
 msgid "Requires hgsubversion library to be installed. Allows cloning remote SVN repositories and migrates them to Mercurial type."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:136
 msgid "Enable Evolve and Topic extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:140
 msgid "Enable Evolve and Topic extensions for all repositories."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:142
 msgid "Enable Evolve and Topic extensions for this repository."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:153
 msgid "Git Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:158
 msgid "Enable lfs extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:162
 msgid "Enable lfs extensions for all repositories."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:164
 msgid "Enable lfs extensions for this repository."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:175
 msgid "Filesystem location where Git lfs objects should be stored."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:186
 msgid "Global Subversion Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:192
 msgid "Proxy subversion HTTP requests"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:196
 msgid "Subversion HTTP Support. Enables communication with SVN over HTTP protocol."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:197
 msgid "SVN Protocol setup Documentation"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:203
 msgid "Subversion HTTP Server URL"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:209
 msgid "Generate Apache Config"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:221
 msgid "Subversion Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:226
 msgid "Repository patterns"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:230
 msgid "Patterns for identifying SVN branches and tags. For recursive search, use \"*\". Eg.: \"/branches/*\""
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:294
 msgid "Pull Request Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:299
 msgid "Enable server-side merge for pull requests"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:302
 msgid "Note: when this feature is enabled, it only runs hooks defined in the rcextension package. Custom hooks added on the Admin -> Settings -> Hooks page will not be run when pull requests are automatically merged from the web interface."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:306
 msgid "Invalidate and relocate inline comments during update"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:309
 msgid "During the update of a pull request, the position of inline comments will be updated and outdated inline comments will be hidden."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:318
 msgid "Diff cache"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:323
 msgid "Enable caching diffs for pull requests cache and commits"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:332
 msgid "Mercurial Pull Request Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:338
 msgid "Use rebase as merge strategy"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:341
 msgid "Use rebase instead of creating a merge commit when merging via web interface."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:346
 msgid "Close branch before merging it"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:349
 msgid "Close branch before merging it into destination branch. No effect when rebase strategy is use."
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.mako:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.mako:28
 msgid "Compare Selected Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.mako:34
 msgid "bookmarks"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.mako:5
 #, python-format
 msgid "%s Branches"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.mako:28
 msgid "Compare Selected Branches"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.mako:34
 msgid "branches"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:9
 msgid "{} Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:78
 #: rhodecode/templates/commits/changelog_elements.mako:56
 #: rhodecode/templates/files/files_source_header.mako:48
 #: rhodecode/templates/files/files_tree_header.mako:35
 #: rhodecode/templates/summary/summary_commits.mako:43
 msgid "Copy the full commit id"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:83
 msgid "Commit phase"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:90
 #: rhodecode/templates/changeset/changeset.mako:97
 msgid "Evolve State"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:91
 msgid "obsolete"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:98
 msgid "hidden"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:117
 msgid "Commit navigation"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:120
 msgid "Parent Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:120
 msgid "parent"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:124
 msgid "Child Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:124
 msgid "child"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:132
 msgid "Diff options"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:136
 msgid "Raw Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:140
 msgid "Patch Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:144
 msgid "Download Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:224
 msgid "No Child Commits"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:263
 msgid "No Parent Commits"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:33
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:401
 msgid "Resolved by comment #{}"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:40
 msgid "Click to resolve this comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:70
 #: rhodecode/templates/changeset/changeset_file_comment.mako:72
 msgid "pull request !{}"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:77
 msgid "Status change on commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:85
 #: rhodecode/templates/compare/compare_diff.mako:139
 #: rhodecode/templates/email_templates/commit_comment.mako:53
 msgid "Commit status"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:94
 msgid "Pull request author"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:95
 msgid "author"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:103
 #: rhodecode/templates/changeset/changeset_file_comment.mako:119
 msgid "Outdated comment from pull request version v{0}, latest v{1}"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:107
 #: rhodecode/templates/changeset/changeset_file_comment.mako:122
 msgid "Comment from pull request version v{0}, latest v{1}"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:149
 #: rhodecode/templates/changeset/changeset_file_comment.mako:152
 msgid "Prev"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:150
 #: rhodecode/templates/changeset/changeset_file_comment.mako:153
 msgid "Next"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:188
+#: rhodecode/templates/changeset/changeset_file_comment.mako:192
 msgid "Leave a comment on this Pull Request."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:190
+#: rhodecode/templates/changeset/changeset_file_comment.mako:194
 msgid "Leave a comment on {} commits in this range."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:192
+#: rhodecode/templates/changeset/changeset_file_comment.mako:196
 msgid "Leave a comment on this Commit."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:279
-#: rhodecode/templates/codeblocks/diffs.mako:79
+#: rhodecode/templates/changeset/changeset_file_comment.mako:283
+#: rhodecode/templates/codeblocks/diffs.mako:83
 msgid "You need to be logged in to leave comments."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:280
-#: rhodecode/templates/codeblocks/diffs.mako:79
+#: rhodecode/templates/changeset/changeset_file_comment.mako:284
+#: rhodecode/templates/codeblocks/diffs.mako:83
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:327
+#: rhodecode/templates/changeset/changeset_file_comment.mako:331
 msgid "Mark as"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:350
+#: rhodecode/templates/changeset/changeset_file_comment.mako:354
 #: rhodecode/templates/files/files_upload.mako:86
 msgid "Drag'n Drop files here or"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:350
+#: rhodecode/templates/changeset/changeset_file_comment.mako:354
 #: rhodecode/templates/files/files_upload.mako:86
 msgid "Choose your files"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:353
+#: rhodecode/templates/changeset/changeset_file_comment.mako:357
 msgid "uploading..."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:384
+#: rhodecode/templates/changeset/changeset_file_comment.mako:388
 #: rhodecode/templates/compare/compare_diff.mako:108
 #: rhodecode/templates/compare/compare_diff.mako:116
 #: rhodecode/templates/compare/compare_diff.mako:124
 #: rhodecode/templates/compare/compare_diff.mako:126
 msgid "Comment"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:403
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:16
+#: rhodecode/templates/changeset/changeset_file_comment.mako:407
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:39
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:103
 #: rhodecode/templates/pullrequests/pullrequests.mako:31
 msgid "Closed"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:412
+#: rhodecode/templates/changeset/changeset_file_comment.mako:416
 msgid "Comments parsed using {} syntax."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:413
+#: rhodecode/templates/changeset/changeset_file_comment.mako:417
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:414
+#: rhodecode/templates/changeset/changeset_file_comment.mako:418
 msgid "and"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:415
+#: rhodecode/templates/changeset/changeset_file_comment.mako:419
 msgid "Start typing with / for certain actions to be triggered via text box."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:416
+#: rhodecode/templates/changeset/changeset_file_comment.mako:420
 msgid "actions supported."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:5
 #, python-format
 msgid "%s Commits"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:33
 msgid "Commit Range"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:42
 msgid "Range"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:60
 msgid "Diff Option"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:71
 msgid "Show combined diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:7
 msgid "The requested commit is too big and content was truncated."
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:7
 #: rhodecode/templates/changeset/diff_block.mako:10
 #: rhodecode/templates/changeset/diff_block.mako:25
 #: rhodecode/templates/changeset/diff_block.mako:46
-#: rhodecode/templates/codeblocks/diffs.mako:204
-#: rhodecode/templates/codeblocks/diffs.mako:268
+#: rhodecode/templates/codeblocks/diffs.mako:208
+#: rhodecode/templates/codeblocks/diffs.mako:272
 msgid "Showing a big diff might take some time and resources, continue?"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:7
 #: rhodecode/templates/changeset/diff_block.mako:10
 #: rhodecode/templates/changeset/diff_block.mako:25
 #: rhodecode/templates/changeset/diff_block.mako:46
-#: rhodecode/templates/codeblocks/diffs.mako:204
-#: rhodecode/templates/codeblocks/diffs.mako:268
+#: rhodecode/templates/codeblocks/diffs.mako:208
+#: rhodecode/templates/codeblocks/diffs.mako:272
 msgid "Show full diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:10
 msgid "The requested file is too big and its content is not shown."
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:25
 #: rhodecode/templates/changeset/diff_block.mako:46
 msgid "Diff was truncated. File content available only in full diff."
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:125
-msgid "Expand all files"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:127
-msgid "Collapse all files"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:137
+#: rhodecode/templates/codeblocks/diffs.mako:141
 msgid "not available in this view"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:146
+#: rhodecode/templates/codeblocks/diffs.mako:150
 msgid "{} unresolved"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:149
+#: rhodecode/templates/codeblocks/diffs.mako:153
 msgid "0 unresolved"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:152
+#: rhodecode/templates/codeblocks/diffs.mako:156
 msgid "{} Resolved"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:166
+#: rhodecode/templates/codeblocks/diffs.mako:170
 msgid "0 General"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:174
+#: rhodecode/templates/codeblocks/diffs.mako:178
 msgid "0 Inline"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:185
-#: rhodecode/templates/codeblocks/diffs.mako:190
+#: rhodecode/templates/codeblocks/diffs.mako:189
+#: rhodecode/templates/codeblocks/diffs.mako:194
 msgid "{} Outdated"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:187
+#: rhodecode/templates/codeblocks/diffs.mako:191
 msgid "show outdated"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:188
+#: rhodecode/templates/codeblocks/diffs.mako:192
 msgid "hide outdated"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:203
+#: rhodecode/templates/codeblocks/diffs.mako:207
 msgid "The requested changes are too big and content was truncated."
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:227
+#: rhodecode/templates/codeblocks/diffs.mako:231
 msgid "Some changes may be hidden"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:229
+#: rhodecode/templates/codeblocks/diffs.mako:233
 msgid "No files"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:268
+#: rhodecode/templates/codeblocks/diffs.mako:272
 msgid "The requested commit or file is too big and content was truncated."
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:275
+#: rhodecode/templates/codeblocks/diffs.mako:279
 #, python-format
 msgid "This diff has been collapsed as it changes many lines, (%i lines changed)"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:277
+#: rhodecode/templates/codeblocks/diffs.mako:281
 msgid "Show them"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:280
+#: rhodecode/templates/codeblocks/diffs.mako:284
 msgid "Hide them"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:316
-#: rhodecode/templates/codeblocks/diffs.mako:335
+#: rhodecode/templates/codeblocks/diffs.mako:320
+#: rhodecode/templates/codeblocks/diffs.mako:339
 msgid "Unmatched/outdated inline comments below"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:341
+#: rhodecode/templates/codeblocks/diffs.mako:345
 msgid "Unmatched/outdated comments below"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:409
-msgid "File was deleted in this version. There are still outdated/unresolved comments attached to it."
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:476
-msgid "Copy the full path"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:543
-#: rhodecode/templates/codeblocks/diffs.mako:561
+#: rhodecode/templates/codeblocks/diffs.mako:419
+msgid "This file was removed from diff during updates to this pull-request."
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:420
+msgid "There are still outdated/unresolved comments attached to it."
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:487
+msgid "Copy file path"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:554
+#: rhodecode/templates/codeblocks/diffs.mako:572
 #, python-format
 msgid "Show file at commit: %(commit_id)s"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:545
-#: rhodecode/templates/codeblocks/diffs.mako:552
+#: rhodecode/templates/codeblocks/diffs.mako:556
+#: rhodecode/templates/codeblocks/diffs.mako:563
 msgid "Show file before"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:550
-#: rhodecode/templates/codeblocks/diffs.mako:568
+#: rhodecode/templates/codeblocks/diffs.mako:561
+#: rhodecode/templates/codeblocks/diffs.mako:579
 #, python-format
 msgid "File not present at commit: %(commit_id)s"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:563
-#: rhodecode/templates/codeblocks/diffs.mako:570
+#: rhodecode/templates/codeblocks/diffs.mako:574
+#: rhodecode/templates/codeblocks/diffs.mako:581
 msgid "Show file after"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:577
+#: rhodecode/templates/codeblocks/diffs.mako:588
 msgid "Show comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:577
+#: rhodecode/templates/codeblocks/diffs.mako:588
 msgid "Hide comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:646
-#: rhodecode/templates/codeblocks/diffs.mako:689
-#: rhodecode/templates/codeblocks/diffs.mako:745
+#: rhodecode/templates/codeblocks/diffs.mako:658
+#: rhodecode/templates/codeblocks/diffs.mako:701
+#: rhodecode/templates/codeblocks/diffs.mako:757
 msgid "comments including outdated"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:648
-#: rhodecode/templates/codeblocks/diffs.mako:691
-#: rhodecode/templates/codeblocks/diffs.mako:747
+#: rhodecode/templates/codeblocks/diffs.mako:660
+#: rhodecode/templates/codeblocks/diffs.mako:703
+#: rhodecode/templates/codeblocks/diffs.mako:759
 msgid "comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:816
+#: rhodecode/templates/codeblocks/diffs.mako:828
 msgid "Toggle wide diff"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:824
+#: rhodecode/templates/codeblocks/diffs.mako:836
 msgid "View diff as side by side"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:826
+#: rhodecode/templates/codeblocks/diffs.mako:838
 msgid "Side by Side"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:831
+#: rhodecode/templates/codeblocks/diffs.mako:843
 msgid "View diff as unified"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:832
-msgid "Unified"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:837
-msgid "Turn off: Show the diff as commit range"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:840
-#: rhodecode/templates/codeblocks/diffs.mako:847
-msgid "Range Diff"
-msgstr ""
-
 #: rhodecode/templates/codeblocks/diffs.mako:844
+msgid "Unified"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:849
+msgid "Turn off: Show the diff as commit range"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:852
+#: rhodecode/templates/codeblocks/diffs.mako:859
+msgid "Range Diff"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:856
 msgid "Show the diff as commit range"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:888
+#: rhodecode/templates/codeblocks/diffs.mako:900
 msgid "Disabled on range diff"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:1119
+#: rhodecode/templates/codeblocks/diffs.mako:1131
 msgid "..."
 msgstr ""
 
 #: rhodecode/templates/codeblocks/source.mako:22
 msgid "view annotation from before this change"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:6
 #, python-format
 msgid "%s Changelog"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:38
 msgid "Clear filter"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:45
 msgid "Hide obsolete/hidden"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:47
 msgid "Show obsolete/hidden"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:50
 msgid "Show hidden"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:59
 #: rhodecode/templates/compare/compare_diff.mako:93
 #, python-format
 msgid "Compare fork with %s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:69
 #, python-format
 msgid "Compare fork with Parent (%s)"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:107
 msgid "Clear selection"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:110
 msgid "Select second commit"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:116
 msgid "Commit Message"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:118
 #: rhodecode/templates/summary/summary_commits.mako:10
 msgid "Age"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:121
 #: rhodecode/templates/summary/summary_commits.mako:12
 msgid "Refs"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:262
 msgid "Branch filter"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:323
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:8
 msgid "load previous"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:35
 #: rhodecode/templates/summary/summary_commits.mako:27
 #, python-format
 msgid ""
 "Commit status: %s\n"
 "Click to open associated pull request #%s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:39
 #: rhodecode/templates/summary/summary_commits.mako:31
 msgid "Commit status: {}"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:45
 #: rhodecode/templates/summary/summary_commits.mako:37
 msgid "Commit status: Not Reviewed"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:63
 msgid "{} commit phase"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:69
 msgid "Obsolete Evolve State"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:74
 msgid "Hidden Evolve State"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:80
-#: rhodecode/templates/compare/compare_commits.mako:48
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:582
+#: rhodecode/templates/compare/compare_commits.mako:46
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:597
 #: rhodecode/templates/search/search_commit.mako:34
 msgid "Expand commit message"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:108
-#: rhodecode/templates/files/base.mako:36
+#: rhodecode/templates/files/base.mako:51
 #: rhodecode/templates/summary/summary_commits.mako:78
 #, python-format
 msgid "Branch %s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:116
-#: rhodecode/templates/files/base.mako:17
+#: rhodecode/templates/files/base.mako:32
 #: rhodecode/templates/summary/summary_commits.mako:64
 #, python-format
 msgid "Bookmark %s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:124
-#: rhodecode/templates/files/base.mako:27
+#: rhodecode/templates/files/base.mako:42
 #: rhodecode/templates/summary/summary_commits.mako:71
 #, python-format
 msgid "Tag %s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:135
 #: rhodecode/templates/summary/summary_commits.mako:87
 msgid "Commit has comments"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:150
 msgid "load next"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_file_history.mako:33
 msgid "Show File"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_file_history.mako:38
 msgid "Diff File"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_file_history.mako:46
 msgid "Show Full History"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_commits.mako:5
-msgid "Common Ancestor Commit"
-msgstr ""
-
-#: rhodecode/templates/compare/compare_commits.mako:8
-msgid "Compare was calculated based on this shared commit."
-msgstr ""
-
-#: rhodecode/templates/compare/compare_commits.mako:17
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:543
+msgid "Compare was calculated based on this common ancestor commit"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_commits.mako:15
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:558
 msgid "Time"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_commits.mako:66
+#: rhodecode/templates/compare/compare_commits.mako:64
 msgid "No commits in this compare"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:7
 #: rhodecode/templates/compare/compare_diff.mako:9
 #, python-format
 msgid "%s Compare"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:38
 #: rhodecode/templates/compare/compare_diff.mako:90
 #: rhodecode/templates/compare/compare_diff.mako:114
 #: rhodecode/templates/compare/compare_diff.mako:119
 msgid "Compare Commits"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:40
 msgid "for file"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:56
 msgid "Target"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:70
 #: rhodecode/templates/files/files_source.mako:100
 msgid "Source"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:102
 msgid "Compare with origin"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:107
 #: rhodecode/templates/compare/compare_diff.mako:108
 #: rhodecode/templates/compare/compare_diff.mako:114
 #: rhodecode/templates/compare/compare_diff.mako:115
 #: rhodecode/templates/compare/compare_diff.mako:116
 #: rhodecode/templates/compare/compare_diff.mako:126
 msgid "Action unavailable in current view"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:107
 #: rhodecode/templates/compare/compare_diff.mako:115
 #: rhodecode/templates/compare/compare_diff.mako:120
 msgid "Swap"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:110
 msgid "Compare commits, branches, bookmarks or tags."
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:73
 #: rhodecode/templates/data_table/_dt_elements.mako:74
 msgid "Fork"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:95
 msgid "Mercurial repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:97
 msgid "Git repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:99
 msgid "Subversion repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:106
 msgid "Public repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:116
 msgid "This repository is being created in a background task"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:117
 msgid "creating..."
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:149
 msgid "No commits yet"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:156
 #: rhodecode/templates/data_table/_dt_elements.mako:158
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:164
 #: rhodecode/templates/data_table/_dt_elements.mako:166
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:189
+#: rhodecode/templates/data_table/_dt_elements.mako:191
 msgid "Creating"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:191
+#: rhodecode/templates/data_table/_dt_elements.mako:193
 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:10
 msgid "Created"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:234
+#: rhodecode/templates/data_table/_dt_elements.mako:236
 msgid "personal"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:281
-#, python-format
-msgid "Confirm to delete this user group: %s"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.mako:297
-#: rhodecode/templates/user_group/user_group.mako:4
-msgid "User group"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.mako:379
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:51
-msgid "Pull request !{}"
-msgstr ""
-
 #: rhodecode/templates/data_table/_dt_elements.mako:387
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:50
+msgid "Pull request !{}"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.mako:395
 msgid "Work in progress"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:421
+#: rhodecode/templates/data_table/_dt_elements.mako:429
 msgid "Info"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:427
-#, python-format
-msgid "Confirm to delete this artifact: %s"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.mako:460
+#: rhodecode/templates/data_table/_dt_elements.mako:470
 #, python-format
 msgid "Parsed using %s syntax"
 msgstr ""
 
 #: rhodecode/templates/debug_style/buttons.html:131
 msgid "Confirm to remove this field: Field"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:107
 msgid "Default"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:513
 #: rhodecode/templates/debug_style/form-elements.html:565
 #: rhodecode/templates/debug_style/forms.html:236
 msgid "Chosen group members"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:525
 #: rhodecode/templates/debug_style/form-elements.html:569
 #: rhodecode/templates/debug_style/forms.html:240
 msgid "Remove all elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:535
 #: rhodecode/templates/debug_style/form-elements.html:579
 #: rhodecode/templates/debug_style/forms.html:250
 msgid "Available members"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:543
 #: rhodecode/templates/debug_style/form-elements.html:587
 #: rhodecode/templates/debug_style/forms.html:258
 msgid "Add all elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/forms.html:119
 msgid "Some text..."
 msgstr ""
 
 #: rhodecode/templates/debug_style/forms.html:122
 #: rhodecode/templates/debug_style/forms.html:255
 msgid "Variable Item"
 msgstr ""
 
 #: rhodecode/templates/debug_style/forms.html:252
 msgid "Some example text..."
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:5
 msgid "Debug Style"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:54
 msgid "Index"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:56
 msgid "Typography"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:57
 msgid "Forms"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:58
 msgid "Buttons"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:59
 msgid "Labels"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:60
 msgid "Alerts"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:61
 msgid "Tables"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:62
 msgid "Tables wide"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:63
 msgid "Collapsable Content"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:65
 msgid "Layout form with sidebar"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:66
 msgid "Login"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:67
 msgid "Login 2"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:68
 msgid "Code blocks"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:71
 msgid "Panels"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:74
 msgid "Form elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:75
 msgid "Form elements small"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:76
 msgid "Form inline elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:77
 msgid "Form vertical"
 msgstr ""
 
 #: rhodecode/templates/debug_style/login.html:28
 msgid "Sign in to your account"
 msgstr ""
 
 #: rhodecode/templates/debug_style/login.html:46
 msgid "(Forgot password?)"
 msgstr ""
 
 #: rhodecode/templates/debug_style/login.html:56
 msgid "Don't have an account ?"
 msgstr ""
 
 #: rhodecode/templates/email_templates/base.mako:75
-#: rhodecode/templates/email_templates/base.mako:519
+#: rhodecode/templates/email_templates/base.mako:597
 msgid "This is a notification from RhodeCode."
 msgstr ""
 
-#: rhodecode/templates/email_templates/base.mako:501
+#: rhodecode/templates/email_templates/base.mako:577
 msgid "RhodeCode"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:23
 #: rhodecode/templates/email_templates/commit_comment.mako:26
 #: rhodecode/templates/email_templates/commit_comment.mako:28
 #: rhodecode/templates/email_templates/pull_request_comment.mako:24
 #: rhodecode/templates/email_templates/pull_request_comment.mako:27
 #: rhodecode/templates/email_templates/pull_request_comment.mako:29
 msgid "[mention]"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:23
 msgid "{user} left a {comment_type} on file `{comment_file}` in commit `{commit_id}`"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:23
 #: rhodecode/templates/email_templates/commit_comment.mako:26
 #: rhodecode/templates/email_templates/commit_comment.mako:28
 msgid "in the `{repo_name}` repository"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:26
 msgid "[status: {status}] {user} left a {comment_type} on commit `{commit_id}`"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:28
 msgid "{user} left a {comment_type} on commit `{commit_id}`"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:50
 #: rhodecode/templates/email_templates/pull_request_comment.mako:60
 msgid "Comment link"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:53
 #: rhodecode/templates/email_templates/commit_comment.mako:129
 msgid "Status was changed to"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:58
 #: rhodecode/templates/email_templates/commit_comment.mako:141
 #: rhodecode/templates/search/search_commit.mako:12
 #: rhodecode/templates/summary/summary_commits.mako:9
 msgid "Commit message"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:61
 #: rhodecode/templates/email_templates/pull_request_comment.mako:74
 msgid "File: {comment_file} on line {comment_line}"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:65
 #: rhodecode/templates/email_templates/commit_comment.mako:155
 #: rhodecode/templates/email_templates/pull_request_comment.mako:78
 #: rhodecode/templates/email_templates/pull_request_comment.mako:186
 msgid "`TODO` number"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:67
 #: rhodecode/templates/email_templates/commit_comment.mako:157
 #: rhodecode/templates/email_templates/pull_request_comment.mako:80
 #: rhodecode/templates/email_templates/pull_request_comment.mako:188
 msgid "`Note` number"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:99
 #: rhodecode/templates/email_templates/pull_request_comment.mako:120
 msgid "left a"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:102
 msgid "{comment_type} on file `{comment_file}` in commit."
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:104
 msgid "{comment_type} on commit."
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:109
 msgid "of repository"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:127
 msgid "Commit Status"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:147
 #: rhodecode/templates/email_templates/pull_request_comment.mako:178
 #: rhodecode/templates/search/search_path.mako:9
 msgid "File"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:148
 #: rhodecode/templates/email_templates/pull_request_comment.mako:179
 msgid "`{comment_file}` on line {comment_line}"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:167
 #: rhodecode/templates/email_templates/pull_request_comment.mako:198
 msgid "Reply"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:24
 msgid "{user} left a {comment_type} on file `{comment_file}` in pull request !{pr_id}: \"{pr_title}\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:27
 msgid "[status: {status}] {user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:29
 msgid "{user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:62
 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:24
 msgid "Pull Request"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:64
 #: rhodecode/templates/email_templates/pull_request_review.mako:39
 #: rhodecode/templates/email_templates/pull_request_update.mako:39
 msgid "Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:67
 msgid "{user} submitted pull request !{pr_id} status: *{status}*"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:70
 msgid "{user} submitted pull request !{pr_id} status: *{status} and closed*"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:123
 msgid "{comment_type} on file `{comment_file}` in pull request."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:125
 msgid "{comment_type} on pull request."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:130
 #: rhodecode/templates/email_templates/pull_request_comment.mako:159
 #: rhodecode/templates/email_templates/pull_request_review.mako:89
 #: rhodecode/templates/email_templates/pull_request_review.mako:105
 #: rhodecode/templates/email_templates/pull_request_update.mako:101
 #: rhodecode/templates/email_templates/pull_request_update.mako:117
 msgid "Pull request"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:148
 msgid "Review Status"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:151
 msgid "Closed pull request with status"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:153
 msgid "Submitted review status"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:168
 #: rhodecode/templates/email_templates/pull_request_review.mako:114
 #: rhodecode/templates/email_templates/pull_request_update.mako:126
 msgid "Commit Flow"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:170
 #: rhodecode/templates/email_templates/pull_request_comment.mako:172
 #: rhodecode/templates/email_templates/pull_request_review.mako:116
 #: rhodecode/templates/email_templates/pull_request_review.mako:118
 #: rhodecode/templates/email_templates/pull_request_update.mako:128
 #: rhodecode/templates/email_templates/pull_request_update.mako:130
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:128
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:137
 msgid "of"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:15
 msgid "{user} requested a pull request review. !{pr_id}: \"{pr_title}\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:37
 #: rhodecode/templates/email_templates/pull_request_update.mako:37
 msgid "Pull Request link"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:83
 msgid "requested a"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:85
 msgid "pull request review."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_update.mako:15
 msgid "{updating_user} updated pull request. !{pr_id}: \"{pr_title}\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_update.mako:95
 msgid "updated"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_update.mako:97
 msgid "pull request."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_update.mako:139
 msgid "Changes"
 msgstr ""
 
 #: rhodecode/templates/email_templates/test.mako:5
 msgid "hello \"world\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/test.mako:22
 msgid "Translation String"
 msgstr ""
 
 #: rhodecode/templates/email_templates/user_registration.mako:28
 msgid "New user {user} has registered on {date}"
 msgstr ""
 
 #: rhodecode/templates/email_templates/user_registration.mako:46
 msgid "Full Name"
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.mako:47
+#: rhodecode/templates/errors/error_document.mako:48
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.mako:65
+#: rhodecode/templates/errors/error_document.mako:66
 msgid "Support Page"
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:3
 #, python-format
 msgid "%(user)s commited on %(date)s UTC"
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:30
 msgid "Commit was too big and was cut off..."
 msgstr ""
 
 #: rhodecode/templates/files/file_authors_box.mako:18
 msgid "Load All Authors"
 msgstr ""
 
 #: rhodecode/templates/files/file_authors_box.mako:20
 msgid "last author"
 msgstr ""
 
 #: rhodecode/templates/files/files.mako:4
 #: rhodecode/templates/files/files_pjax.mako:2
 msgid "{} Files"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:4
 msgid "{} Files Add"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:25
 msgid "Add new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:44
 #: rhodecode/templates/files/files_edit.mako:45
 msgid "Filename e.g example.py, or docs/readme.md"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:65
+#: rhodecode/templates/files/files_add.mako:64
 #: rhodecode/templates/files/files_edit.mako:66
 msgid "Line wraps on"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:65
+#: rhodecode/templates/files/files_add.mako:64
 #: rhodecode/templates/files/files_edit.mako:66
 msgid "line wraps off"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:88
+#: rhodecode/templates/files/files_add.mako:87
 #: rhodecode/templates/files/files_delete.mako:72
 #: rhodecode/templates/files/files_edit.mako:89
 #: rhodecode/templates/files/files_upload.mako:102
 msgid "Commit changes"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:9
 msgid "Previous commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:15
 msgid "Next commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:22
 msgid "Upload File"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:25
 msgid "Add File"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:35
 msgid "Download full tree ZIP"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:39
 msgid "Download this tree ZIP"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:67
 #: rhodecode/templates/summary/summary.mako:37
 #, python-format
 msgid "Readme file from commit %s:%s"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser_tree.mako:14
 #: rhodecode/templates/search/search_path.mako:12
 msgid "Size"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser_tree.mako:15
 msgid "Modified"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser_tree.mako:16
 msgid "Last Commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:4
 msgid "{} Files Delete"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:25
 msgid "Delete file"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:53
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:58
-#: rhodecode/templates/files/files_source.mako:125
+#: rhodecode/templates/files/files_source.mako:128
 msgid "File size {} is bigger then allowed limit {}. "
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.mako:4
 msgid "{} Files Edit"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.mako:25
 msgid "Edit file"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:16
 msgid "Download largefile"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:20
 msgid "Download file"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:29
 msgid "Editing binary files not allowed"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:33
 msgid "Edit on branch: "
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:42
 msgid "Editing files allowed only when on branch head commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:43
 msgid "Deleting files allowed only when on branch head commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:65
 msgid "lines"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:73
 msgid "This file is a pointer to large binary file"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:73
 msgid "LargeFile"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:96
 msgid "History"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:102
 msgid "Annotation"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:104
 msgid "Raw"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:120
+#: rhodecode/templates/files/files_source.mako:107
+msgid "Copy permalink"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.mako:123
 msgid "Binary file ({})"
 msgstr ""
 
 #: rhodecode/templates/files/files_source_header.mako:33
 msgid "File last commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:4
 msgid "{} Files Upload"
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:36
 msgid "Uploading..."
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:38
 msgid "Uploaded"
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:52
 msgid "Upload new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:109
-msgid "Commiting..."
+msgid "Committing..."
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:110
 msgid "Please wait while the files are being uploaded"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:5
 #, python-format
 msgid "Fork repository %s"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:30
 #: rhodecode/templates/forks/forks.mako:60
 msgid "Fork name"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.mako:71
+#: rhodecode/templates/forks/fork.mako:78
 msgid "Copy permissions"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.mako:75
+#: rhodecode/templates/forks/fork.mako:82
 msgid "Copy permissions from parent repository."
 msgstr ""
 
-#: rhodecode/templates/forks/fork.mako:81
+#: rhodecode/templates/forks/fork.mako:88
 msgid "Private"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.mako:90
+#: rhodecode/templates/forks/fork.mako:97
 msgid "Fork this Repository"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.mako:5
 #, python-format
 msgid "%s Forks"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.mako:28
 msgid "Create new fork"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.mako:64
 msgid "Forked"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.mako:25
 msgid "ATOM journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.mako:26
 msgid "RSS journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/journal_data.mako:45
 msgid "No entries yet"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.mako:4
 #: rhodecode/templates/journal/public_journal.mako:12
 msgid "Public Journal"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.mako:21
 msgid "ATOM public journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.mako:22
 msgid "RSS public journal feed"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:5
 #: rhodecode/templates/pullrequests/pullrequest.mako:28
 msgid "New pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:60
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:118
 msgid "Commit flow"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:68
 msgid "Source repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:86
 msgid "Loading refs..."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:97
 msgid "Submit Pull Request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:111
 msgid "Author of this pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:125
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:286
 msgid "Reviewer rules"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:135
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:300
 msgid "Pull request reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:146
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:344
 msgid "Add reviewer or reviewer group"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:302
-#: rhodecode/templates/pullrequests/pullrequest.mako:519
-msgid "Please select source and target"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.mako:308
-msgid "Loading compare ..."
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.mako:367
+#: rhodecode/templates/pullrequests/pullrequest.mako:317
 msgid "Show detailed compare."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:374
+#: rhodecode/templates/pullrequests/pullrequest.mako:324
 msgid "There are no commits to merge."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:424
-#: rhodecode/templates/pullrequests/pullrequest.mako:450
+#: rhodecode/templates/pullrequests/pullrequest.mako:418
+#: rhodecode/templates/pullrequests/pullrequest.mako:444
 msgid "Select commit reference"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:440
+#: rhodecode/templates/pullrequests/pullrequest.mako:434
 msgid "Target repository"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest.mako:513
+msgid "Please select source and target"
+msgstr ""
+
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7
 msgid "This pull request can be merged automatically."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12
 msgid "Merge is not currently possible because of below failed checks."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:61
 msgid "Close with status {}"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:66
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:76
 msgid "Merge and close Pull Request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:70
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:75
 msgid "refresh checks"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:76
 msgid "You are not allowed to merge this pull request."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:78
 msgid "Login to Merge this Pull Request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:6
 msgid "{} Pull Request !{}"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:53
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:52
 msgid "Last updated on"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:54
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:53
 msgid "by"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:63
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:62
 msgid "Update title & description"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:67
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:71
-msgid "Delete pull request"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:68
-msgid "Confirm to delete this pull request"
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:71
+msgid "Delete pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71
 msgid "Not allowed to delete this pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:81
 msgid "Rendered using {} renderer"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:95
 msgid "Review status"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:151
 msgid "Common ancestor"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:155
 msgid "not available"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:167
 msgid "Pull changes from source"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:168
 msgid "Copy the pull url"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:180
 msgid "Clone repository in its merged state using shadow repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:180
 msgid "Clone from shadow repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:181
 #: rhodecode/templates/summary/components.mako:78
 msgid "Copy the clone url"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:185
 msgid "Shadow repository data not available"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:201
 msgid "Versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:213
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:215
 msgid "show versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:214
 msgid "hide versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:239
 msgid "Your review status at this version"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:244
 msgid "Comments from pull request version v{0}"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:262
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:266
 msgid "select versions to show changes"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:263
 msgid "show changes between versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:264
 msgid "show pull request for this version"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:273
 msgid "Pull request versions not available"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:349
 msgid "Save Changes"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:386
 msgid "unresolved TODOs unavailable in this view"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:422
 msgid "No unresolved TODOs"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:440
 msgid "Cannot show diff when pull request state is changing. Current progress state"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:453
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:458
 msgid "Missing requirements:"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:454
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:459
 msgid "These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:462
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:467
 msgid "Missing commits"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:463
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:468
 msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:464
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:469
 msgid "Please update this pull request, push the commits back into the source repository, or consider closing this pull request."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:465
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:470
 msgid "Consider doing a {force_refresh_url} in case you think this is an error."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:476
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:479
+msgid "There are new changes for {}:{} in source repository, please consider updating this pull request."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:491
 #, python-format
 msgid "Showing changes at v%d, commenting is disabled."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:499
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:521
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:514
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:536
 msgid "Update commits"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:502
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:517
 msgid "more update options"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:510
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:525
 msgid "Force update commits"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:513
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:528
 msgid "Update commits and force refresh this pull request."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:521
-msgid "Update is disabled for current view"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:532
-msgid "Commits and changes between v{ver_from} and {ver_to} of this pull request, commenting is disabled"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:536
+msgid "Update is disabled for current view"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:547
+msgid "Commits and changes between v{ver_from} and {ver_to} of this pull request, commenting is disabled"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:551
 msgid "commits added: {}, removed: {}"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:554
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:569
 msgid "Commit added in displayed changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:556
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:571
 msgid "Commit removed in displayed changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:664
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:679
 msgid "there is {num} general comment from older versions"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:665
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:680
 msgid "show it"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:667
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:682
 msgid "there are {num} general comments from older versions"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:668
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:683
 msgid "show them"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:4
 msgid "{} Pull Requests"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:27
 msgid "Opened"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:28
 msgid "Opened by me"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:29
 msgid "Awaiting review"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:30
 msgid "Awaiting my review"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:32
 msgid "From this repo"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:40
 msgid "Open new Pull Request"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:6
 #: rhodecode/templates/search/search.mako:19
 msgid "Search inside repository {repo_name}"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:8
 #: rhodecode/templates/search/search.mako:21
 msgid "Search inside repository group {repo_group_name}"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:10
 #: rhodecode/templates/search/search.mako:23
 msgid "Search inside all accessible repositories"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:99
 msgid "File path"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:102
 msgid "Search"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:108
 #: rhodecode/templates/search/search.mako:110
 #: rhodecode/templates/search/search.mako:112
 msgid "Global Search"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:138
 msgid "sort"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:157
 msgid "Query Language examples"
 msgstr ""
 
 #: rhodecode/templates/search/search_commit.mako:15
 msgid "Commit date"
 msgstr ""
 
 #: rhodecode/templates/search/search_content.mako:7
 msgid "No content matched"
 msgstr ""
 
 #: rhodecode/templates/search/search_content.mako:12
 msgid "more matches in this file"
 msgstr ""
 
 #: rhodecode/templates/search/search_content.mako:112
 msgid "Narrow to this repository group"
 msgstr ""
 
 #: rhodecode/templates/search/search_content.mako:119
 msgid "Narrow to this repository"
 msgstr ""
 
 #: rhodecode/templates/search/search_path.mako:15
 msgid "Lines"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:20
 msgid "Closed Branch"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:83
 msgid "Copy the clone by id url"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:88
 msgid "Copy the clone by ssh url"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:92
 msgid "SVN Protocol is disabled. To enable it, see the"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:92
 msgid "documentation here"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:135
 msgid "Number of Repository Forks"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:172
 msgid "Downloads"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:177
 msgid "There are no downloads yet"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:181
 msgid "Downloads are disabled for this repository"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:203
 msgid "Repository size"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:215
 msgid "Calculating Repository Size..."
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:226
 msgid "Code Statistics"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:235
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.mako:21
 msgid "Quick start"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_base.mako:5
 msgid "{} Summary"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_base.mako:13
 #, python-format
 msgid "%s ATOM feed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_base.mako:14
 #, python-format
 msgid "%s RSS feed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:117
 msgid "Add or upload files directly via RhodeCode:"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:119
 msgid "Add New File"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:122
 msgid "Upload New File"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:128
 msgid "Push new repo:"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:151
 msgid "Existing repository?"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.mako:5
 #, python-format
 msgid "%s Tags"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.mako:28
 msgid "Compare Selected Tags"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.mako:34
 msgid "tags"
 msgstr ""
 
 #: rhodecode/templates/user_group/profile.mako:6
 msgid "User Group Profile"
 msgstr ""
 
 #: rhodecode/templates/user_group/profile.mako:15
 msgid "Group Name"
 msgstr ""
 
 #: rhodecode/templates/users/user_profile.mako:39
 msgid "First name"
 msgstr ""
 
 #: rhodecode/templates/users/user_profile.mako:49
 msgid "Last name"
 msgstr ""
 
 #: rhodecode/tests/lib/test_ext_json.py:162
 msgid "hello"
 msgstr ""
 

rhodecode/lib/helpers.py

@@ -1,1960 +1,2029 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 Helper functions
 
 Consists of functions to typically be used within templates, but also
 available to Controllers. This module is available to both as 'h'.
 """
 
 import os
 import random
 import hashlib
 import StringIO
 import textwrap
 import urllib
 import math
 import logging
 import re
 import time
 import string
 import hashlib
 from collections import OrderedDict
 
 import pygments
 import itertools
 import fnmatch
 import bleach
 
 from pyramid import compat
 from datetime import datetime
 from functools import partial
 from pygments.formatters.html import HtmlFormatter
 from pygments.lexers import (
     get_lexer_by_name, get_lexer_for_filename, get_lexer_for_mimetype)
 
 from pyramid.threadlocal import get_current_request
 
 from webhelpers2.html import literal, HTML, escape
 from webhelpers2.html._autolink import _auto_link_urls
 from webhelpers2.html.tools import (
     button_to, highlight, js_obfuscate, strip_links, strip_tags)
 
 from webhelpers2.text import (
     chop_at, collapse, convert_accented_entities,
     convert_misc_entities, lchop, plural, rchop, remove_formatting,
     replace_whitespace, urlify, truncate, wrap_paragraphs)
 from webhelpers2.date import time_ago_in_words
 
 from webhelpers2.html.tags import (
     _input, NotGiven, _make_safe_id_component as safeid,
     form as insecure_form,
     auto_discovery_link, checkbox, end_form, file,
     hidden, image, javascript_link, link_to, link_to_if, link_to_unless, ol,
     select as raw_select, stylesheet_link, submit, text, password, textarea,
     ul, radio, Options)
 
 from webhelpers2.number import format_byte_size
 
 from rhodecode.lib.action_parser import action_parser
 from rhodecode.lib.pagination import Page, RepoPage, SqlPage
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.utils import repo_name_slug, get_custom_lexer
 from rhodecode.lib.utils2 import (
     str2bool, safe_unicode, safe_str,
     get_commit_safe, datetime_to_time, time_to_datetime, time_to_utcdatetime,
     AttributeDict, safe_int, md5, md5_safe, get_host_info)
 from rhodecode.lib.markup_renderer import MarkupRenderer, relative_links
 from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError
 from rhodecode.lib.vcs.backends.base import BaseChangeset, EmptyCommit
 from rhodecode.lib.index.search_utils import get_matching_line_offsets
 from rhodecode.config.conf import DATE_FORMAT, DATETIME_FORMAT
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.db import Permission, User, Repository
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.settings import IssueTrackerSettingsModel
 
 
 log = logging.getLogger(__name__)
 
 
 DEFAULT_USER = User.DEFAULT_USER
 DEFAULT_USER_EMAIL = User.DEFAULT_USER_EMAIL
 
 
 def asset(path, ver=None, **kwargs):
     """
     Helper to generate a static asset file path for rhodecode assets
 
     eg. h.asset('images/image.png', ver='3923')
 
     :param path: path of asset
     :param ver: optional version query param to append as ?ver=
     """
     request = get_current_request()
     query = {}
     query.update(kwargs)
     if ver:
         query = {'ver': ver}
     return request.static_path(
         'rhodecode:public/{}'.format(path), _query=query)
 
 
 default_html_escape_table = {
     ord('&'): u'&amp;',
     ord('<'): u'&lt;',
     ord('>'): u'&gt;',
     ord('"'): u'&quot;',
     ord("'"): u'&#39;',
 }
 
 
 def html_escape(text, html_escape_table=default_html_escape_table):
     """Produce entities within text."""
     return text.translate(html_escape_table)
 
 
 def chop_at_smart(s, sub, inclusive=False, suffix_if_chopped=None):
     """
     Truncate string ``s`` at the first occurrence of ``sub``.
 
     If ``inclusive`` is true, truncate just after ``sub`` rather than at it.
     """
     suffix_if_chopped = suffix_if_chopped or ''
     pos = s.find(sub)
     if pos == -1:
         return s
 
     if inclusive:
         pos += len(sub)
 
     chopped = s[:pos]
     left = s[pos:].strip()
 
     if left and suffix_if_chopped:
         chopped += suffix_if_chopped
 
     return chopped
 
 
 def shorter(text, size=20, prefix=False):
     postfix = '...'
     if len(text) > size:
         if prefix:
             # shorten in front
             return postfix + text[-(size - len(postfix)):]
         else:
             return text[:size - len(postfix)] + postfix
     return text
 
 
 def reset(name, value=None, id=NotGiven, type="reset", **attrs):
     """
     Reset button
     """
     return _input(type, name, value, id, attrs)
 
 
 def select(name, selected_values, options, id=NotGiven, **attrs):
 
     if isinstance(options, (list, tuple)):
         options_iter = options
         # Handle old value,label lists ... where value also can be value,label lists
         options = Options()
         for opt in options_iter:
             if isinstance(opt, tuple) and len(opt) == 2:
                 value, label = opt
             elif isinstance(opt, basestring):
                 value = label = opt
             else:
                 raise ValueError('invalid select option type %r' % type(opt))
 
             if isinstance(value, (list, tuple)):
                 option_group = options.add_optgroup(label)
                 for opt2 in value:
                     if isinstance(opt2, tuple) and len(opt2) == 2:
                         group_value, group_label = opt2
                     elif isinstance(opt2, basestring):
                         group_value = group_label = opt2
                     else:
                         raise ValueError('invalid select option type %r' % type(opt2))
 
                     option_group.add_option(group_label, group_value)
             else:
                 options.add_option(label, value)
 
     return raw_select(name, selected_values, options, id=id, **attrs)
 
 
 def branding(name, length=40):
     return truncate(name, length, indicator="")
 
 
 def FID(raw_id, path):
     """
     Creates a unique ID for filenode based on it's hash of path and commit
     it's safe to use in urls
 
     :param raw_id:
     :param path:
     """
 
     return 'c-%s-%s' % (short_id(raw_id), md5_safe(path)[:12])
 
 
 class _GetError(object):
     """Get error from form_errors, and represent it as span wrapped error
     message
 
     :param field_name: field to fetch errors for
     :param form_errors: form errors dict
     """
 
     def __call__(self, field_name, form_errors):
         tmpl = """<span class="error_msg">%s</span>"""
         if form_errors and field_name in form_errors:
             return literal(tmpl % form_errors.get(field_name))
 
 
 get_error = _GetError()
 
 
 class _ToolTip(object):
 
     def __call__(self, tooltip_title, trim_at=50):
         """
         Special function just to wrap our text into nice formatted
         autowrapped text
 
         :param tooltip_title:
         """
         tooltip_title = escape(tooltip_title)
         tooltip_title = tooltip_title.replace('<', '&lt;').replace('>', '&gt;')
         return tooltip_title
 
 
 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('/')
     last_cnt = len(path_segments) - 1
     for cnt, segment in enumerate(path_segments):
         if not segment:
             continue
         segment_html = escape(segment)
 
         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)
         else:
             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:]
     if limit_items and len(limited_url_segments) < len(url_segments):
         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:
         return literal(' / '.join(url_segments) + icon)
 
 
 def files_url_data(request):
     matchdict = request.matchdict
 
     if 'f_path' not in matchdict:
         matchdict['f_path'] = ''
 
     if 'commit_id' not in matchdict:
         matchdict['commit_id'] = 'tip'
 
     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``.
 
     If ``outfile`` is given and a valid file object (an object
     with a ``write`` method), the result will be written to it, otherwise
     it is returned as a string.
     """
     if use_hl_filter:
         # add HL filter
         from rhodecode.lib.index import search_utils
         lexer.add_filter(search_utils.ElasticSearchHLFilter())
     return pygments.format(pygments.lex(code, lexer), formatter)
 
 
 class CodeHtmlFormatter(HtmlFormatter):
     """
     My code Html Formatter for source codes
     """
 
     def wrap(self, source, outfile):
         return self._wrap_div(self._wrap_pre(self._wrap_code(source)))
 
     def _wrap_code(self, source):
         for cnt, it in enumerate(source):
             i, t = it
             t = '<div id="L%s">%s</div>' % (cnt + 1, t)
             yield i, t
 
     def _wrap_tablelinenos(self, inner):
         dummyoutfile = StringIO.StringIO()
         lncount = 0
         for t, line in inner:
             if t:
                 lncount += 1
             dummyoutfile.write(line)
 
         fl = self.linenostart
         mw = len(str(lncount + fl - 1))
         sp = self.linenospecial
         st = self.linenostep
         la = self.lineanchors
         aln = self.anchorlinenos
         nocls = self.noclasses
         if sp:
             lines = []
 
             for i in range(fl, fl + lncount):
                 if i % st == 0:
                     if i % sp == 0:
                         if aln:
                             lines.append('<a href="#%s%d" class="special">%*d</a>' %
                                          (la, i, mw, i))
                         else:
                             lines.append('<span class="special">%*d</span>' % (mw, i))
                     else:
                         if aln:
                             lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i))
                         else:
                             lines.append('%*d' % (mw, i))
                 else:
                     lines.append('')
             ls = '\n'.join(lines)
         else:
             lines = []
             for i in range(fl, fl + lncount):
                 if i % st == 0:
                     if aln:
                         lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i))
                     else:
                         lines.append('%*d' % (mw, i))
                 else:
                     lines.append('')
             ls = '\n'.join(lines)
 
         # in case you wonder about the seemingly redundant <div> here: since the
         # content in the other cell also is wrapped in a div, some browsers in
         # some configurations seem to mess up the formatting...
         if nocls:
             yield 0, ('<table class="%stable">' % self.cssclass +
                       '<tr><td><div class="linenodiv" '
                       'style="background-color: #f0f0f0; padding-right: 10px">'
                       '<pre style="line-height: 125%">' +
                       ls + '</pre></div></td><td id="hlcode" class="code">')
         else:
             yield 0, ('<table class="%stable">' % self.cssclass +
                       '<tr><td class="linenos"><div class="linenodiv"><pre>' +
                       ls + '</pre></div></td><td id="hlcode" class="code">')
         yield 0, dummyoutfile.getvalue()
         yield 0, '</td></tr></table>'
 
 
 class SearchContentCodeHtmlFormatter(CodeHtmlFormatter):
     def __init__(self, **kw):
         # only show these line numbers if set
         self.only_lines = kw.pop('only_line_numbers', [])
         self.query_terms = kw.pop('query_terms', [])
         self.max_lines = kw.pop('max_lines', 5)
         self.line_context = kw.pop('line_context', 3)
         self.url = kw.pop('url', None)
 
         super(CodeHtmlFormatter, self).__init__(**kw)
 
     def _wrap_code(self, source):
         for cnt, it in enumerate(source):
             i, t = it
             t = '<pre>%s</pre>' % t
             yield i, t
 
     def _wrap_tablelinenos(self, inner):
         yield 0, '<table class="code-highlight %stable">' % self.cssclass
 
         last_shown_line_number = 0
         current_line_number = 1
 
         for t, line in inner:
             if not t:
                 yield t, line
                 continue
 
             if current_line_number in self.only_lines:
                 if last_shown_line_number + 1 != current_line_number:
                     yield 0, '<tr>'
                     yield 0, '<td class="line">...</td>'
                     yield 0, '<td id="hlcode" class="code"></td>'
                     yield 0, '</tr>'
 
                 yield 0, '<tr>'
                 if self.url:
                     yield 0, '<td class="line"><a href="%s#L%i">%i</a></td>' % (
                         self.url, current_line_number, current_line_number)
                 else:
                     yield 0, '<td class="line"><a href="">%i</a></td>' % (
                         current_line_number)
                 yield 0, '<td id="hlcode" class="code">' + line + '</td>'
                 yield 0, '</tr>'
 
                 last_shown_line_number = current_line_number
 
             current_line_number += 1
 
         yield 0, '</table>'
 
 
 def hsv_to_rgb(h, s, v):
     """ Convert hsv color values to rgb """
 
     if s == 0.0:
         return v, v, v
     i = int(h * 6.0)  # XXX assume int() truncates!
     f = (h * 6.0) - i
     p = v * (1.0 - s)
     q = v * (1.0 - s * f)
     t = v * (1.0 - s * (1.0 - f))
     i = i % 6
     if i == 0:
         return v, t, p
     if i == 1:
         return q, v, p
     if i == 2:
         return p, v, t
     if i == 3:
         return p, q, v
     if i == 4:
         return t, p, v
     if i == 5:
         return v, p, q
 
 
 def unique_color_generator(n=10000, saturation=0.10, lightness=0.95):
     """
     Generator for getting n of evenly distributed colors using
     hsv color and golden ratio. It always return same order of colors
 
     :param n: number of colors to generate
     :param saturation: saturation of returned colors
     :param lightness: lightness of returned colors
     :returns: RGB tuple
     """
 
     golden_ratio = 0.618033988749895
     h = 0.22717784590367374
 
     for _ in xrange(n):
         h += golden_ratio
         h %= 1
         HSV_tuple = [h, saturation, lightness]
         RGB_tuple = hsv_to_rgb(*HSV_tuple)
         yield map(lambda x: str(int(x * 256)), RGB_tuple)
 
 
 def color_hasher(n=10000, saturation=0.10, lightness=0.95):
     """
     Returns a function which when called with an argument returns a unique
     color for that argument, eg.
 
     :param n: number of colors to generate
     :param saturation: saturation of returned colors
     :param lightness: lightness of returned colors
     :returns: css RGB string
 
     >>> color_hash = color_hasher()
     >>> color_hash('hello')
     'rgb(34, 12, 59)'
     >>> color_hash('hello')
     'rgb(34, 12, 59)'
     >>> color_hash('other')
     'rgb(90, 224, 159)'
     """
 
     color_dict = {}
     cgenerator = unique_color_generator(
         saturation=saturation, lightness=lightness)
 
     def get_color_string(thing):
         if thing in color_dict:
             col = color_dict[thing]
         else:
             col = color_dict[thing] = cgenerator.next()
         return "rgb(%s)" % (', '.join(col))
 
     return get_color_string
 
 
 def get_lexer_safe(mimetype=None, filepath=None):
     """
     Tries to return a relevant pygments lexer using mimetype/filepath name,
     defaulting to plain text if none could be found
     """
     lexer = None
     try:
         if mimetype:
             lexer = get_lexer_for_mimetype(mimetype)
         if not lexer:
             lexer = get_lexer_for_filename(filepath)
     except pygments.util.ClassNotFound:
         pass
 
     if not lexer:
         lexer = get_lexer_by_name('text')
 
     return lexer
 
 
 def get_lexer_for_filenode(filenode):
     lexer = get_custom_lexer(filenode.extension) or filenode.lexer
     return lexer
 
 
 def pygmentize(filenode, **kwargs):
     """
     pygmentize function using pygments
 
     :param filenode:
     """
     lexer = get_lexer_for_filenode(filenode)
     return literal(code_highlight(filenode.content, lexer,
                                   CodeHtmlFormatter(**kwargs)))
 
 
 def is_following_repo(repo_name, user_id):
     from rhodecode.model.scm import ScmModel
     return ScmModel().is_following_repo(repo_name, user_id)
 
 
 class _Message(object):
     """A message returned by ``Flash.pop_messages()``.
 
     Converting the message to a string returns the message text. Instances
     also have the following attributes:
 
     * ``message``: the message text.
     * ``category``: the category specified when the message was created.
     """
 
     def __init__(self, category, message, sub_data=None):
         self.category = category
         self.message = message
         self.sub_data = sub_data or {}
 
     def __str__(self):
         return self.message
 
     __unicode__ = __str__
 
     def __html__(self):
         return escape(safe_unicode(self.message))
 
 
 class Flash(object):
     # List of allowed categories.  If None, allow any category.
     categories = ["warning", "notice", "error", "success"]
 
     # Default category if none is specified.
     default_category = "notice"
 
     def __init__(self, session_key="flash", categories=None,
                  default_category=None):
         """
         Instantiate a ``Flash`` object.
 
         ``session_key`` is the key to save the messages under in the user's
         session.
 
         ``categories`` is an optional list which overrides the default list
         of categories.
 
         ``default_category`` overrides the default category used for messages
         when none is specified.
         """
         self.session_key = session_key
         if categories is not None:
             self.categories = categories
         if default_category is not None:
             self.default_category = default_category
         if self.categories and self.default_category not in self.categories:
             raise ValueError(
                 "unrecognized default category %r" % (self.default_category,))
 
     def pop_messages(self, session=None, request=None):
         """
         Return all accumulated messages and delete them from the session.
 
         The return value is a list of ``Message`` objects.
         """
         messages = []
 
         if not session:
             if not request:
                 request = get_current_request()
             session = request.session
 
         # Pop the 'old' pylons flash messages. They are tuples of the form
         # (category, message)
         for cat, msg in session.pop(self.session_key, []):
             messages.append(_Message(cat, msg))
 
         # Pop the 'new' pyramid flash messages for each category as list
         # of strings.
         for cat in self.categories:
             for msg in session.pop_flash(queue=cat):
                 sub_data = {}
                 if hasattr(msg, 'rsplit'):
                     flash_data = msg.rsplit('|DELIM|', 1)
                     org_message = flash_data[0]
                     if len(flash_data) > 1:
                         sub_data = json.loads(flash_data[1])
                 else:
                     org_message = msg
 
                 messages.append(_Message(cat, org_message, sub_data=sub_data))
 
         # Map messages from the default queue to the 'notice' category.
         for msg in session.pop_flash():
             messages.append(_Message('notice', msg))
 
         session.save()
         return messages
 
     def json_alerts(self, session=None, request=None):
         payloads = []
         messages = flash.pop_messages(session=session, request=request) or []
         for message in messages:
             payloads.append({
                 'message': {
                     'message': u'{}'.format(message.message),
                     'level': message.category,
                     'force': True,
                     'subdata': message.sub_data
                 }
             })
         return json.dumps(payloads)
 
     def __call__(self, message, category=None, ignore_duplicate=True,
                  session=None, request=None):
 
         if not session:
             if not request:
                 request = get_current_request()
             session = request.session
 
         session.flash(
             message, queue=category, allow_duplicate=not ignore_duplicate)
 
 
 flash = Flash()
 
 #==============================================================================
 # SCM FILTERS available via h.
 #==============================================================================
 from rhodecode.lib.vcs.utils import author_name, author_email
 from rhodecode.lib.utils2 import credentials_filter, age, age_from_seconds
 from rhodecode.model.db import User, ChangesetStatus
 
 capitalize = lambda x: x.capitalize()
 email = author_email
 short_id = lambda x: x[:12]
 hide_credentials = lambda x: ''.join(credentials_filter(x))
 
 
 import pytz
 import tzlocal
 local_timezone = tzlocal.get_localzone()
 
 
 def age_component(datetime_iso, value=None, time_is_local=False, tooltip=True):
     title = value or format_date(datetime_iso)
     tzinfo = '+00:00'
 
     # detect if we have a timezone info, otherwise, add it
     if time_is_local and isinstance(datetime_iso, datetime) and not datetime_iso.tzinfo:
         force_timezone = os.environ.get('RC_TIMEZONE', '')
         if force_timezone:
             force_timezone = pytz.timezone(force_timezone)
         timezone = force_timezone or local_timezone
         offset = timezone.localize(datetime_iso).strftime('%z')
         tzinfo = '{}:{}'.format(offset[:-2], offset[-2:])
 
     return literal(
         '<time class="timeago {cls}" title="{tt_title}" datetime="{dt}{tzinfo}">{title}</time>'.format(
             cls='tooltip' if tooltip else '',
             tt_title=('{title}{tzinfo}'.format(title=title, tzinfo=tzinfo)) if tooltip else '',
             title=title, dt=datetime_iso, tzinfo=tzinfo
         ))
 
 
 def _shorten_commit_id(commit_id, commit_len=None):
     if commit_len is None:
         request = get_current_request()
         commit_len = request.call_context.visual.show_sha_length
     return commit_id[:commit_len]
 
 
 def show_id(commit, show_idx=None, commit_len=None):
     """
     Configurable function that shows ID
     by default it's r123:fffeeefffeee
 
     :param commit: commit instance
     """
     if show_idx is None:
         request = get_current_request()
         show_idx = request.call_context.visual.show_revision_number
 
     raw_id = _shorten_commit_id(commit.raw_id, commit_len=commit_len)
     if show_idx:
         return 'r%s:%s' % (commit.idx, raw_id)
     else:
         return '%s' % (raw_id, )
 
 
 def format_date(date):
     """
     use a standardized formatting for dates used in RhodeCode
 
     :param date: date/datetime object
     :return: formatted date
     """
 
     if date:
         _fmt = "%a, %d %b %Y %H:%M:%S"
         return safe_unicode(date.strftime(_fmt))
 
     return u""
 
 
 class _RepoChecker(object):
 
     def __init__(self, backend_alias):
         self._backend_alias = backend_alias
 
     def __call__(self, repository):
         if hasattr(repository, 'alias'):
             _type = repository.alias
         elif hasattr(repository, 'repo_type'):
             _type = repository.repo_type
         else:
             _type = repository
         return _type == self._backend_alias
 
 
 is_git = _RepoChecker('git')
 is_hg = _RepoChecker('hg')
 is_svn = _RepoChecker('svn')
 
 
 def get_repo_type_by_name(repo_name):
     repo = Repository.get_by_repo_name(repo_name)
     if repo:
         return repo.repo_type
 
 
 def is_svn_without_proxy(repository):
     if is_svn(repository):
         from rhodecode.model.settings import VcsSettingsModel
         conf = VcsSettingsModel().get_ui_settings_as_config_obj()
         return not str2bool(conf.get('vcs_svn_proxy', 'http_requests_enabled'))
     return False
 
 
 def discover_user(author):
     """
     Tries to discover RhodeCode User based on the author string. Author string
     is typically `FirstName LastName <[e-mail]>`
     """
 
     # if author is already an instance use it for extraction
     if isinstance(author, User):
         return author
 
     # Valid email in the attribute passed, see if they're in the system
     _email = author_email(author)
     if _email != '':
         user = User.get_by_email(_email, case_insensitive=True, cache=True)
         if user is not None:
             return user
 
     # Maybe it's a username, we try to extract it and fetch by username ?
     _author = author_name(author)
     user = User.get_by_username(_author, case_insensitive=True, cache=True)
     if user is not None:
         return user
 
     return None
 
 
 def email_or_none(author):
     # extract email from the commit string
     _email = author_email(author)
 
     # If we have an email, use it, otherwise
     # see if it contains a username we can get an email from
     if _email != '':
         return _email
     else:
         user = User.get_by_username(
             author_name(author), case_insensitive=True, cache=True)
 
     if user is not None:
             return user.email
 
     # No valid email, not a valid user in the system, none!
     return None
 
 
 def link_to_user(author, length=0, **kwargs):
     user = discover_user(author)
     # user can be None, but if we have it already it means we can re-use it
     # in the person() function, so we save 1 intensive-query
     if user:
         author = user
 
     display_person = person(author, 'username_or_name_or_email')
     if length:
         display_person = shorter(display_person, length)
 
     if user:
         return link_to(
             escape(display_person),
             route_path('user_profile', username=user.username),
             **kwargs)
     else:
         return escape(display_person)
 
 
 def link_to_group(users_group_name, **kwargs):
     return link_to(
         escape(users_group_name),
         route_path('user_group_profile', user_group_name=users_group_name),
         **kwargs)
 
 
 def person(author, show_attr="username_and_name"):
     user = discover_user(author)
     if user:
         return getattr(user, show_attr)
     else:
         _author = author_name(author)
         _email = email(author)
         return _author or _email
 
 
 def author_string(email):
     if email:
         user = User.get_by_email(email, case_insensitive=True, cache=True)
         if user:
             if user.first_name or user.last_name:
                 return '%s %s &lt;%s&gt;' % (
                     user.first_name, user.last_name, email)
             else:
                 return email
         else:
             return email
     else:
         return None
 
 
 def person_by_id(id_, show_attr="username_and_name"):
     # attr to return from fetched user
     person_getter = lambda usr: getattr(usr, show_attr)
 
     #maybe it's an ID ?
     if str(id_).isdigit() or isinstance(id_, int):
         id_ = int(id_)
         user = User.get(id_)
         if user is not None:
             return person_getter(user)
     return id_
 
 
 def gravatar_with_user(request, author, show_disabled=False, tooltip=False):
     _render = request.get_partial_renderer('rhodecode:templates/base/base.mako')
     return _render('gravatar_with_user', author, show_disabled=show_disabled, tooltip=tooltip)
 
 
 tags_paterns = OrderedDict((
     ('lang', (re.compile(r'\[(lang|language)\ \=\&gt;\ *([a-zA-Z\-\/\#\+\.]*)\]'),
              '<div class="metatag" tag="lang">\\2</div>')),
 
     ('see', (re.compile(r'\[see\ \=\&gt;\ *([a-zA-Z0-9\/\=\?\&amp;\ \:\/\.\-]*)\]'),
             '<div class="metatag" tag="see">see: \\1 </div>')),
 
     ('url', (re.compile(r'\[url\ \=\&gt;\ \[([a-zA-Z0-9\ \.\-\_]+)\]\((http://|https://|/)(.*?)\)\]'),
             '<div class="metatag" tag="url"> <a href="\\2\\3">\\1</a> </div>')),
 
     ('license', (re.compile(r'\[license\ \=\&gt;\ *([a-zA-Z0-9\/\=\?\&amp;\ \:\/\.\-]*)\]'),
                 '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/\\1">\\1</a></div>')),
 
     ('ref', (re.compile(r'\[(requires|recommends|conflicts|base)\ \=\&gt;\ *([a-zA-Z0-9\-\/]*)\]'),
             '<div class="metatag" tag="ref \\1">\\1: <a href="/\\2">\\2</a></div>')),
 
     ('state', (re.compile(r'\[(stable|featured|stale|dead|dev|deprecated)\]'),
               '<div class="metatag" tag="state \\1">\\1</div>')),
 
     # label in grey
     ('label', (re.compile(r'\[([a-z]+)\]'),
               '<div class="metatag" tag="label">\\1</div>')),
 
     # generic catch all in grey
     ('generic', (re.compile(r'\[([a-zA-Z0-9\.\-\_]+)\]'),
                 '<div class="metatag" tag="generic">\\1</div>')),
 ))
 
 
 def extract_metatags(value):
     """
     Extract supported meta-tags from given text value
     """
     tags = []
     if not value:
         return tags, ''
 
     for key, val in tags_paterns.items():
         pat, replace_html = val
         tags.extend([(key, x.group()) for x in pat.finditer(value)])
         value = pat.sub('', value)
 
     return tags, value
 
 
 def style_metatag(tag_type, value):
     """
     converts tags from value into html equivalent
     """
     if not value:
         return ''
 
     html_value = value
     tag_data = tags_paterns.get(tag_type)
     if tag_data:
         pat, replace_html = tag_data
         # convert to plain `unicode` instead of a markup tag to be used in
         # regex expressions. safe_unicode doesn't work here
         html_value = pat.sub(replace_html, unicode(value))
 
     return html_value
 
 
 def bool2icon(value, show_at_false=True):
     """
     Returns boolean value of a given value, represented as html element with
     classes that will represent icons
 
     :param value: given value to convert to html node
     """
 
     if value:  # does bool conversion
         return HTML.tag('i', class_="icon-true", title='True')
     else:  # not true as bool
         if show_at_false:
             return HTML.tag('i', class_="icon-false", title='False')
         return HTML.tag('i')
 
 #==============================================================================
 # PERMS
 #==============================================================================
 from rhodecode.lib.auth import (
     HasPermissionAny, HasPermissionAll,
     HasRepoPermissionAny, HasRepoPermissionAll, HasRepoGroupPermissionAll,
     HasRepoGroupPermissionAny, HasRepoPermissionAnyApi, get_csrf_token,
     csrf_token_key, AuthUser)
 
 
 #==============================================================================
 # GRAVATAR URL
 #==============================================================================
 class InitialsGravatar(object):
     def __init__(self, email_address, first_name, last_name, size=30,
                  background=None, text_color='#fff'):
         self.size = size
         self.first_name = first_name
         self.last_name = last_name
         self.email_address = email_address
         self.background = background or self.str2color(email_address)
         self.text_color = text_color
 
     def get_color_bank(self):
         """
         returns a predefined list of colors that gravatars can use.
         Those are randomized distinct colors that guarantee readability and
         uniqueness.
 
         generated with: http://phrogz.net/css/distinct-colors.html
         """
         return [
             '#bf3030', '#a67f53', '#00ff00', '#5989b3', '#392040', '#d90000',
             '#402910', '#204020', '#79baf2', '#a700b3', '#bf6060', '#7f5320',
             '#008000', '#003059', '#ee00ff', '#ff0000', '#8c4b00', '#007300',
             '#005fb3', '#de73e6', '#ff4040', '#ffaa00', '#3df255', '#203140',
             '#47004d', '#591616', '#664400', '#59b365', '#0d2133', '#83008c',
             '#592d2d', '#bf9f60', '#73e682', '#1d3f73', '#73006b', '#402020',
             '#b2862d', '#397341', '#597db3', '#e600d6', '#a60000', '#736039',
             '#00b318', '#79aaf2', '#330d30', '#ff8080', '#403010', '#16591f',
             '#002459', '#8c4688', '#e50000', '#ffbf40', '#00732e', '#102340',
             '#bf60ac', '#8c4646', '#cc8800', '#00a642', '#1d3473', '#b32d98',
             '#660e00', '#ffd580', '#80ffb2', '#7391e6', '#733967', '#d97b6c',
             '#8c5e00', '#59b389', '#3967e6', '#590047', '#73281d', '#665200',
             '#00e67a', '#2d50b3', '#8c2377', '#734139', '#b2982d', '#16593a',
             '#001859', '#ff00aa', '#a65e53', '#ffcc00', '#0d3321', '#2d3959',
             '#731d56', '#401610', '#4c3d00', '#468c6c', '#002ca6', '#d936a3',
             '#d94c36', '#403920', '#36d9a3', '#0d1733', '#592d4a', '#993626',
             '#cca300', '#00734d', '#46598c', '#8c005e', '#7f1100', '#8c7000',
             '#00a66f', '#7382e6', '#b32d74', '#d9896c', '#ffe680', '#1d7362',
             '#364cd9', '#73003d', '#d93a00', '#998a4d', '#59b3a1', '#5965b3',
             '#e5007a', '#73341d', '#665f00', '#00b38f', '#0018b3', '#59163a',
             '#b2502d', '#bfb960', '#00ffcc', '#23318c', '#a6537f', '#734939',
             '#b2a700', '#104036', '#3d3df2', '#402031', '#e56739', '#736f39',
             '#79f2ea', '#000059', '#401029', '#4c1400', '#ffee00', '#005953',
             '#101040', '#990052', '#402820', '#403d10', '#00ffee', '#0000d9',
             '#ff80c4', '#a66953', '#eeff00', '#00ccbe', '#8080ff', '#e673a1',
             '#a62c00', '#474d00', '#1a3331', '#46468c', '#733950', '#662900',
             '#858c23', '#238c85', '#0f0073', '#b20047', '#d9986c', '#becc00',
             '#396f73', '#281d73', '#ff0066', '#ff6600', '#dee673', '#59adb3',
             '#6559b3', '#590024', '#b2622d', '#98b32d', '#36ced9', '#332d59',
             '#40001a', '#733f1d', '#526600', '#005359', '#242040', '#bf6079',
             '#735039', '#cef23d', '#007780', '#5630bf', '#66001b', '#b24700',
             '#acbf60', '#1d6273', '#25008c', '#731d34', '#a67453', '#50592d',
             '#00ccff', '#6600ff', '#ff0044', '#4c1f00', '#8a994d', '#79daf2',
             '#a173e6', '#d93662', '#402310', '#aaff00', '#2d98b3', '#8c40ff',
             '#592d39', '#ff8c40', '#354020', '#103640', '#1a0040', '#331a20',
             '#331400', '#334d00', '#1d5673', '#583973', '#7f0022', '#4c3626',
             '#88cc00', '#36a3d9', '#3d0073', '#d9364c', '#33241a', '#698c23',
             '#5995b3', '#300059', '#e57382', '#7f3300', '#366600', '#00aaff',
             '#3a1659', '#733941', '#663600', '#74b32d', '#003c59', '#7f53a6',
             '#73000f', '#ff8800', '#baf279', '#79caf2', '#291040', '#a6293a',
             '#b2742d', '#587339', '#0077b3', '#632699', '#400009', '#d9a66c',
             '#294010', '#2d4a59', '#aa00ff', '#4c131b', '#b25f00', '#5ce600',
             '#267399', '#a336d9', '#990014', '#664e33', '#86bf60', '#0088ff',
             '#7700b3', '#593a16', '#073300', '#1d4b73', '#ac60bf', '#e59539',
             '#4f8c46', '#368dd9', '#5c0073'
         ]
 
     def rgb_to_hex_color(self, rgb_tuple):
         """
         Converts an rgb_tuple passed to an hex color.
 
         :param rgb_tuple: tuple with 3 ints represents rgb color space
         """
         return '#' + ("".join(map(chr, rgb_tuple)).encode('hex'))
 
     def email_to_int_list(self, email_str):
         """
         Get every byte of the hex digest value of email and turn it to integer.
         It's going to be always between 0-255
         """
         digest = md5_safe(email_str.lower())
         return [int(digest[i * 2:i * 2 + 2], 16) for i in range(16)]
 
     def pick_color_bank_index(self, email_str, color_bank):
         return self.email_to_int_list(email_str)[0] % len(color_bank)
 
     def str2color(self, email_str):
         """
         Tries to map in a stable algorithm an email to color
 
         :param email_str:
         """
         color_bank = self.get_color_bank()
         # pick position (module it's length so we always find it in the
         # bank even if it's smaller than 256 values
         pos = self.pick_color_bank_index(email_str, color_bank)
         return color_bank[pos]
 
     def normalize_email(self, email_address):
         import unicodedata
         # default host used to fill in the fake/missing email
         default_host = u'localhost'
 
         if not email_address:
             email_address = u'%s@%s' % (User.DEFAULT_USER, default_host)
 
         email_address = safe_unicode(email_address)
 
         if u'@' not in email_address:
             email_address = u'%s@%s' % (email_address, default_host)
 
         if email_address.endswith(u'@'):
             email_address = u'%s%s' % (email_address, default_host)
 
         email_address = unicodedata.normalize('NFKD', email_address)\
             .encode('ascii', 'ignore')
         return email_address
 
     def get_initials(self):
         """
         Returns 2 letter initials calculated based on the input.
         The algorithm picks first given email address, and takes first letter
         of part before @, and then the first letter of server name. In case
         the part before @ is in a format of `somestring.somestring2` it replaces
         the server letter with first letter of somestring2
 
         In case function was initialized with both first and lastname, this
         overrides the extraction from email by first letter of the first and
         last name. We add special logic to that functionality, In case Full name
         is compound, like Guido Von Rossum, we use last part of the last name
         (Von Rossum) picking `R`.
 
         Function also normalizes the non-ascii characters to they ascii
         representation, eg Ą => A
         """
         import unicodedata
         # replace non-ascii to ascii
         first_name = unicodedata.normalize(
             'NFKD', safe_unicode(self.first_name)).encode('ascii', 'ignore')
         last_name = unicodedata.normalize(
             'NFKD', safe_unicode(self.last_name)).encode('ascii', 'ignore')
 
         # do NFKD encoding, and also make sure email has proper format
         email_address = self.normalize_email(self.email_address)
 
         # first push the email initials
         prefix, server = email_address.split('@', 1)
 
         # check if prefix is maybe a 'first_name.last_name' syntax
         _dot_split = prefix.rsplit('.', 1)
         if len(_dot_split) == 2 and _dot_split[1]:
             initials = [_dot_split[0][0], _dot_split[1][0]]
         else:
             initials = [prefix[0], server[0]]
 
         # then try to replace either first_name or last_name
         fn_letter = (first_name or " ")[0].strip()
         ln_letter = (last_name.split(' ', 1)[-1] or " ")[0].strip()
 
         if fn_letter:
             initials[0] = fn_letter
 
         if ln_letter:
             initials[1] = ln_letter
 
         return ''.join(initials).upper()
 
     def get_img_data_by_type(self, font_family, img_type):
         default_user = """
         <svg xmlns="http://www.w3.org/2000/svg"
         version="1.1" x="0px" y="0px" width="{size}" height="{size}"
         viewBox="-15 -10 439.165 429.164"
 
         xml:space="preserve"
         style="background:{background};" >
 
         <path d="M204.583,216.671c50.664,0,91.74-48.075,
                  91.74-107.378c0-82.237-41.074-107.377-91.74-107.377
                  c-50.668,0-91.74,25.14-91.74,107.377C112.844,
                  168.596,153.916,216.671,
                  204.583,216.671z" fill="{text_color}"/>
         <path d="M407.164,374.717L360.88,
                  270.454c-2.117-4.771-5.836-8.728-10.465-11.138l-71.83-37.392
                  c-1.584-0.823-3.502-0.663-4.926,0.415c-20.316,
                  15.366-44.203,23.488-69.076,23.488c-24.877,
                  0-48.762-8.122-69.078-23.488
                  c-1.428-1.078-3.346-1.238-4.93-0.415L58.75,
                  259.316c-4.631,2.41-8.346,6.365-10.465,11.138L2.001,374.717
                  c-3.191,7.188-2.537,15.412,1.75,22.005c4.285,
                  6.592,11.537,10.526,19.4,10.526h362.861c7.863,0,15.117-3.936,
                  19.402-10.527 C409.699,390.129,
                  410.355,381.902,407.164,374.717z" fill="{text_color}"/>
         </svg>""".format(
             size=self.size,
             background='#979797',  # @grey4
             text_color=self.text_color,
             font_family=font_family)
 
         return {
             "default_user": default_user
         }[img_type]
 
     def get_img_data(self, svg_type=None):
         """
         generates the svg metadata for image
         """
         fonts = [
             '-apple-system',
              'BlinkMacSystemFont',
              'Segoe UI',
              'Roboto',
              'Oxygen-Sans',
              'Ubuntu',
              'Cantarell',
              'Helvetica Neue',
              'sans-serif'
         ]
         font_family = ','.join(fonts)
         if svg_type:
             return self.get_img_data_by_type(font_family, svg_type)
 
         initials = self.get_initials()
         img_data = """
         <svg xmlns="http://www.w3.org/2000/svg" pointer-events="none"
              width="{size}" height="{size}"
              style="width: 100%; height: 100%; background-color: {background}"
              viewBox="0 0 {size} {size}">
             <text text-anchor="middle" y="50%" x="50%" dy="0.35em"
                   pointer-events="auto" fill="{text_color}"
                   font-family="{font_family}"
                   style="font-weight: 400; font-size: {f_size}px;">{text}
             </text>
         </svg>""".format(
             size=self.size,
             f_size=self.size/2.05,  # scale the text inside the box nicely
             background=self.background,
             text_color=self.text_color,
             text=initials.upper(),
             font_family=font_family)
 
         return img_data
 
     def generate_svg(self, svg_type=None):
         img_data = self.get_img_data(svg_type)
         return "data:image/svg+xml;base64,%s" % img_data.encode('base64')
 
 
 def initials_gravatar(email_address, first_name, last_name, size=30):
     svg_type = None
     if email_address == User.DEFAULT_USER_EMAIL:
         svg_type = 'default_user'
     klass = InitialsGravatar(email_address, first_name, last_name, size)
     return klass.generate_svg(svg_type=svg_type)
 
 
 def gravatar_url(email_address, size=30, request=None):
     request = get_current_request()
     _use_gravatar = request.call_context.visual.use_gravatar
     _gravatar_url = request.call_context.visual.gravatar_url
 
     _gravatar_url = _gravatar_url or User.DEFAULT_GRAVATAR_URL
 
     email_address = email_address or User.DEFAULT_USER_EMAIL
     if isinstance(email_address, unicode):
         # hashlib crashes on unicode items
         email_address = safe_str(email_address)
 
     # empty email or default user
     if not email_address or email_address == User.DEFAULT_USER_EMAIL:
         return initials_gravatar(User.DEFAULT_USER_EMAIL, '', '', size=size)
 
     if _use_gravatar:
         # TODO: Disuse pyramid thread locals. Think about another solution to
         # get the host and schema here.
         request = get_current_request()
         tmpl = safe_str(_gravatar_url)
         tmpl = tmpl.replace('{email}', email_address)\
                    .replace('{md5email}', md5_safe(email_address.lower())) \
                    .replace('{netloc}', request.host)\
                    .replace('{scheme}', request.scheme)\
                    .replace('{size}', safe_str(size))
         return tmpl
     else:
         return initials_gravatar(email_address, '', '', size=size)
 
 
 def breadcrumb_repo_link(repo):
     """
     Makes a breadcrumbs path link to repo
 
     ex::
         group >> subgroup >> repo
 
     :param repo: a Repository instance
     """
 
     path = [
         link_to(group.name, route_path('repo_group_home', repo_group_name=group.group_name),
                 title='last change:{}'.format(format_date(group.last_commit_change)))
         for group in repo.groups_with_parents
     ] + [
         link_to(repo.just_name, route_path('repo_summary', repo_name=repo.repo_name),
                 title='last change:{}'.format(format_date(repo.last_commit_change)))
     ]
 
     return literal(' &raquo; '.join(path))
 
 
 def breadcrumb_repo_group_link(repo_group):
     """
     Makes a breadcrumbs path link to repo
 
     ex::
         group >> subgroup
 
     :param repo_group: a Repository Group instance
     """
 
     path = [
         link_to(group.name,
                 route_path('repo_group_home', repo_group_name=group.group_name),
                 title='last change:{}'.format(format_date(group.last_commit_change)))
         for group in repo_group.parents
     ] + [
         link_to(repo_group.name,
                 route_path('repo_group_home', repo_group_name=repo_group.group_name),
                 title='last change:{}'.format(format_date(repo_group.last_commit_change)))
     ]
 
     return literal(' &raquo; '.join(path))
 
 
 def format_byte_size_binary(file_size):
     """
     Formats file/folder sizes to standard.
     """
     if file_size is None:
         file_size = 0
 
     formatted_size = format_byte_size(file_size, binary=True)
     return formatted_size
 
 
 def urlify_text(text_, safe=True, **href_attrs):
     """
     Extract urls from text and make html links out of them
     """
 
     url_pat = re.compile(r'''(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@#.&+]'''
                          '''|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)''')
 
     def url_func(match_obj):
         url_full = match_obj.groups()[0]
         a_options = dict(href_attrs)
         a_options['href'] = url_full
         a_text = url_full
         return HTML.tag("a", a_text, **a_options)
 
     _new_text = url_pat.sub(url_func, text_)
 
     if safe:
         return literal(_new_text)
     return _new_text
 
 
 def urlify_commits(text_, repo_name):
     """
     Extract commit ids from text and make link from them
 
     :param text_:
     :param repo_name: repo name to build the URL with
     """
 
     url_pat = re.compile(r'(^|\s)([0-9a-fA-F]{12,40})($|\s)')
 
     def url_func(match_obj):
         commit_id = match_obj.groups()[1]
         pref = match_obj.groups()[0]
         suf = match_obj.groups()[2]
 
         tmpl = (
             '%(pref)s<a class="tooltip-hovercard %(cls)s" href="%(url)s" data-hovercard-alt="%(hovercard_alt)s" data-hovercard-url="%(hovercard_url)s">'
             '%(commit_id)s</a>%(suf)s'
         )
         return tmpl % {
             'pref': pref,
             'cls': 'revision-link',
             'url': route_url(
                 'repo_commit', repo_name=repo_name, commit_id=commit_id),
             'commit_id': commit_id,
             'suf': suf,
             'hovercard_alt': 'Commit: {}'.format(commit_id),
             'hovercard_url': route_url(
                 'hovercard_repo_commit', repo_name=repo_name, commit_id=commit_id)
         }
 
     new_text = url_pat.sub(url_func, text_)
 
     return new_text
 
 
 def _process_url_func(match_obj, repo_name, uid, entry,
                       return_raw_data=False, link_format='html'):
     pref = ''
     if match_obj.group().startswith(' '):
         pref = ' '
 
     issue_id = ''.join(match_obj.groups())
 
     if link_format == 'html':
         tmpl = (
             '%(pref)s<a class="tooltip %(cls)s" href="%(url)s" title="%(title)s">'
             '%(issue-prefix)s%(id-repr)s'
             '</a>')
     elif link_format == 'html+hovercard':
         tmpl = (
             '%(pref)s<a class="tooltip-hovercard %(cls)s" href="%(url)s" data-hovercard-url="%(hovercard_url)s">'
             '%(issue-prefix)s%(id-repr)s'
             '</a>')
     elif link_format in ['rst', 'rst+hovercard']:
         tmpl = '`%(issue-prefix)s%(id-repr)s <%(url)s>`_'
     elif link_format in ['markdown', 'markdown+hovercard']:
         tmpl = '[%(pref)s%(issue-prefix)s%(id-repr)s](%(url)s)'
     else:
         raise ValueError('Bad link_format:{}'.format(link_format))
 
     (repo_name_cleaned,
      parent_group_name) = RepoGroupModel()._get_group_name_and_parent(repo_name)
 
     # variables replacement
     named_vars = {
         'id': issue_id,
         'repo': repo_name,
         'repo_name': repo_name_cleaned,
         'group_name': parent_group_name,
         # set dummy keys so we always have them
         'hostname': '',
         'netloc': '',
         'scheme': ''
     }
 
     request = get_current_request()
     if request:
         # exposes, hostname, netloc, scheme
         host_data = get_host_info(request)
         named_vars.update(host_data)
 
     # named regex variables
     named_vars.update(match_obj.groupdict())
     _url = string.Template(entry['url']).safe_substitute(**named_vars)
     desc = string.Template(entry['desc']).safe_substitute(**named_vars)
     hovercard_url = string.Template(entry.get('hovercard_url', '')).safe_substitute(**named_vars)
 
     def quote_cleaner(input_str):
         """Remove quotes as it's HTML"""
         return input_str.replace('"', '')
 
     data = {
         'pref': pref,
         'cls': quote_cleaner('issue-tracker-link'),
         'url': quote_cleaner(_url),
         'id-repr': issue_id,
         'issue-prefix': entry['pref'],
         'serv': entry['url'],
-        'title': desc,
+        'title': bleach.clean(desc, strip=True),
         'hovercard_url': hovercard_url
     }
 
     if return_raw_data:
         return {
             'id': issue_id,
             'url': _url
         }
     return tmpl % data
 
 
 def get_active_pattern_entries(repo_name):
     repo = None
     if repo_name:
         # Retrieving repo_name to avoid invalid repo_name to explode on
         # IssueTrackerSettingsModel but still passing invalid name further down
         repo = Repository.get_by_repo_name(repo_name, cache=True)
 
     settings_model = IssueTrackerSettingsModel(repo=repo)
     active_entries = settings_model.get_settings(cache=True)
     return active_entries
 
 
 pr_pattern_re = re.compile(r'(?:(?:^!)|(?: !))(\d+)')
 
 
 def process_patterns(text_string, repo_name, link_format='html', active_entries=None):
 
     allowed_formats = ['html', 'rst', 'markdown',
                        'html+hovercard', 'rst+hovercard', 'markdown+hovercard']
     if link_format not in allowed_formats:
         raise ValueError('Link format can be only one of:{} got {}'.format(
                          allowed_formats, link_format))
 
     if active_entries is None:
         log.debug('Fetch active patterns for repo: %s', repo_name)
         active_entries = get_active_pattern_entries(repo_name)
 
     issues_data = []
     new_text = text_string
 
     log.debug('Got %s entries to process', len(active_entries))
     for uid, entry in active_entries.items():
         log.debug('found issue tracker entry with uid %s', uid)
 
         if not (entry['pat'] and entry['url']):
             log.debug('skipping due to missing data')
             continue
 
         log.debug('issue tracker entry: uid: `%s` PAT:%s URL:%s PREFIX:%s',
                   uid, entry['pat'], entry['url'], entry['pref'])
 
         if entry.get('pat_compiled'):
             pattern = entry['pat_compiled']
         else:
             try:
                 pattern = re.compile(r'%s' % entry['pat'])
             except re.error:
                 log.exception('issue tracker pattern: `%s` failed to compile', entry['pat'])
                 continue
 
         data_func = partial(
             _process_url_func, repo_name=repo_name, entry=entry, uid=uid,
             return_raw_data=True)
 
         for match_obj in pattern.finditer(text_string):
             issues_data.append(data_func(match_obj))
 
         url_func = partial(
             _process_url_func, repo_name=repo_name, entry=entry, uid=uid,
             link_format=link_format)
 
         new_text = pattern.sub(url_func, new_text)
         log.debug('processed prefix:uid `%s`', uid)
 
     # finally use global replace, eg !123 -> pr-link, those will not catch
     # if already similar pattern exists
     server_url = '${scheme}://${netloc}'
     pr_entry = {
         'pref': '!',
         'url': server_url + '/_admin/pull-requests/${id}',
         'desc': 'Pull Request !${id}',
         'hovercard_url': server_url + '/_hovercard/pull_request/${id}'
     }
     pr_url_func = partial(
         _process_url_func, repo_name=repo_name, entry=pr_entry, uid=None,
         link_format=link_format+'+hovercard')
     new_text = pr_pattern_re.sub(pr_url_func, new_text)
     log.debug('processed !pr pattern')
 
     return new_text, issues_data
 
 
 def urlify_commit_message(commit_text, repository=None, active_pattern_entries=None):
     """
     Parses given text message and makes proper links.
     issues are linked to given issue-server, and rest is a commit link
     """
 
     def escaper(_text):
         return _text.replace('<', '&lt;').replace('>', '&gt;')
 
     new_text = escaper(commit_text)
 
     # extract http/https links and make them real urls
     new_text = urlify_text(new_text, safe=False)
 
     # urlify commits - extract commit ids and make link out of them, if we have
     # the scope of repository present.
     if repository:
         new_text = urlify_commits(new_text, repository)
 
     # process issue tracker patterns
     new_text, issues = process_patterns(new_text, repository or '',
                                         active_entries=active_pattern_entries)
 
     return literal(new_text)
 
 
 def render_binary(repo_name, file_obj):
     """
     Choose how to render a binary file
     """
 
     # unicode
     filename = file_obj.name
 
     # images
     for ext in ['*.png', '*.jpeg', '*.jpg', '*.ico', '*.gif']:
         if fnmatch.fnmatch(filename, pat=ext):
             src = route_path(
                 'repo_file_raw', repo_name=repo_name,
                 commit_id=file_obj.commit.raw_id,
                 f_path=file_obj.path)
 
             return literal(
                 '<img class="rendered-binary" alt="rendered-image" src="{}">'.format(src))
 
 
 def renderer_from_filename(filename, exclude=None):
     """
     choose a renderer based on filename, this works only for text based files
     """
 
     # ipython
     for ext in ['*.ipynb']:
         if fnmatch.fnmatch(filename, pat=ext):
             return 'jupyter'
 
     is_markup = MarkupRenderer.renderer_from_filename(filename, exclude=exclude)
     if is_markup:
         return is_markup
     return None
 
 
 def render(source, renderer='rst', mentions=False, relative_urls=None,
            repo_name=None, active_pattern_entries=None):
 
     def maybe_convert_relative_links(html_source):
         if relative_urls:
             return relative_links(html_source, relative_urls)
         return html_source
 
     if renderer == 'plain':
         return literal(
             MarkupRenderer.plain(source, leading_newline=False))
 
     elif renderer == 'rst':
         if repo_name:
             # process patterns on comments if we pass in repo name
             source, issues = process_patterns(
                 source, repo_name, link_format='rst',
                 active_entries=active_pattern_entries)
 
         return literal(
             '<div class="rst-block">%s</div>' %
             maybe_convert_relative_links(
                 MarkupRenderer.rst(source, mentions=mentions)))
 
     elif renderer == 'markdown':
         if repo_name:
             # process patterns on comments if we pass in repo name
             source, issues = process_patterns(
                 source, repo_name, link_format='markdown',
                 active_entries=active_pattern_entries)
 
         return literal(
             '<div class="markdown-block">%s</div>' %
             maybe_convert_relative_links(
                 MarkupRenderer.markdown(source, flavored=True,
                                         mentions=mentions)))
 
     elif renderer == 'jupyter':
         return literal(
             '<div class="ipynb">%s</div>' %
             maybe_convert_relative_links(
                 MarkupRenderer.jupyter(source)))
 
     # None means just show the file-source
     return None
 
 
 def commit_status(repo, commit_id):
     return ChangesetStatusModel().get_status(repo, commit_id)
 
 
 def commit_status_lbl(commit_status):
     return dict(ChangesetStatus.STATUSES).get(commit_status)
 
 
 def commit_time(repo_name, commit_id):
     repo = Repository.get_by_repo_name(repo_name)
     commit = repo.get_commit(commit_id=commit_id)
     return commit.date
 
 
 def get_permission_name(key):
     return dict(Permission.PERMS).get(key)
 
 
 def journal_filter_help(request):
     _ = request.translate
     from rhodecode.lib.audit_logger import ACTIONS
     actions = '\n'.join(textwrap.wrap(', '.join(sorted(ACTIONS.keys())), 80))
 
     return _(
         'Example filter terms:\n' +
         '     repository:vcs\n' +
         '     username:marcin\n' +
         '     username:(NOT marcin)\n' +
         '     action:*push*\n' +
         '     ip:127.0.0.1\n' +
         '     date:20120101\n' +
         '     date:[20120101100000 TO 20120102]\n' +
         '\n' +
         'Actions: {actions}\n' +
         '\n' +
         'Generate wildcards using \'*\' character:\n' +
         '     "repository:vcs*" - search everything starting with \'vcs\'\n' +
         '     "repository:*vcs*" - search for repository containing \'vcs\'\n' +
         '\n' +
         'Optional AND / OR operators in queries\n' +
         '     "repository:vcs OR repository:test"\n' +
         '     "username:test AND repository:test*"\n'
     ).format(actions=actions)
 
 
 def not_mapped_error(repo_name):
     from rhodecode.translation import _
     flash(_('%s repository is not mapped to db perhaps'
             ' it was created or renamed from the filesystem'
             ' please run the application again'
             ' in order to rescan repositories') % repo_name, category='error')
 
 
 def ip_range(ip_addr):
     from rhodecode.model.db import UserIpMap
     s, e = UserIpMap._get_ip_range(ip_addr)
     return '%s - %s' % (s, e)
 
 
 def form(url, method='post', needs_csrf_token=True, **attrs):
     """Wrapper around webhelpers.tags.form to prevent CSRF attacks."""
     if method.lower() != 'get' and needs_csrf_token:
         raise Exception(
             'Forms to POST/PUT/DELETE endpoints should have (in general) a ' +
             'CSRF token. If the endpoint does not require such token you can ' +
             'explicitly set the parameter needs_csrf_token to false.')
 
     return insecure_form(url, method=method, **attrs)
 
 
 def secure_form(form_url, method="POST", multipart=False, **attrs):
     """Start a form tag that points the action to an url. This
     form tag will also include the hidden field containing
     the auth token.
 
     The url options should be given either as a string, or as a
     ``url()`` function. The method for the form defaults to POST.
 
     Options:
 
     ``multipart``
         If set to True, the enctype is set to "multipart/form-data".
     ``method``
         The method to use when submitting the form, usually either
         "GET" or "POST". If "PUT", "DELETE", or another verb is used, a
         hidden input with name _method is added to simulate the verb
         over POST.
 
     """
 
     if 'request' in attrs:
         session = attrs['request'].session
         del attrs['request']
     else:
         raise ValueError(
             'Calling this form requires request= to be passed as argument')
 
     _form = insecure_form(form_url, method, multipart, **attrs)
     token = literal(
         '<input type="hidden" name="{}" value="{}">'.format(
             csrf_token_key, get_csrf_token(session)))
 
     return literal("%s\n%s" % (_form, token))
 
 
 def dropdownmenu(name, selected, options, enable_filter=False, **attrs):
     select_html = select(name, selected, options, **attrs)
 
     select2 = """
         <script>
             $(document).ready(function() {
                   $('#%s').select2({
                       containerCssClass: 'drop-menu %s',
                       dropdownCssClass: 'drop-menu-dropdown',
                       dropdownAutoWidth: true%s
                   });
             });
         </script>
     """
 
     filter_option = """,
                         minimumResultsForSearch: -1
     """
     input_id = attrs.get('id') or name
     extra_classes = ' '.join(attrs.pop('extra_classes', []))
     filter_enabled = "" if enable_filter else filter_option
     select_script = literal(select2 % (input_id, extra_classes, filter_enabled))
 
     return literal(select_html+select_script)
 
 
 def get_visual_attr(tmpl_context_var, attr_name):
     """
     A safe way to get a variable from visual variable of template context
 
     :param tmpl_context_var: instance of tmpl_context, usually present as `c`
     :param attr_name: name of the attribute we fetch from the c.visual
     """
     visual = getattr(tmpl_context_var, 'visual', None)
     if not visual:
         return
     else:
         return getattr(visual, attr_name, None)
 
 
 def get_last_path_part(file_node):
     if not file_node.path:
         return u'/'
 
     path = safe_unicode(file_node.path.split('/')[-1])
     return u'../' + path
 
 
 def route_url(*args, **kwargs):
     """
     Wrapper around pyramids `route_url` (fully qualified url) function.
     """
     req = get_current_request()
     return req.route_url(*args, **kwargs)
 
 
 def route_path(*args, **kwargs):
     """
     Wrapper around pyramids `route_path` function.
     """
     req = get_current_request()
     return req.route_path(*args, **kwargs)
 
 
 def route_path_or_none(*args, **kwargs):
     try:
         return route_path(*args, **kwargs)
     except KeyError:
         return None
 
 
 def current_route_path(request, **kw):
     new_args = request.GET.mixed()
     new_args.update(kw)
     return request.current_route_path(_query=new_args)
 
 
 def curl_api_example(method, args):
     args_json = json.dumps(OrderedDict([
         ('id', 1),
         ('auth_token', 'SECRET'),
         ('method', method),
         ('args', args)
     ]))
 
     return "curl {api_url} -X POST -H 'content-type:text/plain' --data-binary '{args_json}'".format(
         api_url=route_url('apiv2'),
         args_json=args_json
     )
 
 
 def api_call_example(method, args):
     """
     Generates an API call example via CURL
     """
     curl_call = curl_api_example(method, args)
 
     return literal(
         curl_call +
         "<br/><br/>SECRET can be found in <a href=\"{token_url}\">auth-tokens</a> page, "
         "and needs to be of `api calls` role."
         .format(token_url=route_url('my_account_auth_tokens')))
 
 
 def notification_description(notification, request):
     """
     Generate notification human readable description based on notification type
     """
     from rhodecode.model.notification import NotificationModel
     return NotificationModel().make_description(
         notification, translate=request.translate)
 
 
 def go_import_header(request, db_repo=None):
     """
     Creates a header for go-import functionality in Go Lang
     """
 
     if not db_repo:
         return
     if 'go-get' not in request.GET:
         return
 
     clone_url = db_repo.clone_url()
     prefix = re.split(r'^https?:\/\/', clone_url)[-1]
     # we have a repo and go-get flag,
     return literal('<meta name="go-import" content="{} {} {}">'.format(
         prefix, db_repo.repo_type, clone_url))
 
 
 def reviewer_as_json(*args, **kwargs):
     from rhodecode.apps.repository.utils import reviewer_as_json as _reviewer_as_json
     return _reviewer_as_json(*args, **kwargs)
 
 
 def get_repo_view_type(request):
     route_name = request.matched_route.name
     route_to_view_type = {
         'repo_changelog': 'commits',
         'repo_commits': 'commits',
         'repo_files': 'files',
         'repo_summary': 'summary',
         'repo_commit': 'commit'
     }
 
     return route_to_view_type.get(route_name)
 
 
 def is_active(menu_entry, selected):
     """
     Returns active class for selecting menus in templates
     <li class=${h.is_active('settings', current_active)}></li>
     """
     if not isinstance(menu_entry, list):
         menu_entry = [menu_entry]
 
     if selected in menu_entry:
         return "active"

rhodecode/lib/middleware/utils/scm_app_http.py

@@ -1,189 +1,189 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 Implementation of the scm_app interface using raw HTTP communication.
 """
 
 import base64
 import logging
 import urlparse
 import wsgiref.util
 
 import msgpack
 import requests
 import webob.request
 
 import rhodecode
 
 
 log = logging.getLogger(__name__)
 
 
 def create_git_wsgi_app(repo_path, repo_name, config):
     url = _vcs_streaming_url() + 'git/'
     return VcsHttpProxy(url, repo_path, repo_name, config)
 
 
 def create_hg_wsgi_app(repo_path, repo_name, config):
     url = _vcs_streaming_url() + 'hg/'
     return VcsHttpProxy(url, repo_path, repo_name, config)
 
 
 def _vcs_streaming_url():
     template = 'http://{}/stream/'
     return template.format(rhodecode.CONFIG['vcs.server'])
 
 
 # TODO: johbo: Avoid the global.
 session = requests.Session()
 # Requests speedup, avoid reading .netrc and similar
 session.trust_env = False
 
 # prevent urllib3 spawning our logs.
 logging.getLogger("requests.packages.urllib3.connectionpool").setLevel(
     logging.WARNING)
 
 
 class VcsHttpProxy(object):
     """
     A WSGI application which proxies vcs requests.
 
     The goal is to shuffle the data around without touching it. The only
     exception is the extra data from the config object which we send to the
     server as well.
     """
 
     def __init__(self, url, repo_path, repo_name, config):
         """
         :param str url: The URL of the VCSServer to call.
         """
         self._url = url
         self._repo_name = repo_name
         self._repo_path = repo_path
         self._config = config
         self.rc_extras = {}
         log.debug(
             "Creating VcsHttpProxy for repo %s, url %s",
             repo_name, url)
 
     def __call__(self, environ, start_response):
         config = msgpack.packb(self._config)
         request = webob.request.Request(environ)
         request_headers = request.headers
 
         request_headers.update({
             # TODO: johbo: Remove this, rely on URL path only
             'X-RC-Repo-Name': self._repo_name,
             'X-RC-Repo-Path': self._repo_path,
             'X-RC-Path-Info': environ['PATH_INFO'],
 
             'X-RC-Repo-Store': self.rc_extras.get('repo_store'),
             '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?
             'X-RC-Repo-Config': base64.b64encode(config),
             'X-RC-Locked-Status-Code': rhodecode.CONFIG.get('lock_ret_code'),
         })
 
         method = environ['REQUEST_METHOD']
 
         # Preserve the query string
         url = self._url
         url = urlparse.urljoin(url, self._repo_name)
         if environ.get('QUERY_STRING'):
             url += '?' + environ['QUERY_STRING']
 
         log.debug('http-app: preparing request to: %s', url)
         response = session.request(
             method,
             url,
             data=_maybe_stream_request(environ),
             headers=request_headers,
             stream=True)
 
         log.debug('http-app: got vcsserver response: %s', response)
         if response.status_code >= 500:
             log.error('Exception returned by vcsserver at: %s %s, %s',
                       url, response.status_code, response.content)
 
         # Preserve the headers of the response, except hop_by_hop ones
         response_headers = [
             (h, v) for h, v in response.headers.items()
             if not wsgiref.util.is_hop_by_hop(h)
         ]
 
         # Build status argument for start_response callable.
         status = '{status_code} {reason_phrase}'.format(
             status_code=response.status_code,
             reason_phrase=response.reason)
 
         start_response(status, response_headers)
         return _maybe_stream_response(response)
 
 
 def read_in_chunks(stream_obj, block_size=1024, chunks=-1):
     """
     Read Stream in chunks, default chunk size: 1k.
     """
     while chunks:
         data = stream_obj.read(block_size)
         if not data:
             break
         yield data
         chunks -= 1
 
 
 def _is_request_chunked(environ):
     stream = environ.get('HTTP_TRANSFER_ENCODING', '') == 'chunked'
     return stream
 
 
 def _maybe_stream_request(environ):
     path = environ['PATH_INFO']
     stream = _is_request_chunked(environ)
     log.debug('handling request `%s` with stream support: %s', path, stream)
 
     if stream:
         # set stream by 256k
         return read_in_chunks(environ['wsgi.input'], block_size=1024 * 256)
     else:
         return environ['wsgi.input'].read()
 
 
 def _maybe_stream_response(response):
     """
     Try to generate chunks from the response if it is chunked.
     """
     stream = _is_chunked(response)
     log.debug('returning response with stream: %s', stream)
     if stream:
         # read in 256k Chunks
         return response.raw.read_chunked(amt=1024 * 256)
     else:
         return [response.content]
 
 
 def _is_chunked(response):
     return response.headers.get('Transfer-Encoding', '') == 'chunked'

rhodecode/lib/rc_cache/__init__.py

@@ -1,81 +1,81 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2015-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import logging
 from dogpile.cache import register_backend
 
 register_backend(
     "dogpile.cache.rc.memory_lru", "rhodecode.lib.rc_cache.backends",
     "LRUMemoryBackend")
 
 register_backend(
     "dogpile.cache.rc.file_namespace", "rhodecode.lib.rc_cache.backends",
     "FileNamespaceBackend")
 
 register_backend(
     "dogpile.cache.rc.redis", "rhodecode.lib.rc_cache.backends",
     "RedisPickleBackend")
 
 register_backend(
     "dogpile.cache.rc.redis_msgpack", "rhodecode.lib.rc_cache.backends",
     "RedisMsgPackBackend")
 
 
 log = logging.getLogger(__name__)
 
 from . import region_meta
 from .utils import (
     get_default_cache_settings, backend_key_generator, get_or_create_region,
     clear_cache_namespace, make_region, InvalidationContext,
     FreshRegionCache, ActiveRegionCache)
 
 
-FILE_TREE_CACHE_VER = 'v3'
+FILE_TREE_CACHE_VER = 'v4'
 
 
 def configure_dogpile_cache(settings):
     cache_dir = settings.get('cache_dir')
     if cache_dir:
         region_meta.dogpile_config_defaults['cache_dir'] = cache_dir
 
     rc_cache_data = get_default_cache_settings(settings, prefixes=['rc_cache.'])
 
     # inspect available namespaces
     avail_regions = set()
     for key in rc_cache_data.keys():
         namespace_name = key.split('.', 1)[0]
         avail_regions.add(namespace_name)
     log.debug('dogpile: found following cache regions: %s', avail_regions)
 
     # register them into namespace
     for region_name in avail_regions:
         new_region = make_region(
             name=region_name,
             function_key_generator=None
         )
 
         new_region.configure_from_config(settings, 'rc_cache.{}.'.format(region_name))
         new_region.function_key_generator = backend_key_generator(new_region.actual_backend)
         log.debug('dogpile: registering a new region %s[%s]', region_name, new_region.__dict__)
         region_meta.dogpile_cache_regions[region_name] = new_region
 
 
 def includeme(config):
     configure_dogpile_cache(config.registry.settings)

rhodecode/model/db.py

@@ -1,5594 +1,5604 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 Database Models for RhodeCode Enterprise
 """
 
 import re
 import os
 import time
 import string
 import hashlib
 import logging
 import datetime
 import uuid
 import warnings
 import ipaddress
 import functools
 import traceback
 import collections
 
 from sqlalchemy import (
     or_, and_, not_, func, cast, TypeDecorator, event,
     Index, Sequence, UniqueConstraint, ForeignKey, CheckConstraint, Column,
     Boolean, String, Unicode, UnicodeText, DateTime, Integer, LargeBinary,
     Text, Float, PickleType, BigInteger)
 from sqlalchemy.sql.expression import true, false, case
 from sqlalchemy.sql.functions import coalesce, count  # pragma: no cover
 from sqlalchemy.orm import (
     relationship, joinedload, class_mapper, validates, aliased)
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.exc import IntegrityError  # pragma: no cover
 from sqlalchemy.dialects.mysql import LONGTEXT
 from zope.cachedescriptors.property import Lazy as LazyProperty
 from pyramid import compat
 from pyramid.threadlocal import get_current_request
 from webhelpers2.text import remove_formatting
 
 from rhodecode.translation import _
 from rhodecode.lib.vcs import get_vcs_instance, VCSError
 from rhodecode.lib.vcs.backends.base import EmptyCommit, Reference
 from rhodecode.lib.utils2 import (
     str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe,
     time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
     glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time, OrderedDefaultDict)
 from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
     JsonRaw
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.lib.encrypt import AESCipher, validate_and_get_enc_data
 from rhodecode.lib.encrypt2 import Encryptor
 from rhodecode.lib.exceptions import (
     ArtifactMetadataDuplicate, ArtifactMetadataBadValueType)
 from rhodecode.model.meta import Base, Session
 
 URL_SEP = '/'
 log = logging.getLogger(__name__)
 
 # =============================================================================
 # BASE CLASSES
 # =============================================================================
 
 # this is propagated from .ini file rhodecode.encrypted_values.secret or
 # beaker.session.secret if first is not set.
 # and initialized at environment.py
 ENCRYPTION_KEY = None
 
 # used to sort permissions by types, '#' used here is not allowed to be in
 # usernames, and it's very early in sorted string.printable table.
 PERMISSION_TYPE_SORT = {
     'admin': '####',
     'write': '###',
     'read':  '##',
     'none':  '#',
 }
 
 
 def display_user_sort(obj):
     """
     Sort function used to sort permissions in .permissions() function of
     Repository, RepoGroup, UserGroup. Also it put the default user in front
     of all other resources
     """
 
     if obj.username == User.DEFAULT_USER:
         return '#####'
     prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
     return prefix + obj.username
 
 
 def display_user_group_sort(obj):
     """
     Sort function used to sort permissions in .permissions() function of
     Repository, RepoGroup, UserGroup. Also it put the default user in front
     of all other resources
     """
 
     prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
     return prefix + obj.users_group_name
 
 
 def _hash_key(k):
     return sha1_safe(k)
 
 
 def in_filter_generator(qry, items, limit=500):
     """
     Splits IN() into multiple with OR
     e.g.::
     cnt = Repository.query().filter(
         or_(
             *in_filter_generator(Repository.repo_id, range(100000))
         )).count()
     """
     if not items:
         # empty list will cause empty query which might cause security issues
         # this can lead to hidden unpleasant results
         items = [-1]
 
     parts = []
     for chunk in xrange(0, len(items), limit):
         parts.append(
             qry.in_(items[chunk: chunk + limit])
         )
 
     return parts
 
 
 base_table_args = {
     'extend_existing': True,
     'mysql_engine': 'InnoDB',
     'mysql_charset': 'utf8',
     'sqlite_autoincrement': True
 }
 
 
 class EncryptedTextValue(TypeDecorator):
     """
     Special column for encrypted long text data, use like::
 
         value = Column("encrypted_value", EncryptedValue(), nullable=False)
 
     This column is intelligent so if value is in unencrypted form it return
     unencrypted form, but on save it always encrypts
     """
     impl = Text
 
     def process_bind_param(self, value, dialect):
         """
         Setter for storing value
         """
         import rhodecode
         if not value:
             return value
 
         # protect against double encrypting if values is already encrypted
         if value.startswith('enc$aes$') \
                 or value.startswith('enc$aes_hmac$') \
                 or value.startswith('enc2$'):
             raise ValueError('value needs to be in unencrypted format, '
                              'ie. not starting with enc$ or enc2$')
 
         algo = rhodecode.CONFIG.get('rhodecode.encrypted_values.algorithm') or 'aes'
         if algo == 'aes':
             return 'enc$aes_hmac$%s' % AESCipher(ENCRYPTION_KEY, hmac=True).encrypt(value)
         elif algo == 'fernet':
             return Encryptor(ENCRYPTION_KEY).encrypt(value)
         else:
             ValueError('Bad encryption algorithm, should be fernet or aes, got: {}'.format(algo))
 
     def process_result_value(self, value, dialect):
         """
         Getter for retrieving value
         """
 
         import rhodecode
         if not value:
             return value
 
         algo = rhodecode.CONFIG.get('rhodecode.encrypted_values.algorithm') or 'aes'
         enc_strict_mode = str2bool(rhodecode.CONFIG.get('rhodecode.encrypted_values.strict') or True)
         if algo == 'aes':
             decrypted_data = validate_and_get_enc_data(value, ENCRYPTION_KEY, enc_strict_mode)
         elif algo == 'fernet':
             return Encryptor(ENCRYPTION_KEY).decrypt(value)
         else:
             ValueError('Bad encryption algorithm, should be fernet or aes, got: {}'.format(algo))
         return decrypted_data
 
 
 class BaseModel(object):
     """
     Base Model for all classes
     """
 
     @classmethod
     def _get_keys(cls):
         """return column names for this model """
         return class_mapper(cls).c.keys()
 
     def get_dict(self):
         """
         return dict with keys and values corresponding
         to this model data """
 
         d = {}
         for k in self._get_keys():
             d[k] = getattr(self, k)
 
         # also use __json__() if present to get additional fields
         _json_attr = getattr(self, '__json__', None)
         if _json_attr:
             # update with attributes from __json__
             if callable(_json_attr):
                 _json_attr = _json_attr()
             for k, val in _json_attr.iteritems():
                 d[k] = val
         return d
 
     def get_appstruct(self):
         """return list with keys and values tuples corresponding
         to this model data """
 
         lst = []
         for k in self._get_keys():
             lst.append((k, getattr(self, k),))
         return lst
 
     def populate_obj(self, populate_dict):
         """populate model with data from given populate_dict"""
 
         for k in self._get_keys():
             if k in populate_dict:
                 setattr(self, k, populate_dict[k])
 
     @classmethod
     def query(cls):
         return Session().query(cls)
 
     @classmethod
     def get(cls, id_):
         if id_:
             return cls.query().get(id_)
 
     @classmethod
     def get_or_404(cls, id_):
         from pyramid.httpexceptions import HTTPNotFound
 
         try:
             id_ = int(id_)
         except (TypeError, ValueError):
             raise HTTPNotFound()
 
         res = cls.query().get(id_)
         if not res:
             raise HTTPNotFound()
         return res
 
     @classmethod
     def getAll(cls):
         # deprecated and left for backward compatibility
         return cls.get_all()
 
     @classmethod
     def get_all(cls):
         return cls.query().all()
 
     @classmethod
     def delete(cls, id_):
         obj = cls.query().get(id_)
         Session().delete(obj)
 
     @classmethod
     def identity_cache(cls, session, attr_name, value):
         exist_in_session = []
         for (item_cls, pkey), instance in session.identity_map.items():
             if cls == item_cls and getattr(instance, attr_name) == value:
                 exist_in_session.append(instance)
         if exist_in_session:
             if len(exist_in_session) == 1:
                 return exist_in_session[0]
             log.exception(
                 'multiple objects with attr %s and '
                 'value %s found with same name: %r',
                 attr_name, value, exist_in_session)
 
     def __repr__(self):
         if hasattr(self, '__unicode__'):
             # python repr needs to return str
             try:
                 return safe_str(self.__unicode__())
             except UnicodeDecodeError:
                 pass
         return '<DB:%s>' % (self.__class__.__name__)
 
 
 class RhodeCodeSetting(Base, BaseModel):
     __tablename__ = 'rhodecode_settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         base_table_args
     )
 
     SETTINGS_TYPES = {
         'str': safe_str,
         'int': safe_int,
         'unicode': safe_unicode,
         'bool': str2bool,
         'list': functools.partial(aslist, sep=',')
     }
     DEFAULT_UPDATE_URL = 'https://rhodecode.com/api/v1/info/versions'
     GLOBAL_CONF_KEY = 'app_settings'
 
     app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     app_settings_name = Column("app_settings_name", String(255), nullable=True, unique=None, default=None)
     _app_settings_value = Column("app_settings_value", String(4096), nullable=True, unique=None, default=None)
     _app_settings_type = Column("app_settings_type", String(255), nullable=True, unique=None, default=None)
 
     def __init__(self, key='', val='', type='unicode'):
         self.app_settings_name = key
         self.app_settings_type = type
         self.app_settings_value = val
 
     @validates('_app_settings_value')
     def validate_settings_value(self, key, val):
         assert type(val) == unicode
         return val
 
     @hybrid_property
     def app_settings_value(self):
         v = self._app_settings_value
         _type = self.app_settings_type
         if _type:
             _type = self.app_settings_type.split('.')[0]
             # decode the encrypted value
             if 'encrypted' in self.app_settings_type:
                 cipher = EncryptedTextValue()
                 v = safe_unicode(cipher.process_result_value(v, None))
 
         converter = self.SETTINGS_TYPES.get(_type) or \
             self.SETTINGS_TYPES['unicode']
         return converter(v)
 
     @app_settings_value.setter
     def app_settings_value(self, val):
         """
         Setter that will always make sure we use unicode in app_settings_value
 
         :param val:
         """
         val = safe_unicode(val)
         # encode the encrypted value
         if 'encrypted' in self.app_settings_type:
             cipher = EncryptedTextValue()
             val = safe_unicode(cipher.process_bind_param(val, None))
         self._app_settings_value = val
 
     @hybrid_property
     def app_settings_type(self):
         return self._app_settings_type
 
     @app_settings_type.setter
     def app_settings_type(self, val):
         if val.split('.')[0] not in self.SETTINGS_TYPES:
             raise Exception('type must be one of %s got %s'
                             % (self.SETTINGS_TYPES.keys(), val))
         self._app_settings_type = val
 
     @classmethod
     def get_by_prefix(cls, prefix):
         return RhodeCodeSetting.query()\
             .filter(RhodeCodeSetting.app_settings_name.startswith(prefix))\
             .all()
 
     def __unicode__(self):
         return u"<%s('%s:%s[%s]')>" % (
             self.__class__.__name__,
             self.app_settings_name, self.app_settings_value,
             self.app_settings_type
         )
 
 
 class RhodeCodeUi(Base, BaseModel):
     __tablename__ = 'rhodecode_ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         base_table_args
     )
 
     HOOK_REPO_SIZE = 'changegroup.repo_size'
     # HG
     HOOK_PRE_PULL = 'preoutgoing.pre_pull'
     HOOK_PULL = 'outgoing.pull_logger'
     HOOK_PRE_PUSH = 'prechangegroup.pre_push'
     HOOK_PRETX_PUSH = 'pretxnchangegroup.pre_push'
     HOOK_PUSH = 'changegroup.push_logger'
     HOOK_PUSH_KEY = 'pushkey.key_push'
 
     HOOKS_BUILTIN = [
         HOOK_PRE_PULL,
         HOOK_PULL,
         HOOK_PRE_PUSH,
         HOOK_PRETX_PUSH,
         HOOK_PUSH,
         HOOK_PUSH_KEY,
     ]
 
     # TODO: johbo: Unify way how hooks are configured for git and hg,
     # git part is currently hardcoded.
 
     # SVN PATTERNS
     SVN_BRANCH_ID = 'vcs_svn_branch'
     SVN_TAG_ID = 'vcs_svn_tag'
 
     ui_id = Column(
         "ui_id", Integer(), nullable=False, unique=True, default=None,
         primary_key=True)
     ui_section = Column(
         "ui_section", String(255), nullable=True, unique=None, default=None)
     ui_key = Column(
         "ui_key", String(255), nullable=True, unique=None, default=None)
     ui_value = Column(
         "ui_value", String(255), nullable=True, unique=None, default=None)
     ui_active = Column(
         "ui_active", Boolean(), nullable=True, unique=None, default=True)
 
     def __repr__(self):
         return '<%s[%s]%s=>%s]>' % (self.__class__.__name__, self.ui_section,
                                     self.ui_key, self.ui_value)
 
 
 class RepoRhodeCodeSetting(Base, BaseModel):
     __tablename__ = 'repo_rhodecode_settings'
     __table_args__ = (
         UniqueConstraint(
             'app_settings_name', 'repository_id',
             name='uq_repo_rhodecode_setting_name_repo_id'),
         base_table_args
     )
 
     repository_id = Column(
         "repository_id", Integer(), ForeignKey('repositories.repo_id'),
         nullable=False)
     app_settings_id = Column(
         "app_settings_id", Integer(), nullable=False, unique=True,
         default=None, primary_key=True)
     app_settings_name = Column(
         "app_settings_name", String(255), nullable=True, unique=None,
         default=None)
     _app_settings_value = Column(
         "app_settings_value", String(4096), nullable=True, unique=None,
         default=None)
     _app_settings_type = Column(
         "app_settings_type", String(255), nullable=True, unique=None,
         default=None)
 
     repository = relationship('Repository')
 
     def __init__(self, repository_id, key='', val='', type='unicode'):
         self.repository_id = repository_id
         self.app_settings_name = key
         self.app_settings_type = type
         self.app_settings_value = val
 
     @validates('_app_settings_value')
     def validate_settings_value(self, key, val):
         assert type(val) == unicode
         return val
 
     @hybrid_property
     def app_settings_value(self):
         v = self._app_settings_value
         type_ = self.app_settings_type
         SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
         converter = SETTINGS_TYPES.get(type_) or SETTINGS_TYPES['unicode']
         return converter(v)
 
     @app_settings_value.setter
     def app_settings_value(self, val):
         """
         Setter that will always make sure we use unicode in app_settings_value
 
         :param val:
         """
         self._app_settings_value = safe_unicode(val)
 
     @hybrid_property
     def app_settings_type(self):
         return self._app_settings_type
 
     @app_settings_type.setter
     def app_settings_type(self, val):
         SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
         if val not in SETTINGS_TYPES:
             raise Exception('type must be one of %s got %s'
                             % (SETTINGS_TYPES.keys(), val))
         self._app_settings_type = val
 
     def __unicode__(self):
         return u"<%s('%s:%s:%s[%s]')>" % (
             self.__class__.__name__, self.repository.repo_name,
             self.app_settings_name, self.app_settings_value,
             self.app_settings_type
         )
 
 
 class RepoRhodeCodeUi(Base, BaseModel):
     __tablename__ = 'repo_rhodecode_ui'
     __table_args__ = (
         UniqueConstraint(
             'repository_id', 'ui_section', 'ui_key',
             name='uq_repo_rhodecode_ui_repository_id_section_key'),
         base_table_args
     )
 
     repository_id = Column(
         "repository_id", Integer(), ForeignKey('repositories.repo_id'),
         nullable=False)
     ui_id = Column(
         "ui_id", Integer(), nullable=False, unique=True, default=None,
         primary_key=True)
     ui_section = Column(
         "ui_section", String(255), nullable=True, unique=None, default=None)
     ui_key = Column(
         "ui_key", String(255), nullable=True, unique=None, default=None)
     ui_value = Column(
         "ui_value", String(255), nullable=True, unique=None, default=None)
     ui_active = Column(
         "ui_active", Boolean(), nullable=True, unique=None, default=True)
 
     repository = relationship('Repository')
 
     def __repr__(self):
         return '<%s[%s:%s]%s=>%s]>' % (
             self.__class__.__name__, self.repository.repo_name,
             self.ui_section, self.ui_key, self.ui_value)
 
 
 class User(Base, BaseModel):
     __tablename__ = 'users'
     __table_args__ = (
         UniqueConstraint('username'), UniqueConstraint('email'),
         Index('u_username_idx', 'username'),
         Index('u_email_idx', 'email'),
         base_table_args
     )
 
     DEFAULT_USER = 'default'
     DEFAULT_USER_EMAIL = '[e-mail]'
     DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}'
 
     user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     username = Column("username", String(255), nullable=True, unique=None, default=None)
     password = Column("password", String(255), nullable=True, unique=None, default=None)
     active = Column("active", Boolean(), nullable=True, unique=None, default=True)
     admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)
     name = Column("firstname", String(255), nullable=True, unique=None, default=None)
     lastname = Column("lastname", String(255), nullable=True, unique=None, default=None)
     _email = Column("email", String(255), nullable=True, unique=None, default=None)
     last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
     last_activity = Column('last_activity', DateTime(timezone=False), nullable=True, unique=None, default=None)
     description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
 
     extern_type = Column("extern_type", String(255), nullable=True, unique=None, default=None)
     extern_name = Column("extern_name", String(255), nullable=True, unique=None, default=None)
     _api_key = Column("api_key", String(255), nullable=True, unique=None, default=None)
     inherit_default_permissions = Column("inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     _user_data = Column("user_data", LargeBinary(), nullable=True)  # JSON data
 
     user_log = relationship('UserLog')
     user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all, delete-orphan')
 
     repositories = relationship('Repository')
     repository_groups = relationship('RepoGroup')
     user_groups = relationship('UserGroup')
 
     user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
     followings = relationship('UserFollowing', primaryjoin='UserFollowing.user_id==User.user_id', cascade='all')
 
     repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all, delete-orphan')
     repo_group_to_perm = relationship('UserRepoGroupToPerm', primaryjoin='UserRepoGroupToPerm.user_id==User.user_id', cascade='all, delete-orphan')
     user_group_to_perm = relationship('UserUserGroupToPerm', primaryjoin='UserUserGroupToPerm.user_id==User.user_id', cascade='all, delete-orphan')
 
     group_member = relationship('UserGroupMember', cascade='all')
 
     notifications = relationship('UserNotification', cascade='all')
     # notifications assigned to this user
     user_created_notifications = relationship('Notification', cascade='all')
     # comments created by this user
     user_comments = relationship('ChangesetComment', cascade='all')
     # user profile extra info
     user_emails = relationship('UserEmailMap', cascade='all')
     user_ip_map = relationship('UserIpMap', cascade='all')
     user_auth_tokens = relationship('UserApiKeys', cascade='all')
     user_ssh_keys = relationship('UserSshKeys', cascade='all')
 
     # gists
     user_gists = relationship('Gist', cascade='all')
     # user pull requests
     user_pull_requests = relationship('PullRequest', cascade='all')
 
     # external identities
     external_identities = relationship(
         'ExternalIdentity',
         primaryjoin="User.user_id==ExternalIdentity.local_user_id",
         cascade='all')
     # review rules
     user_review_rules = relationship('RepoReviewRuleUser', cascade='all')
 
     # artifacts owned
     artifacts = relationship('FileStore', primaryjoin='FileStore.user_id==User.user_id')
 
     # no cascade, set NULL
     scope_artifacts = relationship('FileStore', primaryjoin='FileStore.scope_user_id==User.user_id')
 
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
                                       self.user_id, self.username)
 
     @hybrid_property
     def email(self):
         return self._email
 
     @email.setter
     def email(self, val):
         self._email = val.lower() if val else None
 
     @hybrid_property
     def first_name(self):
         from rhodecode.lib import helpers as h
         if self.name:
             return h.escape(self.name)
         return self.name
 
     @hybrid_property
     def last_name(self):
         from rhodecode.lib import helpers as h
         if self.lastname:
             return h.escape(self.lastname)
         return self.lastname
 
     @hybrid_property
     def api_key(self):
         """
         Fetch if exist an auth-token with role ALL connected to this user
         """
         user_auth_token = UserApiKeys.query()\
             .filter(UserApiKeys.user_id == self.user_id)\
             .filter(or_(UserApiKeys.expires == -1,
                             UserApiKeys.expires >= time.time()))\
             .filter(UserApiKeys.role == UserApiKeys.ROLE_ALL).first()
         if user_auth_token:
             user_auth_token = user_auth_token.api_key
 
         return user_auth_token
 
     @api_key.setter
     def api_key(self, val):
         # don't allow to set API key this is deprecated for now
         self._api_key = None
 
     @property
     def reviewer_pull_requests(self):
         return PullRequestReviewers.query() \
             .options(joinedload(PullRequestReviewers.pull_request)) \
             .filter(PullRequestReviewers.user_id == self.user_id) \
             .all()
 
     @property
     def firstname(self):
         # alias for future
         return self.name
 
     @property
     def emails(self):
         other = UserEmailMap.query()\
             .filter(UserEmailMap.user == self) \
             .order_by(UserEmailMap.email_id.asc()) \
             .all()
         return [self.email] + [x.email for x in other]
 
     def emails_cached(self):
         emails = UserEmailMap.query()\
             .filter(UserEmailMap.user == self) \
             .order_by(UserEmailMap.email_id.asc())
 
         emails = emails.options(
             FromCache("sql_cache_short", "get_user_{}_emails".format(self.user_id))
         )
 
         return [self.email] + [x.email for x in emails]
 
     @property
     def auth_tokens(self):
         auth_tokens = self.get_auth_tokens()
         return [x.api_key for x in auth_tokens]
 
     def get_auth_tokens(self):
         return UserApiKeys.query()\
             .filter(UserApiKeys.user == self)\
             .order_by(UserApiKeys.user_api_key_id.asc())\
             .all()
 
     @LazyProperty
     def feed_token(self):
         return self.get_feed_token()
 
     def get_feed_token(self, cache=True):
         feed_tokens = UserApiKeys.query()\
             .filter(UserApiKeys.user == self)\
             .filter(UserApiKeys.role == UserApiKeys.ROLE_FEED)
         if cache:
             feed_tokens = feed_tokens.options(
                 FromCache("sql_cache_short", "get_user_feed_token_%s" % self.user_id))
 
         feed_tokens = feed_tokens.all()
         if feed_tokens:
             return feed_tokens[0].api_key
         return 'NO_FEED_TOKEN_AVAILABLE'
 
     @LazyProperty
     def artifact_token(self):
         return self.get_artifact_token()
 
     def get_artifact_token(self, cache=True):
         artifacts_tokens = UserApiKeys.query()\
             .filter(UserApiKeys.user == self)\
             .filter(UserApiKeys.role == UserApiKeys.ROLE_ARTIFACT_DOWNLOAD)
         if cache:
             artifacts_tokens = artifacts_tokens.options(
                 FromCache("sql_cache_short", "get_user_artifact_token_%s" % self.user_id))
 
         artifacts_tokens = artifacts_tokens.all()
         if artifacts_tokens:
             return artifacts_tokens[0].api_key
         return 'NO_ARTIFACT_TOKEN_AVAILABLE'
 
     @classmethod
     def get(cls, user_id, cache=False):
         if not user_id:
             return
 
         user = cls.query()
         if cache:
             user = user.options(
                 FromCache("sql_cache_short", "get_users_%s" % user_id))
         return user.get(user_id)
 
     @classmethod
     def extra_valid_auth_tokens(cls, user, role=None):
         tokens = UserApiKeys.query().filter(UserApiKeys.user == user)\
                 .filter(or_(UserApiKeys.expires == -1,
                             UserApiKeys.expires >= time.time()))
         if role:
             tokens = tokens.filter(or_(UserApiKeys.role == role,
                                        UserApiKeys.role == UserApiKeys.ROLE_ALL))
         return tokens.all()
 
     def authenticate_by_token(self, auth_token, roles=None, scope_repo_id=None):
         from rhodecode.lib import auth
 
         log.debug('Trying to authenticate user: %s via auth-token, '
                   'and roles: %s', self, roles)
 
         if not auth_token:
             return False
 
         roles = (roles or []) + [UserApiKeys.ROLE_ALL]
         tokens_q = UserApiKeys.query()\
             .filter(UserApiKeys.user_id == self.user_id)\
             .filter(or_(UserApiKeys.expires == -1,
                         UserApiKeys.expires >= time.time()))
 
         tokens_q = tokens_q.filter(UserApiKeys.role.in_(roles))
 
         crypto_backend = auth.crypto_backend()
         enc_token_map = {}
         plain_token_map = {}
         for token in tokens_q:
             if token.api_key.startswith(crypto_backend.ENC_PREF):
                 enc_token_map[token.api_key] = token
             else:
                 plain_token_map[token.api_key] = token
         log.debug(
             'Found %s plain and %s encrypted tokens to check for authentication for this user',
             len(plain_token_map), len(enc_token_map))
 
         # plain token match comes first
         match = plain_token_map.get(auth_token)
 
         # check encrypted tokens now
         if not match:
             for token_hash, token in enc_token_map.items():
                 # NOTE(marcink): this is expensive to calculate, but most secure
                 if crypto_backend.hash_check(auth_token, token_hash):
                     match = token
                     break
 
         if match:
             log.debug('Found matching token %s', match)
             if match.repo_id:
                 log.debug('Found scope, checking for scope match of token %s', match)
                 if match.repo_id == scope_repo_id:
                     return True
                 else:
                     log.debug(
                         'AUTH_TOKEN: scope mismatch, token has a set repo scope: %s, '
                         'and calling scope is:%s, skipping further checks',
                          match.repo, scope_repo_id)
                     return False
             else:
                 return True
 
         return False
 
     @property
     def ip_addresses(self):
         ret = UserIpMap.query().filter(UserIpMap.user == self).all()
         return [x.ip_addr for x in ret]
 
     @property
     def username_and_name(self):
         return '%s (%s %s)' % (self.username, self.first_name, self.last_name)
 
     @property
     def username_or_name_or_email(self):
         full_name = self.full_name if self.full_name is not ' ' else None
         return self.username or full_name or self.email
 
     @property
     def full_name(self):
         return '%s %s' % (self.first_name, self.last_name)
 
     @property
     def full_name_or_username(self):
         return ('%s %s' % (self.first_name, self.last_name)
                 if (self.first_name and self.last_name) else self.username)
 
     @property
     def full_contact(self):
         return '%s %s <%s>' % (self.first_name, self.last_name, self.email)
 
     @property
     def short_contact(self):
         return '%s %s' % (self.first_name, self.last_name)
 
     @property
     def is_admin(self):
         return self.admin
 
     @property
     def language(self):
         return self.user_data.get('language')
 
     def AuthUser(self, **kwargs):
         """
         Returns instance of AuthUser for this user
         """
         from rhodecode.lib.auth import AuthUser
         return AuthUser(user_id=self.user_id, username=self.username, **kwargs)
 
     @hybrid_property
     def user_data(self):
         if not self._user_data:
             return {}
 
         try:
             return json.loads(self._user_data)
         except TypeError:
             return {}
 
     @user_data.setter
     def user_data(self, val):
         if not isinstance(val, dict):
             raise Exception('user_data must be dict, got %s' % type(val))
         try:
             self._user_data = json.dumps(val)
         except Exception:
             log.error(traceback.format_exc())
 
     @classmethod
     def get_by_username(cls, username, case_insensitive=False,
                         cache=False, identity_cache=False):
         session = Session()
 
         if case_insensitive:
             q = cls.query().filter(
                 func.lower(cls.username) == func.lower(username))
         else:
             q = cls.query().filter(cls.username == username)
 
         if cache:
             if identity_cache:
                 val = cls.identity_cache(session, 'username', username)
                 if val:
                     return val
             else:
                 cache_key = "get_user_by_name_%s" % _hash_key(username)
                 q = q.options(
                     FromCache("sql_cache_short", cache_key))
 
         return q.scalar()
 
     @classmethod
     def get_by_auth_token(cls, auth_token, cache=False):
         q = UserApiKeys.query()\
             .filter(UserApiKeys.api_key == auth_token)\
             .filter(or_(UserApiKeys.expires == -1,
                         UserApiKeys.expires >= time.time()))
         if cache:
             q = q.options(
                 FromCache("sql_cache_short", "get_auth_token_%s" % auth_token))
 
         match = q.first()
         if match:
             return match.user
 
     @classmethod
     def get_by_email(cls, email, case_insensitive=False, cache=False):
 
         if case_insensitive:
             q = cls.query().filter(func.lower(cls.email) == func.lower(email))
 
         else:
             q = cls.query().filter(cls.email == email)
 
         email_key = _hash_key(email)
         if cache:
             q = q.options(
                 FromCache("sql_cache_short", "get_email_key_%s" % email_key))
 
         ret = q.scalar()
         if ret is None:
             q = UserEmailMap.query()
             # try fetching in alternate email map
             if case_insensitive:
                 q = q.filter(func.lower(UserEmailMap.email) == func.lower(email))
             else:
                 q = q.filter(UserEmailMap.email == email)
             q = q.options(joinedload(UserEmailMap.user))
             if cache:
                 q = q.options(
                     FromCache("sql_cache_short", "get_email_map_key_%s" % email_key))
             ret = getattr(q.scalar(), 'user', None)
 
         return ret
 
     @classmethod
     def get_from_cs_author(cls, author):
         """
         Tries to get User objects out of commit author string
 
         :param author:
         """
         from rhodecode.lib.helpers import email, author_name
         # Valid email in the attribute passed, see if they're in the system
         _email = email(author)
         if _email:
             user = cls.get_by_email(_email, case_insensitive=True)
             if user:
                 return user
         # Maybe we can match by username?
         _author = author_name(author)
         user = cls.get_by_username(_author, case_insensitive=True)
         if user:
             return user
 
     def update_userdata(self, **kwargs):
         usr = self
         old = usr.user_data
         old.update(**kwargs)
         usr.user_data = old
         Session().add(usr)
         log.debug('updated userdata with %s', kwargs)
 
     def update_lastlogin(self):
         """Update user lastlogin"""
         self.last_login = datetime.datetime.now()
         Session().add(self)
         log.debug('updated user %s lastlogin', self.username)
 
     def update_password(self, new_password):
         from rhodecode.lib.auth import get_crypt_password
 
         self.password = get_crypt_password(new_password)
         Session().add(self)
 
     @classmethod
     def get_first_super_admin(cls):
         user = User.query()\
             .filter(User.admin == true()) \
             .order_by(User.user_id.asc()) \
             .first()
 
         if user is None:
             raise Exception('FATAL: Missing administrative account!')
         return user
 
     @classmethod
     def get_all_super_admins(cls, only_active=False):
         """
         Returns all admin accounts sorted by username
         """
         qry = User.query().filter(User.admin == true()).order_by(User.username.asc())
         if only_active:
             qry = qry.filter(User.active == true())
         return qry.all()
 
     @classmethod
     def get_all_user_ids(cls, only_active=True):
         """
         Returns all users IDs
         """
         qry = Session().query(User.user_id)
 
         if only_active:
             qry = qry.filter(User.active == true())
         return [x.user_id for x in qry]
 
     @classmethod
     def get_default_user(cls, cache=False, refresh=False):
         user = User.get_by_username(User.DEFAULT_USER, cache=cache)
         if user is None:
             raise Exception('FATAL: Missing default account!')
         if refresh:
             # The default user might be based on outdated state which
             # has been loaded from the cache.
             # A call to refresh() ensures that the
             # latest state from the database is used.
             Session().refresh(user)
         return user
 
     @classmethod
     def get_default_user_id(cls):
         import rhodecode
         return rhodecode.CONFIG['default_user_id']
 
     def _get_default_perms(self, user, suffix=''):
         from rhodecode.model.permission import PermissionModel
         return PermissionModel().get_default_perms(user.user_perms, suffix)
 
     def get_default_perms(self, suffix=''):
         return self._get_default_perms(self, suffix)
 
     def get_api_data(self, include_secrets=False, details='full'):
         """
         Common function for generating user related data for API
 
         :param include_secrets: By default secrets in the API data will be replaced
            by a placeholder value to prevent exposing this data by accident. In case
            this data shall be exposed, set this flag to ``True``.
 
         :param details: details can be 'basic|full' basic gives only a subset of
            the available user information that includes user_id, name and emails.
         """
         user = self
         user_data = self.user_data
         data = {
             'user_id': user.user_id,
             'username': user.username,
             'firstname': user.name,
             'lastname': user.lastname,
             'description': user.description,
             'email': user.email,
             'emails': user.emails,
         }
         if details == 'basic':
             return data
 
         auth_token_length = 40
         auth_token_replacement = '*' * auth_token_length
 
         extras = {
             'auth_tokens': [auth_token_replacement],
             'active': user.active,
             'admin': user.admin,
             'extern_type': user.extern_type,
             'extern_name': user.extern_name,
             'last_login': user.last_login,
             'last_activity': user.last_activity,
             'ip_addresses': user.ip_addresses,
             'language': user_data.get('language')
         }
         data.update(extras)
 
         if include_secrets:
             data['auth_tokens'] = user.auth_tokens
         return data
 
     def __json__(self):
         data = {
             'full_name': self.full_name,
             'full_name_or_username': self.full_name_or_username,
             'short_contact': self.short_contact,
             'full_contact': self.full_contact,
         }
         data.update(self.get_api_data())
         return data
 
 
 class UserApiKeys(Base, BaseModel):
     __tablename__ = 'user_api_keys'
     __table_args__ = (
         Index('uak_api_key_idx', 'api_key'),
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
         base_table_args
     )
     __mapper_args__ = {}
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
     ROLE_HTTP = 'token_role_http'
     ROLE_VCS = 'token_role_vcs'
     ROLE_API = 'token_role_api'
     ROLE_FEED = 'token_role_feed'
     ROLE_ARTIFACT_DOWNLOAD = 'role_artifact_download'
     ROLE_PASSWORD_RESET = 'token_password_reset'
 
     ROLES = [ROLE_ALL, ROLE_HTTP, ROLE_VCS, ROLE_API, ROLE_FEED, ROLE_ARTIFACT_DOWNLOAD]
 
     user_api_key_id = Column("user_api_key_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     api_key = Column("api_key", String(255), nullable=False, unique=True)
     description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
     expires = Column('expires', Float(53), nullable=False)
     role = Column('role', String(255), nullable=True)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
 
     # scope columns
     repo_id = Column(
         'repo_id', Integer(), ForeignKey('repositories.repo_id'),
         nullable=True, unique=None, default=None)
     repo = relationship('Repository', lazy='joined')
 
     repo_group_id = Column(
         'repo_group_id', Integer(), ForeignKey('groups.group_id'),
         nullable=True, unique=None, default=None)
     repo_group = relationship('RepoGroup', lazy='joined')
 
     user = relationship('User', lazy='joined')
 
     def __unicode__(self):
         return u"<%s('%s')>" % (self.__class__.__name__, self.role)
 
     def __json__(self):
         data = {
             'auth_token': self.api_key,
             'role': self.role,
             'scope': self.scope_humanized,
             'expired': self.expired
         }
         return data
 
     def get_api_data(self, include_secrets=False):
         data = self.__json__()
         if include_secrets:
             return data
         else:
             data['auth_token'] = self.token_obfuscated
             return data
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.description)
 
     @property
     def expired(self):
         if self.expires == -1:
             return False
         return time.time() > self.expires
 
     @classmethod
     def _get_role_name(cls, role):
         return {
             cls.ROLE_ALL: _('all'),
             cls.ROLE_HTTP: _('http/web interface'),
             cls.ROLE_VCS: _('vcs (git/hg/svn protocol)'),
             cls.ROLE_API: _('api calls'),
             cls.ROLE_FEED: _('feed access'),
             cls.ROLE_ARTIFACT_DOWNLOAD: _('artifacts downloads'),
         }.get(role, role)
 
     @property
     def role_humanized(self):
         return self._get_role_name(self.role)
 
     def _get_scope(self):
         if self.repo:
             return 'Repository: {}'.format(self.repo.repo_name)
         if self.repo_group:
             return 'RepositoryGroup: {} (recursive)'.format(self.repo_group.group_name)
         return 'Global'
 
     @property
     def scope_humanized(self):
         return self._get_scope()
 
     @property
     def token_obfuscated(self):
         if self.api_key:
             return self.api_key[:4] + "****"
 
 
 class UserEmailMap(Base, BaseModel):
     __tablename__ = 'user_email_map'
     __table_args__ = (
         Index('uem_email_idx', 'email'),
         UniqueConstraint('email'),
         base_table_args
     )
     __mapper_args__ = {}
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     _email = Column("email", String(255), nullable=True, unique=False, default=None)
     user = relationship('User', lazy='joined')
 
     @validates('_email')
     def validate_email(self, key, email):
         # check if this email is not main one
         main_email = Session().query(User).filter(User.email == email).scalar()
         if main_email is not None:
             raise AttributeError('email %s is present is user table' % email)
         return email
 
     @hybrid_property
     def email(self):
         return self._email
 
     @email.setter
     def email(self, val):
         self._email = val.lower() if val else None
 
 
 class UserIpMap(Base, BaseModel):
     __tablename__ = 'user_ip_map'
     __table_args__ = (
         UniqueConstraint('user_id', 'ip_addr'),
         base_table_args
     )
     __mapper_args__ = {}
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     ip_addr = Column("ip_addr", String(255), nullable=True, unique=False, default=None)
     active = Column("active", Boolean(), nullable=True, unique=None, default=True)
     description = Column("description", String(10000), nullable=True, unique=None, default=None)
     user = relationship('User', lazy='joined')
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.description)
 
     @classmethod
     def _get_ip_range(cls, ip_addr):
         net = ipaddress.ip_network(safe_unicode(ip_addr), strict=False)
         return [str(net.network_address), str(net.broadcast_address)]
 
     def __json__(self):
         return {
           'ip_addr': self.ip_addr,
           'ip_range': self._get_ip_range(self.ip_addr),
         }
 
     def __unicode__(self):
         return u"<%s('user_id:%s=>%s')>" % (self.__class__.__name__,
                                             self.user_id, self.ip_addr)
 
 
 class UserSshKeys(Base, BaseModel):
     __tablename__ = 'user_ssh_keys'
     __table_args__ = (
         Index('usk_ssh_key_fingerprint_idx', 'ssh_key_fingerprint'),
 
         UniqueConstraint('ssh_key_fingerprint'),
 
         base_table_args
     )
     __mapper_args__ = {}
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
     ssh_key_fingerprint = Column('ssh_key_fingerprint', String(255), nullable=False, unique=None, default=None)
 
     description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
 
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     accessed_on = Column('accessed_on', DateTime(timezone=False), nullable=True, default=None)
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
 
     user = relationship('User', lazy='joined')
 
     def __json__(self):
         data = {
             'ssh_fingerprint': self.ssh_key_fingerprint,
             'description': self.description,
             'created_on': self.created_on
         }
         return data
 
     def get_api_data(self):
         data = self.__json__()
         return data
 
 
 class UserLog(Base, BaseModel):
     __tablename__ = 'user_logs'
     __table_args__ = (
         base_table_args,
     )
 
     VERSION_1 = 'v1'
     VERSION_2 = 'v2'
     VERSIONS = [VERSION_1, VERSION_2]
 
     user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id',ondelete='SET NULL'), nullable=True, unique=None, default=None)
     username = Column("username", String(255), nullable=True, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id', ondelete='SET NULL'), nullable=True, unique=None, default=None)
     repository_name = Column("repository_name", String(255), nullable=True, unique=None, default=None)
     user_ip = Column("user_ip", String(255), nullable=True, unique=None, default=None)
     action = Column("action", Text().with_variant(Text(1200000), 'mysql'), nullable=True, unique=None, default=None)
     action_date = Column("action_date", DateTime(timezone=False), nullable=True, unique=None, default=None)
 
     version = Column("version", String(255), nullable=True, default=VERSION_1)
     user_data = Column('user_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=LONGTEXT()))))
     action_data = Column('action_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=LONGTEXT()))))
 
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (
             self.__class__.__name__, self.repository_name, self.action)
 
     def __json__(self):
         return {
             'user_id': self.user_id,
             'username': self.username,
             'repository_id': self.repository_id,
             'repository_name': self.repository_name,
             'user_ip': self.user_ip,
             'action_date': self.action_date,
             'action': self.action,
         }
 
     @hybrid_property
     def entry_id(self):
         return self.user_log_id
 
     @property
     def action_as_day(self):
         return datetime.date(*self.action_date.timetuple()[:3])
 
     user = relationship('User')
     repository = relationship('Repository', cascade='')
 
 
 class UserGroup(Base, BaseModel):
     __tablename__ = 'users_groups'
     __table_args__ = (
         base_table_args,
     )
 
     users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_name = Column("users_group_name", String(255), nullable=False, unique=True, default=None)
     user_group_description = Column("user_group_description", String(10000), nullable=True, unique=None, default=None)
     users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)
     inherit_default_permissions = Column("users_group_inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     _group_data = Column("group_data", LargeBinary(), nullable=True)  # JSON data
 
     members = relationship('UserGroupMember', cascade="all, delete-orphan", lazy="joined")
     users_group_to_perm = relationship('UserGroupToPerm', cascade='all')
     users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
     users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
     user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
     user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
 
     user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
     user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")
 
     @classmethod
     def _load_group_data(cls, column):
         if not column:
             return {}
 
         try:
             return json.loads(column) or {}
         except TypeError:
             return {}
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.user_group_description)
 
     @hybrid_property
     def group_data(self):
         return self._load_group_data(self._group_data)
 
     @group_data.expression
     def group_data(self, **kwargs):
         return self._group_data
 
     @group_data.setter
     def group_data(self, val):
         try:
             self._group_data = json.dumps(val)
         except Exception:
             log.error(traceback.format_exc())
 
     @classmethod
     def _load_sync(cls, group_data):
         if group_data:
             return group_data.get('extern_type')
 
     @property
     def sync(self):
         return self._load_sync(self.group_data)
 
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
                                       self.users_group_id,
                                       self.users_group_name)
 
     @classmethod
     def get_by_group_name(cls, group_name, cache=False,
                           case_insensitive=False):
         if case_insensitive:
             q = cls.query().filter(func.lower(cls.users_group_name) ==
                                    func.lower(group_name))
 
         else:
             q = cls.query().filter(cls.users_group_name == group_name)
         if cache:
             q = q.options(
                 FromCache("sql_cache_short", "get_group_%s" % _hash_key(group_name)))
         return q.scalar()
 
     @classmethod
     def get(cls, user_group_id, cache=False):
         if not user_group_id:
             return
 
         user_group = cls.query()
         if cache:
             user_group = user_group.options(
                 FromCache("sql_cache_short", "get_users_group_%s" % user_group_id))
         return user_group.get(user_group_id)
 
     def permissions(self, with_admins=True, with_owner=True,
                     expand_from_user_groups=False):
         """
         Permissions for user groups
         """
         _admin_perm = 'usergroup.admin'
 
         owner_row = []
         if with_owner:
             usr = AttributeDict(self.user.get_dict())
             usr.owner_row = True
             usr.permission = _admin_perm
             owner_row.append(usr)
 
         super_admin_ids = []
         super_admin_rows = []
         if with_admins:
             for usr in User.get_all_super_admins():
                 super_admin_ids.append(usr.user_id)
                 # if this admin is also owner, don't double the record
                 if usr.user_id == owner_row[0].user_id:
                     owner_row[0].admin_row = True
                 else:
                     usr = AttributeDict(usr.get_dict())
                     usr.admin_row = True
                     usr.permission = _admin_perm
                     super_admin_rows.append(usr)
 
         q = UserUserGroupToPerm.query().filter(UserUserGroupToPerm.user_group == self)
         q = q.options(joinedload(UserUserGroupToPerm.user_group),
                       joinedload(UserUserGroupToPerm.user),
                       joinedload(UserUserGroupToPerm.permission),)
 
         # get owners and admins and permissions. We do a trick of re-writing
         # objects from sqlalchemy to named-tuples due to sqlalchemy session
         # has a global reference and changing one object propagates to all
         # others. This means if admin is also an owner admin_row that change
         # would propagate to both objects
         perm_rows = []
         for _usr in q.all():
             usr = AttributeDict(_usr.user.get_dict())
             # if this user is also owner/admin, mark as duplicate record
             if usr.user_id == owner_row[0].user_id or usr.user_id in super_admin_ids:
                 usr.duplicate_perm = True
             usr.permission = _usr.permission.permission_name
             perm_rows.append(usr)
 
         # filter the perm rows by 'default' first and then sort them by
         # admin,write,read,none permissions sorted again alphabetically in
         # each group
         perm_rows = sorted(perm_rows, key=display_user_sort)
 
         user_groups_rows = []
         if expand_from_user_groups:
             for ug in self.permission_user_groups(with_members=True):
                 for user_data in ug.members:
                     user_groups_rows.append(user_data)
 
         return super_admin_rows + owner_row + perm_rows + user_groups_rows
 
     def permission_user_groups(self, with_members=False):
         q = UserGroupUserGroupToPerm.query()\
             .filter(UserGroupUserGroupToPerm.target_user_group == self)
         q = q.options(joinedload(UserGroupUserGroupToPerm.user_group),
                       joinedload(UserGroupUserGroupToPerm.target_user_group),
                       joinedload(UserGroupUserGroupToPerm.permission),)
 
         perm_rows = []
         for _user_group in q.all():
             entry = AttributeDict(_user_group.user_group.get_dict())
             entry.permission = _user_group.permission.permission_name
             if with_members:
                 entry.members = [x.user.get_dict()
                                  for x in _user_group.user_group.members]
             perm_rows.append(entry)
 
         perm_rows = sorted(perm_rows, key=display_user_group_sort)
         return perm_rows
 
     def _get_default_perms(self, user_group, suffix=''):
         from rhodecode.model.permission import PermissionModel
         return PermissionModel().get_default_perms(user_group.users_group_to_perm, suffix)
 
     def get_default_perms(self, suffix=''):
         return self._get_default_perms(self, suffix)
 
     def get_api_data(self, with_group_members=True, include_secrets=False):
         """
         :param include_secrets: See :meth:`User.get_api_data`, this parameter is
            basically forwarded.
 
         """
         user_group = self
         data = {
             'users_group_id': user_group.users_group_id,
             'group_name': user_group.users_group_name,
             'group_description': user_group.user_group_description,
             'active': user_group.users_group_active,
             'owner': user_group.user.username,
             'sync': user_group.sync,
             'owner_email': user_group.user.email,
         }
 
         if with_group_members:
             users = []
             for user in user_group.members:
                 user = user.user
                 users.append(user.get_api_data(include_secrets=include_secrets))
             data['users'] = users
 
         return data
 
 
 class UserGroupMember(Base, BaseModel):
     __tablename__ = 'users_groups_members'
     __table_args__ = (
         base_table_args,
     )
 
     users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User', lazy='joined')
     users_group = relationship('UserGroup')
 
     def __init__(self, gr_id='', u_id=''):
         self.users_group_id = gr_id
         self.user_id = u_id
 
 
 class RepositoryField(Base, BaseModel):
     __tablename__ = 'repositories_fields'
     __table_args__ = (
         UniqueConstraint('repository_id', 'field_key'),  # no-multi field
         base_table_args,
     )
 
     PREFIX = 'ex_'  # prefix used in form to not conflict with already existing fields
 
     repo_field_id = Column("repo_field_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
     field_key = Column("field_key", String(250))
     field_label = Column("field_label", String(1024), nullable=False)
     field_value = Column("field_value", String(10000), nullable=False)
     field_desc = Column("field_desc", String(1024), nullable=False)
     field_type = Column("field_type", String(255), nullable=False, unique=None)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
 
     repository = relationship('Repository')
 
     @property
     def field_key_prefixed(self):
         return 'ex_%s' % self.field_key
 
     @classmethod
     def un_prefix_key(cls, key):
         if key.startswith(cls.PREFIX):
             return key[len(cls.PREFIX):]
         return key
 
     @classmethod
     def get_by_key_name(cls, key, repo):
         row = cls.query()\
                 .filter(cls.repository == repo)\
                 .filter(cls.field_key == key).scalar()
         return row
 
 
 class Repository(Base, BaseModel):
     __tablename__ = 'repositories'
     __table_args__ = (
         Index('r_repo_name_idx', 'repo_name', mysql_length=255),
         base_table_args,
     )
     DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
     DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}'
     DEFAULT_CLONE_URI_SSH = 'ssh://{sys_user}@{hostname}/{repo}'
 
     STATE_CREATED = 'repo_state_created'
     STATE_PENDING = 'repo_state_pending'
     STATE_ERROR = 'repo_state_error'
 
     LOCK_AUTOMATIC = 'lock_auto'
     LOCK_API = 'lock_api'
     LOCK_WEB = 'lock_web'
     LOCK_PULL = 'lock_pull'
 
     NAME_SEP = URL_SEP
 
     repo_id = Column(
         "repo_id", Integer(), nullable=False, unique=True, default=None,
         primary_key=True)
     _repo_name = Column(
         "repo_name", Text(), nullable=False, default=None)
     repo_name_hash = Column(
         "repo_name_hash", String(255), nullable=False, unique=True)
     repo_state = Column("repo_state", String(255), nullable=True)
 
     clone_uri = Column(
         "clone_uri", EncryptedTextValue(), nullable=True, unique=False,
         default=None)
     push_uri = Column(
         "push_uri", EncryptedTextValue(), nullable=True, unique=False,
         default=None)
     repo_type = Column(
         "repo_type", String(255), nullable=False, unique=False, default=None)
     user_id = Column(
         "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
         unique=False, default=None)
     private = Column(
         "private", Boolean(), nullable=True, unique=None, default=None)
     archived = Column(
         "archived", Boolean(), nullable=True, unique=None, default=None)
     enable_statistics = Column(
         "statistics", Boolean(), nullable=True, unique=None, default=True)
     enable_downloads = Column(
         "downloads", Boolean(), nullable=True, unique=None, default=True)
     description = Column(
         "description", String(10000), nullable=True, unique=None, default=None)
     created_on = Column(
         'created_on', DateTime(timezone=False), nullable=True, unique=None,
         default=datetime.datetime.now)
     updated_on = Column(
         'updated_on', DateTime(timezone=False), nullable=True, unique=None,
         default=datetime.datetime.now)
     _landing_revision = Column(
         "landing_revision", String(255), nullable=False, unique=False,
         default=None)
     enable_locking = Column(
         "enable_locking", Boolean(), nullable=False, unique=None,
         default=False)
     _locked = Column(
         "locked", String(255), nullable=True, unique=False, default=None)
     _changeset_cache = Column(
         "changeset_cache", LargeBinary(), nullable=True)  # JSON data
 
     fork_id = Column(
         "fork_id", Integer(), ForeignKey('repositories.repo_id'),
         nullable=True, unique=False, default=None)
     group_id = Column(
         "group_id", Integer(), ForeignKey('groups.group_id'), nullable=True,
         unique=False, default=None)
 
     user = relationship('User', lazy='joined')
     fork = relationship('Repository', remote_side=repo_id, lazy='joined')
     group = relationship('RepoGroup', lazy='joined')
     repo_to_perm = relationship(
         'UserRepoToPerm', cascade='all',
         order_by='UserRepoToPerm.repo_to_perm_id')
     users_group_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
     stats = relationship('Statistics', cascade='all', uselist=False)
 
     followers = relationship(
         'UserFollowing',
         primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id',
         cascade='all')
     extra_fields = relationship(
         'RepositoryField', cascade="all, delete-orphan")
     logs = relationship('UserLog')
     comments = relationship(
         'ChangesetComment', cascade="all, delete-orphan")
     pull_requests_source = relationship(
         'PullRequest',
         primaryjoin='PullRequest.source_repo_id==Repository.repo_id',
         cascade="all, delete-orphan")
     pull_requests_target = relationship(
         'PullRequest',
         primaryjoin='PullRequest.target_repo_id==Repository.repo_id',
         cascade="all, delete-orphan")
     ui = relationship('RepoRhodeCodeUi', cascade="all")
     settings = relationship('RepoRhodeCodeSetting', cascade="all")
     integrations = relationship('Integration', cascade="all, delete-orphan")
 
     scoped_tokens = relationship('UserApiKeys', cascade="all")
 
     # no cascade, set NULL
     artifacts = relationship('FileStore', primaryjoin='FileStore.scope_repo_id==Repository.repo_id')
 
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,
                                    safe_unicode(self.repo_name))
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.description)
 
     @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:
                 _rev_info.insert(0, 'rev')
             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:
             raise ValueError('value must be delimited with `:` and consist '
                              'of <rev_type>:<rev>, got %s instead' % val)
         self._landing_revision = val
 
     @hybrid_property
     def locked(self):
         if self._locked:
             user_id, timelocked, reason = self._locked.split(':')
             lock_values = int(user_id), timelocked, reason
         else:
             lock_values = [None, None, None]
         return lock_values
 
     @locked.setter
     def locked(self, val):
         if val and isinstance(val, (list, tuple)):
             self._locked = ':'.join(map(str, val))
         else:
             self._locked = None
 
     @classmethod
     def _load_changeset_cache(cls, repo_id, changeset_cache_raw):
         from rhodecode.lib.vcs.backends.base import EmptyCommit
         dummy = EmptyCommit().__json__()
         if not changeset_cache_raw:
             dummy['source_repo_id'] = repo_id
             return json.loads(json.dumps(dummy))
 
         try:
             return json.loads(changeset_cache_raw)
         except TypeError:
             return dummy
         except Exception:
             log.error(traceback.format_exc())
             return dummy
 
     @hybrid_property
     def changeset_cache(self):
         return self._load_changeset_cache(self.repo_id, self._changeset_cache)
 
     @changeset_cache.setter
     def changeset_cache(self, val):
         try:
             self._changeset_cache = json.dumps(val)
         except Exception:
             log.error(traceback.format_exc())
 
     @hybrid_property
     def repo_name(self):
         return self._repo_name
 
     @repo_name.setter
     def repo_name(self, value):
         self._repo_name = value
         self.repo_name_hash = hashlib.sha1(safe_str(value)).hexdigest()
 
     @classmethod
     def normalize_repo_name(cls, repo_name):
         """
         Normalizes os specific repo_name to the format internally stored inside
         database using URL_SEP
 
         :param cls:
         :param repo_name:
         """
         return cls.NAME_SEP.join(repo_name.split(os.sep))
 
     @classmethod
     def get_by_repo_name(cls, repo_name, cache=False, identity_cache=False):
         session = Session()
         q = session.query(cls).filter(cls.repo_name == repo_name)
 
         if cache:
             if identity_cache:
                 val = cls.identity_cache(session, 'repo_name', repo_name)
                 if val:
                     return val
             else:
                 cache_key = "get_repo_by_name_%s" % _hash_key(repo_name)
                 q = q.options(
                     FromCache("sql_cache_short", cache_key))
 
         return q.scalar()
 
     @classmethod
     def get_by_id_or_repo_name(cls, repoid):
         if isinstance(repoid, (int, long)):
             try:
                 repo = cls.get(repoid)
             except ValueError:
                 repo = None
         else:
             repo = cls.get_by_repo_name(repoid)
         return repo
 
     @classmethod
     def get_by_full_path(cls, repo_full_path):
         repo_name = repo_full_path.split(cls.base_path(), 1)[-1]
         repo_name = cls.normalize_repo_name(repo_name)
         return cls.get_by_repo_name(repo_name.strip(URL_SEP))
 
     @classmethod
     def get_repo_forks(cls, repo_id):
         return cls.query().filter(Repository.fork_id == repo_id)
 
     @classmethod
     def base_path(cls):
         """
         Returns base path when all repos are stored
 
         :param cls:
         """
         q = Session().query(RhodeCodeUi)\
             .filter(RhodeCodeUi.ui_key == cls.NAME_SEP)
         q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return q.one().ui_value
 
     @classmethod
     def get_all_repos(cls, user_id=Optional(None), group_id=Optional(None),
                       case_insensitive=True, archived=False):
         q = Repository.query()
 
         if not archived:
             q = q.filter(Repository.archived.isnot(true()))
 
         if not isinstance(user_id, Optional):
             q = q.filter(Repository.user_id == user_id)
 
         if not isinstance(group_id, Optional):
             q = q.filter(Repository.group_id == group_id)
 
         if case_insensitive:
             q = q.order_by(func.lower(Repository.repo_name))
         else:
             q = q.order_by(Repository.repo_name)
 
         return q.all()
 
     @property
     def repo_uid(self):
         return '_{}'.format(self.repo_id)
 
     @property
     def forks(self):
         """
         Return forks of this repo
         """
         return Repository.get_repo_forks(self.repo_id)
 
     @property
     def parent(self):
         """
         Returns fork parent
         """
         return self.fork
 
     @property
     def just_name(self):
         return self.repo_name.split(self.NAME_SEP)[-1]
 
     @property
     def groups_with_parents(self):
         groups = []
         if self.group is None:
             return groups
 
         cur_gr = self.group
         groups.insert(0, cur_gr)
         while 1:
             gr = getattr(cur_gr, 'parent_group', None)
             cur_gr = cur_gr.parent_group
             if gr is None:
                 break
             groups.insert(0, gr)
 
         return groups
 
     @property
     def groups_and_repo(self):
         return self.groups_with_parents, self
 
     @LazyProperty
     def repo_path(self):
         """
         Returns base full path for that repository means where it actually
         exists on a filesystem
         """
         q = Session().query(RhodeCodeUi).filter(
             RhodeCodeUi.ui_key == self.NAME_SEP)
         q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return q.one().ui_value
 
     @property
     def repo_full_path(self):
         p = [self.repo_path]
         # we need to split the name by / since this is how we store the
         # names in the database, but that eventually needs to be converted
         # into a valid system path
         p += self.repo_name.split(self.NAME_SEP)
         return os.path.join(*map(safe_unicode, p))
 
     @property
     def cache_keys(self):
         """
         Returns associated cache keys for that repo
         """
         invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
             repo_id=self.repo_id)
         return CacheKey.query()\
             .filter(CacheKey.cache_args == invalidation_namespace)\
             .order_by(CacheKey.cache_key)\
             .all()
 
     @property
     def cached_diffs_relative_dir(self):
         """
         Return a relative to the repository store path of cached diffs
         used for safe display for users, who shouldn't know the absolute store
         path
         """
         return os.path.join(
             os.path.dirname(self.repo_name),
             self.cached_diffs_dir.split(os.path.sep)[-1])
 
     @property
     def cached_diffs_dir(self):
         path = self.repo_full_path
         return os.path.join(
             os.path.dirname(path),
             '.__shadow_diff_cache_repo_{}'.format(self.repo_id))
 
     def cached_diffs(self):
         diff_cache_dir = self.cached_diffs_dir
         if os.path.isdir(diff_cache_dir):
             return os.listdir(diff_cache_dir)
         return []
 
     def shadow_repos(self):
         shadow_repos_pattern = '.__shadow_repo_{}'.format(self.repo_id)
         return [
             x for x in os.listdir(os.path.dirname(self.repo_full_path))
             if x.startswith(shadow_repos_pattern)]
 
     def get_new_name(self, repo_name):
         """
         returns new full repository name based on assigned group and new new
 
         :param group_name:
         """
         path_prefix = self.group.full_path_splitted if self.group else []
         return self.NAME_SEP.join(path_prefix + [repo_name])
 
     @property
     def _config(self):
         """
         Returns db based config object.
         """
         from rhodecode.lib.utils import make_db_config
         return make_db_config(clear_session=False, repo=self)
 
     def permissions(self, with_admins=True, with_owner=True,
                     expand_from_user_groups=False):
         """
         Permissions for repositories
         """
         _admin_perm = 'repository.admin'
 
         owner_row = []
         if with_owner:
             usr = AttributeDict(self.user.get_dict())
             usr.owner_row = True
             usr.permission = _admin_perm
             usr.permission_id = None
             owner_row.append(usr)
 
         super_admin_ids = []
         super_admin_rows = []
         if with_admins:
             for usr in User.get_all_super_admins():
                 super_admin_ids.append(usr.user_id)
                 # if this admin is also owner, don't double the record
                 if usr.user_id == owner_row[0].user_id:
                     owner_row[0].admin_row = True
                 else:
                     usr = AttributeDict(usr.get_dict())
                     usr.admin_row = True
                     usr.permission = _admin_perm
                     usr.permission_id = None
                     super_admin_rows.append(usr)
 
         q = UserRepoToPerm.query().filter(UserRepoToPerm.repository == self)
         q = q.options(joinedload(UserRepoToPerm.repository),
                       joinedload(UserRepoToPerm.user),
                       joinedload(UserRepoToPerm.permission),)
 
         # get owners and admins and permissions. We do a trick of re-writing
         # objects from sqlalchemy to named-tuples due to sqlalchemy session
         # has a global reference and changing one object propagates to all
         # others. This means if admin is also an owner admin_row that change
         # would propagate to both objects
         perm_rows = []
         for _usr in q.all():
             usr = AttributeDict(_usr.user.get_dict())
             # if this user is also owner/admin, mark as duplicate record
             if usr.user_id == owner_row[0].user_id or usr.user_id in super_admin_ids:
                 usr.duplicate_perm = True
             # also check if this permission is maybe used by branch_permissions
             if _usr.branch_perm_entry:
                 usr.branch_rules = [x.branch_rule_id for x in _usr.branch_perm_entry]
 
             usr.permission = _usr.permission.permission_name
             usr.permission_id = _usr.repo_to_perm_id
             perm_rows.append(usr)
 
         # filter the perm rows by 'default' first and then sort them by
         # admin,write,read,none permissions sorted again alphabetically in
         # each group
         perm_rows = sorted(perm_rows, key=display_user_sort)
 
         user_groups_rows = []
         if expand_from_user_groups:
             for ug in self.permission_user_groups(with_members=True):
                 for user_data in ug.members:
                     user_groups_rows.append(user_data)
 
         return super_admin_rows + owner_row + perm_rows + user_groups_rows
 
     def permission_user_groups(self, with_members=True):
         q = UserGroupRepoToPerm.query()\
             .filter(UserGroupRepoToPerm.repository == self)
         q = q.options(joinedload(UserGroupRepoToPerm.repository),
                       joinedload(UserGroupRepoToPerm.users_group),
                       joinedload(UserGroupRepoToPerm.permission),)
 
         perm_rows = []
         for _user_group in q.all():
             entry = AttributeDict(_user_group.users_group.get_dict())
             entry.permission = _user_group.permission.permission_name
             if with_members:
                 entry.members = [x.user.get_dict()
                                  for x in _user_group.users_group.members]
             perm_rows.append(entry)
 
         perm_rows = sorted(perm_rows, key=display_user_group_sort)
         return perm_rows
 
     def get_api_data(self, include_secrets=False):
         """
         Common function for generating repo api data
 
         :param include_secrets: See :meth:`User.get_api_data`.
 
         """
         # TODO: mikhail: Here there is an anti-pattern, we probably need to
         # move this methods on models level.
         from rhodecode.model.settings import SettingsModel
         from rhodecode.model.repo import RepoModel
 
         repo = self
         _user_id, _time, _reason = self.locked
 
         data = {
             'repo_id': repo.repo_id,
             'repo_name': repo.repo_name,
             'repo_type': repo.repo_type,
             'clone_uri': repo.clone_uri or '',
             'push_uri': repo.push_uri or '',
             'url': RepoModel().get_url(self),
             'private': repo.private,
             'created_on': repo.created_on,
             'description': repo.description_safe,
             'landing_rev': repo.landing_rev,
             'owner': repo.user.username,
             'fork_of': repo.fork.repo_name if repo.fork else None,
             'fork_of_id': repo.fork.repo_id if repo.fork else None,
             'enable_statistics': repo.enable_statistics,
             'enable_locking': repo.enable_locking,
             'enable_downloads': repo.enable_downloads,
             'last_changeset': repo.changeset_cache,
             'locked_by': User.get(_user_id).get_api_data(
                 include_secrets=include_secrets) if _user_id else None,
             'locked_date': time_to_datetime(_time) if _time else None,
             'lock_reason': _reason if _reason else None,
         }
 
         # TODO: mikhail: should be per-repo settings here
         rc_config = SettingsModel().get_all_settings()
         repository_fields = str2bool(
             rc_config.get('rhodecode_repository_fields'))
         if repository_fields:
             for f in self.extra_fields:
                 data[f.field_key_prefixed] = f.field_value
 
         return data
 
     @classmethod
     def lock(cls, repo, user_id, lock_time=None, lock_reason=None):
         if not lock_time:
             lock_time = time.time()
         if not lock_reason:
             lock_reason = cls.LOCK_AUTOMATIC
         repo.locked = [user_id, lock_time, lock_reason]
         Session().add(repo)
         Session().commit()
 
     @classmethod
     def unlock(cls, repo):
         repo.locked = None
         Session().add(repo)
         Session().commit()
 
     @classmethod
     def getlock(cls, repo):
         return repo.locked
 
     def is_user_lock(self, user_id):
         if self.lock[0]:
             lock_user_id = safe_int(self.lock[0])
             user_id = safe_int(user_id)
             # both are ints, and they are equal
             return all([lock_user_id, user_id]) and lock_user_id == user_id
 
         return False
 
     def get_locking_state(self, action, user_id, only_when_enabled=True):
         """
         Checks locking on this repository, if locking is enabled and lock is
         present returns a tuple of make_lock, locked, locked_by.
         make_lock can have 3 states None (do nothing) True, make lock
         False release lock, This value is later propagated to hooks, which
         do the locking. Think about this as signals passed to hooks what to do.
 
         """
         # TODO: johbo: This is part of the business logic and should be moved
         # into the RepositoryModel.
 
         if action not in ('push', 'pull'):
             raise ValueError("Invalid action value: %s" % repr(action))
 
         # defines if locked error should be thrown to user
         currently_locked = False
         # defines if new lock should be made, tri-state
         make_lock = None
         repo = self
         user = User.get(user_id)
 
         lock_info = repo.locked
 
         if repo and (repo.enable_locking or not only_when_enabled):
             if action == 'push':
                 # check if it's already locked !, if it is compare users
                 locked_by_user_id = lock_info[0]
                 if user.user_id == locked_by_user_id:
                     log.debug(
                         'Got `push` action from user %s, now unlocking', user)
                     # unlock if we have push from user who locked
                     make_lock = False
                 else:
                     # we're not the same user who locked, ban with
                     # code defined in settings (default is 423 HTTP Locked) !
                     log.debug('Repo %s is currently locked by %s', repo, user)
                     currently_locked = True
             elif action == 'pull':
                 # [0] user [1] date
                 if lock_info[0] and lock_info[1]:
                     log.debug('Repo %s is currently locked by %s', repo, user)
                     currently_locked = True
                 else:
                     log.debug('Setting lock on repo %s by %s', repo, user)
                     make_lock = True
 
         else:
             log.debug('Repository %s do not have locking enabled', repo)
 
         log.debug('FINAL locking values make_lock:%s,locked:%s,locked_by:%s',
                   make_lock, currently_locked, lock_info)
 
         from rhodecode.lib.auth import HasRepoPermissionAny
         perm_check = HasRepoPermissionAny('repository.write', 'repository.admin')
         if make_lock and not perm_check(repo_name=repo.repo_name, user=user):
             # if we don't have at least write permission we cannot make a lock
             log.debug('lock state reset back to FALSE due to lack '
                       'of at least read permission')
             make_lock = False
 
         return make_lock, currently_locked, lock_info
 
     @property
     def last_commit_cache_update_diff(self):
         return time.time() - (safe_int(self.changeset_cache.get('updated_on')) or 0)
 
     @classmethod
     def _load_commit_change(cls, last_commit_cache):
         from rhodecode.lib.vcs.utils.helpers import parse_datetime
         empty_date = datetime.datetime.fromtimestamp(0)
         date_latest = last_commit_cache.get('date', empty_date)
         try:
             return parse_datetime(date_latest)
         except Exception:
             return empty_date
 
     @property
     def last_commit_change(self):
         return self._load_commit_change(self.changeset_cache)
 
     @property
     def last_db_change(self):
         return self.updated_on
 
     @property
     def clone_uri_hidden(self):
         clone_uri = self.clone_uri
         if clone_uri:
             import urlobject
             url_obj = urlobject.URLObject(cleaned_uri(clone_uri))
             if url_obj.password:
                 clone_uri = url_obj.with_password('*****')
         return clone_uri
 
     @property
     def push_uri_hidden(self):
         push_uri = self.push_uri
         if push_uri:
             import urlobject
             url_obj = urlobject.URLObject(cleaned_uri(push_uri))
             if url_obj.password:
                 push_uri = url_obj.with_password('*****')
         return push_uri
 
     def clone_url(self, **override):
         from rhodecode.model.settings import SettingsModel
 
         uri_tmpl = None
         if 'with_id' in override:
             uri_tmpl = self.DEFAULT_CLONE_URI_ID
             del override['with_id']
 
         if 'uri_tmpl' in override:
             uri_tmpl = override['uri_tmpl']
             del override['uri_tmpl']
 
         ssh = False
         if 'ssh' in override:
             ssh = True
             del override['ssh']
 
         # we didn't override our tmpl from **overrides
         request = get_current_request()
         if not uri_tmpl:
             if hasattr(request, 'call_context') and hasattr(request.call_context, 'rc_config'):
                 rc_config = request.call_context.rc_config
             else:
                 rc_config = SettingsModel().get_all_settings(cache=True)
 
             if ssh:
                 uri_tmpl = rc_config.get(
                     'rhodecode_clone_uri_ssh_tmpl') or self.DEFAULT_CLONE_URI_SSH
 
             else:
                 uri_tmpl = rc_config.get(
                     'rhodecode_clone_uri_tmpl') or self.DEFAULT_CLONE_URI
 
         return get_clone_url(request=request,
                              uri_tmpl=uri_tmpl,
                              repo_name=self.repo_name,
                              repo_id=self.repo_id,
                              repo_type=self.repo_type,
                              **override)
 
     def set_state(self, state):
         self.repo_state = state
         Session().add(self)
     #==========================================================================
     # SCM PROPERTIES
     #==========================================================================
 
     def get_commit(self, commit_id=None, commit_idx=None, pre_load=None, maybe_unreachable=False):
         return get_commit_safe(
             self.scm_instance(), commit_id, commit_idx, pre_load=pre_load,
             maybe_unreachable=maybe_unreachable)
 
     def get_changeset(self, rev=None, pre_load=None):
         warnings.warn("Use get_commit", DeprecationWarning)
         commit_id = None
         commit_idx = None
         if isinstance(rev, compat.string_types):
             commit_id = rev
         else:
             commit_idx = rev
         return self.get_commit(commit_id=commit_id, commit_idx=commit_idx,
                                pre_load=pre_load)
 
     def get_landing_commit(self):
         """
         Returns landing commit, or if that doesn't exist returns the tip
         """
         _rev_type, _rev = self.landing_rev
         commit = self.get_commit(_rev)
         if isinstance(commit, EmptyCommit):
             return self.get_commit()
         return commit
 
     def flush_commit_cache(self):
         self.update_commit_cache(cs_cache={'raw_id':'0'})
         self.update_commit_cache()
 
     def update_commit_cache(self, cs_cache=None, config=None):
         """
         Update cache of last commit for repository
         cache_keys should be::
 
             source_repo_id
             short_id
             raw_id
             revision
             parents
             message
             date
             author
             updated_on
 
         """
         from rhodecode.lib.vcs.backends.base import BaseChangeset
         from rhodecode.lib.vcs.utils.helpers import parse_datetime
         empty_date = datetime.datetime.fromtimestamp(0)
 
         if cs_cache is None:
             # use no-cache version here
             try:
                 scm_repo = self.scm_instance(cache=False, config=config)
             except VCSError:
                 scm_repo = None
             empty = scm_repo is None or scm_repo.is_empty()
 
             if not empty:
                 cs_cache = scm_repo.get_commit(
                     pre_load=["author", "date", "message", "parents", "branch"])
             else:
                 cs_cache = EmptyCommit()
 
         if isinstance(cs_cache, BaseChangeset):
             cs_cache = cs_cache.__json__()
 
         def is_outdated(new_cs_cache):
             if (new_cs_cache['raw_id'] != self.changeset_cache['raw_id'] or
                 new_cs_cache['revision'] != self.changeset_cache['revision']):
                 return True
             return False
 
         # check if we have maybe already latest cached revision
         if is_outdated(cs_cache) or not self.changeset_cache:
             _current_datetime = datetime.datetime.utcnow()
             last_change = cs_cache.get('date') or _current_datetime
             # we check if last update is newer than the new value
             # if yes, we use the current timestamp instead. Imagine you get
             # old commit pushed 1y ago, we'd set last update 1y to ago.
             last_change_timestamp = datetime_to_time(last_change)
             current_timestamp = datetime_to_time(last_change)
             if last_change_timestamp > current_timestamp and not empty:
                 cs_cache['date'] = _current_datetime
 
             _date_latest = parse_datetime(cs_cache.get('date') or empty_date)
             cs_cache['updated_on'] = time.time()
             self.changeset_cache = cs_cache
             self.updated_on = last_change
             Session().add(self)
             Session().commit()
 
         else:
             if empty:
                 cs_cache = EmptyCommit().__json__()
             else:
                 cs_cache = self.changeset_cache
 
             _date_latest = parse_datetime(cs_cache.get('date') or empty_date)
 
             cs_cache['updated_on'] = time.time()
             self.changeset_cache = cs_cache
             self.updated_on = _date_latest
             Session().add(self)
             Session().commit()
 
         log.debug('updated repo `%s` with new commit cache %s, and last update_date: %s',
                   self.repo_name, cs_cache, _date_latest)
 
     @property
     def tip(self):
         return self.get_commit('tip')
 
     @property
     def author(self):
         return self.tip.author
 
     @property
     def last_change(self):
         return self.scm_instance().last_change
 
     def get_comments(self, revisions=None):
         """
         Returns comments for this repository grouped by revisions
 
         :param revisions: filter query by revisions only
         """
         cmts = ChangesetComment.query()\
             .filter(ChangesetComment.repo == self)
         if revisions:
             cmts = cmts.filter(ChangesetComment.revision.in_(revisions))
         grouped = collections.defaultdict(list)
         for cmt in cmts.all():
             grouped[cmt.revision].append(cmt)
         return grouped
 
     def statuses(self, revisions=None):
         """
         Returns statuses for this repository
 
         :param revisions: list of revisions to get statuses for
         """
         statuses = ChangesetStatus.query()\
             .filter(ChangesetStatus.repo == self)\
             .filter(ChangesetStatus.version == 0)
 
         if revisions:
             # Try doing the filtering in chunks to avoid hitting limits
             size = 500
             status_results = []
             for chunk in xrange(0, len(revisions), size):
                 status_results += statuses.filter(
                     ChangesetStatus.revision.in_(
                         revisions[chunk: chunk+size])
                 ).all()
         else:
             status_results = statuses.all()
 
         grouped = {}
 
         # maybe we have open new pullrequest without a status?
         stat = ChangesetStatus.STATUS_UNDER_REVIEW
         status_lbl = ChangesetStatus.get_status_lbl(stat)
         for pr in PullRequest.query().filter(PullRequest.source_repo == self).all():
             for rev in pr.revisions:
                 pr_id = pr.pull_request_id
                 pr_repo = pr.target_repo.repo_name
                 grouped[rev] = [stat, status_lbl, pr_id, pr_repo]
 
         for stat in status_results:
             pr_id = pr_repo = None
             if stat.pull_request:
                 pr_id = stat.pull_request.pull_request_id
                 pr_repo = stat.pull_request.target_repo.repo_name
             grouped[stat.revision] = [str(stat.status), stat.status_lbl,
                                       pr_id, pr_repo]
         return grouped
 
     # ==========================================================================
     # SCM CACHE INSTANCE
     # ==========================================================================
 
     def scm_instance(self, **kwargs):
         import rhodecode
 
         # Passing a config will not hit the cache currently only used
         # for repo2dbmapper
         config = kwargs.pop('config', None)
         cache = kwargs.pop('cache', None)
         vcs_full_cache = kwargs.pop('vcs_full_cache', None)
         if vcs_full_cache is not None:
             # allows override global config
             full_cache = vcs_full_cache
         else:
             full_cache = str2bool(rhodecode.CONFIG.get('vcs_full_cache'))
         # if cache is NOT defined use default global, else we have a full
         # control over cache behaviour
         if cache is None and full_cache and not config:
             log.debug('Initializing pure cached instance for %s', self.repo_path)
             return self._get_instance_cached()
 
         # cache here is sent to the "vcs server"
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
         from rhodecode.lib import rc_cache
 
         cache_namespace_uid = 'cache_repo_instance.{}'.format(self.repo_id)
         invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
             repo_id=self.repo_id)
         region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
         def get_instance_cached(repo_id, context_id, _cache_state_uid):
             return self._get_instance(repo_state_uid=_cache_state_uid)
 
         # we must use thread scoped cache here,
         # because each thread of gevent needs it's own not shared connection and cache
         # we also alter `args` so the cache key is individual for every green thread.
         inv_context_manager = rc_cache.InvalidationContext(
             uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace,
             thread_scoped=True)
         with inv_context_manager as invalidation_context:
             cache_state_uid = invalidation_context.cache_data['cache_state_uid']
             args = (self.repo_id, inv_context_manager.cache_key, cache_state_uid)
 
             # re-compute and store cache if we get invalidate signal
             if invalidation_context.should_invalidate():
                 instance = get_instance_cached.refresh(*args)
             else:
                 instance = get_instance_cached(*args)
 
             log.debug('Repo instance fetched in %.4fs', inv_context_manager.compute_time)
             return instance
 
     def _get_instance(self, cache=True, config=None, repo_state_uid=None):
         log.debug('Initializing %s instance `%s` with cache flag set to: %s',
                   self.repo_type, self.repo_path, cache)
         config = config or self._config
         custom_wire = {
             'cache': cache,  # controls the vcs.remote cache
             'repo_state_uid': repo_state_uid
         }
         repo = get_vcs_instance(
             repo_path=safe_str(self.repo_full_path),
             config=config,
             with_wire=custom_wire,
             create=False,
             _vcs_alias=self.repo_type)
         if repo is not None:
             repo.count()  # cache rebuild
         return repo
 
     def get_shadow_repository_path(self, workspace_id):
         from rhodecode.lib.vcs.backends.base import BaseRepository
         shadow_repo_path = BaseRepository._get_shadow_repository_path(
             self.repo_full_path, self.repo_id, workspace_id)
         return shadow_repo_path
 
     def __json__(self):
         return {'landing_rev': self.landing_rev}
 
     def get_dict(self):
 
         # Since we transformed `repo_name` to a hybrid property, we need to
         # keep compatibility with the code which uses `repo_name` field.
 
         result = super(Repository, self).get_dict()
         result['repo_name'] = result.pop('_repo_name', None)
         return result
 
 
 class RepoGroup(Base, BaseModel):
     __tablename__ = 'groups'
     __table_args__ = (
         UniqueConstraint('group_name', 'group_parent_id'),
         base_table_args,
     )
     __mapper_args__ = {'order_by': 'group_name'}
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     _group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
     group_name_hash = Column("repo_group_name_hash", String(1024), nullable=False, unique=False)
     group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
     group_description = Column("group_description", String(10000), nullable=True, unique=None, default=None)
     enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     updated_on = Column('updated_on', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
     personal = Column('personal', Boolean(), nullable=True, unique=None, default=None)
     _changeset_cache = Column("changeset_cache", LargeBinary(), nullable=True)  # JSON data
 
     repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
     users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
     parent_group = relationship('RepoGroup', remote_side=group_id)
     user = relationship('User')
     integrations = relationship('Integration', cascade="all, delete-orphan")
 
     # no cascade, set NULL
     scope_artifacts = relationship('FileStore', primaryjoin='FileStore.scope_repo_group_id==RepoGroup.group_id')
 
     def __init__(self, group_name='', parent_group=None):
         self.group_name = group_name
         self.parent_group = parent_group
 
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (
             self.__class__.__name__, self.group_id, self.group_name)
 
     @hybrid_property
     def group_name(self):
         return self._group_name
 
     @group_name.setter
     def group_name(self, value):
         self._group_name = value
         self.group_name_hash = self.hash_repo_group_name(value)
 
     @classmethod
     def _load_changeset_cache(cls, repo_id, changeset_cache_raw):
         from rhodecode.lib.vcs.backends.base import EmptyCommit
         dummy = EmptyCommit().__json__()
         if not changeset_cache_raw:
             dummy['source_repo_id'] = repo_id
             return json.loads(json.dumps(dummy))
 
         try:
             return json.loads(changeset_cache_raw)
         except TypeError:
             return dummy
         except Exception:
             log.error(traceback.format_exc())
             return dummy
 
     @hybrid_property
     def changeset_cache(self):
         return self._load_changeset_cache('', self._changeset_cache)
 
     @changeset_cache.setter
     def changeset_cache(self, val):
         try:
             self._changeset_cache = json.dumps(val)
         except Exception:
             log.error(traceback.format_exc())
 
     @validates('group_parent_id')
     def validate_group_parent_id(self, key, val):
         """
         Check cycle references for a parent group to self
         """
         if self.group_id and val:
             assert val != self.group_id
 
         return val
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.group_description)
 
     @classmethod
     def hash_repo_group_name(cls, repo_group_name):
         val = remove_formatting(repo_group_name)
         val = safe_str(val).lower()
         chars = []
         for c in val:
             if c not in string.ascii_letters:
                 c = str(ord(c))
             chars.append(c)
 
         return ''.join(chars)
 
     @classmethod
     def _generate_choice(cls, repo_group):
         from webhelpers2.html import literal as _literal
         _name = lambda k: _literal(cls.CHOICES_SEPARATOR.join(k))
         return repo_group.group_id, _name(repo_group.full_path_splitted)
 
     @classmethod
     def groups_choices(cls, groups=None, show_empty_group=True):
         if not groups:
             groups = cls.query().all()
 
         repo_groups = []
         if show_empty_group:
             repo_groups = [(-1, u'-- %s --' % _('No parent'))]
 
         repo_groups.extend([cls._generate_choice(x) for x in groups])
 
         repo_groups = sorted(
             repo_groups, key=lambda t: t[1].split(cls.CHOICES_SEPARATOR)[0])
         return repo_groups
 
     @classmethod
     def url_sep(cls):
         return URL_SEP
 
     @classmethod
     def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
         if case_insensitive:
             gr = cls.query().filter(func.lower(cls.group_name)
                                     == func.lower(group_name))
         else:
             gr = cls.query().filter(cls.group_name == group_name)
         if cache:
             name_key = _hash_key(group_name)
             gr = gr.options(
                 FromCache("sql_cache_short", "get_group_%s" % name_key))
         return gr.scalar()
 
     @classmethod
     def get_user_personal_repo_group(cls, user_id):
         user = User.get(user_id)
         if user.username == User.DEFAULT_USER:
             return None
 
         return cls.query()\
             .filter(cls.personal == true()) \
             .filter(cls.user == user) \
             .order_by(cls.group_id.asc()) \
             .first()
 
     @classmethod
     def get_all_repo_groups(cls, user_id=Optional(None), group_id=Optional(None),
                             case_insensitive=True):
         q = RepoGroup.query()
 
         if not isinstance(user_id, Optional):
             q = q.filter(RepoGroup.user_id == user_id)
 
         if not isinstance(group_id, Optional):
             q = q.filter(RepoGroup.group_parent_id == group_id)
 
         if case_insensitive:
             q = q.order_by(func.lower(RepoGroup.group_name))
         else:
             q = q.order_by(RepoGroup.group_name)
         return q.all()
 
     @property
     def parents(self, parents_recursion_limit=10):
         groups = []
         if self.parent_group is None:
             return groups
         cur_gr = self.parent_group
         groups.insert(0, cur_gr)
         cnt = 0
         while 1:
             cnt += 1
             gr = getattr(cur_gr, 'parent_group', None)
             cur_gr = cur_gr.parent_group
             if gr is None:
                 break
             if cnt == parents_recursion_limit:
                 # this will prevent accidental infinit loops
                 log.error('more than %s parents found for group %s, stopping '
                           'recursive parent fetching', parents_recursion_limit, self)
                 break
 
             groups.insert(0, gr)
         return groups
 
     @property
     def last_commit_cache_update_diff(self):
         return time.time() - (safe_int(self.changeset_cache.get('updated_on')) or 0)
 
     @classmethod
     def _load_commit_change(cls, last_commit_cache):
         from rhodecode.lib.vcs.utils.helpers import parse_datetime
         empty_date = datetime.datetime.fromtimestamp(0)
         date_latest = last_commit_cache.get('date', empty_date)
         try:
             return parse_datetime(date_latest)
         except Exception:
             return empty_date
 
     @property
     def last_commit_change(self):
         return self._load_commit_change(self.changeset_cache)
 
     @property
     def last_db_change(self):
         return self.updated_on
 
     @property
     def children(self):
         return RepoGroup.query().filter(RepoGroup.parent_group == self)
 
     @property
     def name(self):
         return self.group_name.split(RepoGroup.url_sep())[-1]
 
     @property
     def full_path(self):
         return self.group_name
 
     @property
     def full_path_splitted(self):
         return self.group_name.split(RepoGroup.url_sep())
 
     @property
     def repositories(self):
         return Repository.query()\
                 .filter(Repository.group == self)\
                 .order_by(Repository.repo_name)
 
     @property
     def repositories_recursive_count(self):
         cnt = self.repositories.count()
 
         def children_count(group):
             cnt = 0
             for child in group.children:
                 cnt += child.repositories.count()
                 cnt += children_count(child)
             return cnt
 
         return cnt + children_count(self)
 
     def _recursive_objects(self, include_repos=True, include_groups=True):
         all_ = []
 
         def _get_members(root_gr):
             if include_repos:
                 for r in root_gr.repositories:
                     all_.append(r)
             childs = root_gr.children.all()
             if childs:
                 for gr in childs:
                     if include_groups:
                         all_.append(gr)
                     _get_members(gr)
 
         root_group = []
         if include_groups:
             root_group = [self]
 
         _get_members(self)
         return root_group + all_
 
     def recursive_groups_and_repos(self):
         """
         Recursive return all groups, with repositories in those groups
         """
         return self._recursive_objects()
 
     def recursive_groups(self):
         """
         Returns all children groups for this group including children of children
         """
         return self._recursive_objects(include_repos=False)
 
     def recursive_repos(self):
         """
         Returns all children repositories for this group
         """
         return self._recursive_objects(include_groups=False)
 
     def get_new_name(self, group_name):
         """
         returns new full group name based on parent and new name
 
         :param group_name:
         """
         path_prefix = (self.parent_group.full_path_splitted if
                        self.parent_group else [])
         return RepoGroup.url_sep().join(path_prefix + [group_name])
 
     def update_commit_cache(self, config=None):
         """
         Update cache of last commit for newest repository inside this repository group.
         cache_keys should be::
 
             source_repo_id
             short_id
             raw_id
             revision
             parents
             message
             date
             author
 
         """
         from rhodecode.lib.vcs.utils.helpers import parse_datetime
         empty_date = datetime.datetime.fromtimestamp(0)
 
         def repo_groups_and_repos(root_gr):
             for _repo in root_gr.repositories:
                 yield _repo
             for child_group in root_gr.children.all():
                 yield child_group
 
         latest_repo_cs_cache = {}
         for obj in repo_groups_and_repos(self):
             repo_cs_cache = obj.changeset_cache
             date_latest = latest_repo_cs_cache.get('date', empty_date)
             date_current = repo_cs_cache.get('date', empty_date)
             current_timestamp = datetime_to_time(parse_datetime(date_latest))
             if current_timestamp < datetime_to_time(parse_datetime(date_current)):
                 latest_repo_cs_cache = repo_cs_cache
                 if hasattr(obj, 'repo_id'):
                     latest_repo_cs_cache['source_repo_id'] = obj.repo_id
                 else:
                     latest_repo_cs_cache['source_repo_id'] = repo_cs_cache.get('source_repo_id')
 
         _date_latest = parse_datetime(latest_repo_cs_cache.get('date') or empty_date)
 
         latest_repo_cs_cache['updated_on'] = time.time()
         self.changeset_cache = latest_repo_cs_cache
         self.updated_on = _date_latest
         Session().add(self)
         Session().commit()
 
         log.debug('updated repo group `%s` with new commit cache %s, and last update_date: %s',
                   self.group_name, latest_repo_cs_cache, _date_latest)
 
     def permissions(self, with_admins=True, with_owner=True,
                     expand_from_user_groups=False):
         """
         Permissions for repository groups
         """
         _admin_perm = 'group.admin'
 
         owner_row = []
         if with_owner:
             usr = AttributeDict(self.user.get_dict())
             usr.owner_row = True
             usr.permission = _admin_perm
             owner_row.append(usr)
 
         super_admin_ids = []
         super_admin_rows = []
         if with_admins:
             for usr in User.get_all_super_admins():
                 super_admin_ids.append(usr.user_id)
                 # if this admin is also owner, don't double the record
                 if usr.user_id == owner_row[0].user_id:
                     owner_row[0].admin_row = True
                 else:
                     usr = AttributeDict(usr.get_dict())
                     usr.admin_row = True
                     usr.permission = _admin_perm
                     super_admin_rows.append(usr)
 
         q = UserRepoGroupToPerm.query().filter(UserRepoGroupToPerm.group == self)
         q = q.options(joinedload(UserRepoGroupToPerm.group),
                       joinedload(UserRepoGroupToPerm.user),
                       joinedload(UserRepoGroupToPerm.permission),)
 
         # get owners and admins and permissions. We do a trick of re-writing
         # objects from sqlalchemy to named-tuples due to sqlalchemy session
         # has a global reference and changing one object propagates to all
         # others. This means if admin is also an owner admin_row that change
         # would propagate to both objects
         perm_rows = []
         for _usr in q.all():
             usr = AttributeDict(_usr.user.get_dict())
             # if this user is also owner/admin, mark as duplicate record
             if usr.user_id == owner_row[0].user_id or usr.user_id in super_admin_ids:
                 usr.duplicate_perm = True
             usr.permission = _usr.permission.permission_name
             perm_rows.append(usr)
 
         # filter the perm rows by 'default' first and then sort them by
         # admin,write,read,none permissions sorted again alphabetically in
         # each group
         perm_rows = sorted(perm_rows, key=display_user_sort)
 
         user_groups_rows = []
         if expand_from_user_groups:
             for ug in self.permission_user_groups(with_members=True):
                 for user_data in ug.members:
                     user_groups_rows.append(user_data)
 
         return super_admin_rows + owner_row + perm_rows + user_groups_rows
 
     def permission_user_groups(self, with_members=False):
         q = UserGroupRepoGroupToPerm.query()\
             .filter(UserGroupRepoGroupToPerm.group == self)
         q = q.options(joinedload(UserGroupRepoGroupToPerm.group),
                       joinedload(UserGroupRepoGroupToPerm.users_group),
                       joinedload(UserGroupRepoGroupToPerm.permission),)
 
         perm_rows = []
         for _user_group in q.all():
             entry = AttributeDict(_user_group.users_group.get_dict())
             entry.permission = _user_group.permission.permission_name
             if with_members:
                 entry.members = [x.user.get_dict()
                                  for x in _user_group.users_group.members]
             perm_rows.append(entry)
 
         perm_rows = sorted(perm_rows, key=display_user_group_sort)
         return perm_rows
 
     def get_api_data(self):
         """
         Common function for generating api data
 
         """
         group = self
         data = {
             'group_id': group.group_id,
             'group_name': group.group_name,
             'group_description': group.description_safe,
             'parent_group': group.parent_group.group_name if group.parent_group else None,
             'repositories': [x.repo_name for x in group.repositories],
             'owner': group.user.username,
         }
         return data
 
     def get_dict(self):
         # Since we transformed `group_name` to a hybrid property, we need to
         # keep compatibility with the code which uses `group_name` field.
         result = super(RepoGroup, self).get_dict()
         result['group_name'] = result.pop('_group_name', None)
         return result
 
 
 class Permission(Base, BaseModel):
     __tablename__ = 'permissions'
     __table_args__ = (
         Index('p_perm_name_idx', 'permission_name'),
         base_table_args,
     )
 
     PERMS = [
         ('hg.admin', _('RhodeCode Super Administrator')),
 
         ('repository.none', _('Repository no access')),
         ('repository.read', _('Repository read access')),
         ('repository.write', _('Repository write access')),
         ('repository.admin', _('Repository admin access')),
 
         ('group.none', _('Repository group no access')),
         ('group.read', _('Repository group read access')),
         ('group.write', _('Repository group write access')),
         ('group.admin', _('Repository group admin access')),
 
         ('usergroup.none', _('User group no access')),
         ('usergroup.read', _('User group read access')),
         ('usergroup.write', _('User group write access')),
         ('usergroup.admin', _('User group admin access')),
 
         ('branch.none', _('Branch no permissions')),
         ('branch.merge', _('Branch access by web merge')),
         ('branch.push', _('Branch access by push')),
         ('branch.push_force', _('Branch access by push with force')),
 
         ('hg.repogroup.create.false', _('Repository Group creation disabled')),
         ('hg.repogroup.create.true', _('Repository Group creation enabled')),
 
         ('hg.usergroup.create.false', _('User Group creation disabled')),
         ('hg.usergroup.create.true', _('User Group creation enabled')),
 
         ('hg.create.none', _('Repository creation disabled')),
         ('hg.create.repository', _('Repository creation enabled')),
         ('hg.create.write_on_repogroup.true', _('Repository creation enabled with write permission to a repository group')),
         ('hg.create.write_on_repogroup.false', _('Repository creation disabled with write permission to a repository group')),
 
         ('hg.fork.none', _('Repository forking disabled')),
         ('hg.fork.repository', _('Repository forking enabled')),
 
         ('hg.register.none', _('Registration disabled')),
         ('hg.register.manual_activate', _('User Registration with manual account activation')),
         ('hg.register.auto_activate', _('User Registration with automatic account activation')),
 
         ('hg.password_reset.enabled', _('Password reset enabled')),
         ('hg.password_reset.hidden', _('Password reset hidden')),
         ('hg.password_reset.disabled', _('Password reset disabled')),
 
         ('hg.extern_activate.manual', _('Manual activation of external account')),
         ('hg.extern_activate.auto', _('Automatic activation of external account')),
 
         ('hg.inherit_default_perms.false', _('Inherit object permissions from default user disabled')),
         ('hg.inherit_default_perms.true', _('Inherit object permissions from default user enabled')),
     ]
 
     # definition of system default permissions for DEFAULT user, created on
     # system setup
     DEFAULT_USER_PERMISSIONS = [
         # object perms
         'repository.read',
         'group.read',
         'usergroup.read',
         # branch, for backward compat we need same value as before so forced pushed
         'branch.push_force',
         # global
         'hg.create.repository',
         'hg.repogroup.create.false',
         'hg.usergroup.create.false',
         'hg.create.write_on_repogroup.true',
         'hg.fork.repository',
         'hg.register.manual_activate',
         'hg.password_reset.enabled',
         'hg.extern_activate.auto',
         'hg.inherit_default_perms.true',
     ]
 
     # defines which permissions are more important higher the more important
     # Weight defines which permissions are more important.
     # The higher number the more important.
     PERM_WEIGHTS = {
         'repository.none': 0,
         'repository.read': 1,
         'repository.write': 3,
         'repository.admin': 4,
 
         'group.none': 0,
         'group.read': 1,
         'group.write': 3,
         'group.admin': 4,
 
         'usergroup.none': 0,
         'usergroup.read': 1,
         'usergroup.write': 3,
         'usergroup.admin': 4,
 
         'branch.none': 0,
         'branch.merge': 1,
         'branch.push': 3,
         'branch.push_force': 4,
 
         'hg.repogroup.create.false': 0,
         'hg.repogroup.create.true': 1,
 
         'hg.usergroup.create.false': 0,
         'hg.usergroup.create.true': 1,
 
         'hg.fork.none': 0,
         'hg.fork.repository': 1,
         'hg.create.none': 0,
         'hg.create.repository': 1
     }
 
     permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     permission_name = Column("permission_name", String(255), nullable=True, unique=None, default=None)
     permission_longname = Column("permission_longname", String(255), nullable=True, unique=None, default=None)
 
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (
             self.__class__.__name__, self.permission_id, self.permission_name
         )
 
     @classmethod
     def get_by_key(cls, key):
         return cls.query().filter(cls.permission_name == key).scalar()
 
     @classmethod
     def get_default_repo_perms(cls, user_id, repo_id=None):
         q = Session().query(UserRepoToPerm, Repository, Permission)\
             .join((Permission, UserRepoToPerm.permission_id == Permission.permission_id))\
             .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\
             .filter(UserRepoToPerm.user_id == user_id)
         if repo_id:
             q = q.filter(UserRepoToPerm.repository_id == repo_id)
         return q.all()
 
     @classmethod
     def get_default_repo_branch_perms(cls, user_id, repo_id=None):
         q = Session().query(UserToRepoBranchPermission, UserRepoToPerm, Permission) \
             .join(
                 Permission,
                 UserToRepoBranchPermission.permission_id == Permission.permission_id) \
             .join(
                 UserRepoToPerm,
                 UserToRepoBranchPermission.rule_to_perm_id == UserRepoToPerm.repo_to_perm_id) \
             .filter(UserRepoToPerm.user_id == user_id)
 
         if repo_id:
             q = q.filter(UserToRepoBranchPermission.repository_id == repo_id)
         return q.order_by(UserToRepoBranchPermission.rule_order).all()
 
     @classmethod
     def get_default_repo_perms_from_user_group(cls, user_id, repo_id=None):
         q = Session().query(UserGroupRepoToPerm, Repository, Permission)\
             .join(
                 Permission,
                 UserGroupRepoToPerm.permission_id == Permission.permission_id)\
             .join(
                 Repository,
                 UserGroupRepoToPerm.repository_id == Repository.repo_id)\
             .join(
                 UserGroup,
                 UserGroupRepoToPerm.users_group_id ==
                 UserGroup.users_group_id)\
             .join(
                 UserGroupMember,
                 UserGroupRepoToPerm.users_group_id ==
                 UserGroupMember.users_group_id)\
             .filter(
                 UserGroupMember.user_id == user_id,
                 UserGroup.users_group_active == true())
         if repo_id:
             q = q.filter(UserGroupRepoToPerm.repository_id == repo_id)
         return q.all()
 
     @classmethod
     def get_default_repo_branch_perms_from_user_group(cls, user_id, repo_id=None):
         q = Session().query(UserGroupToRepoBranchPermission, UserGroupRepoToPerm, Permission) \
             .join(
                 Permission,
                 UserGroupToRepoBranchPermission.permission_id == Permission.permission_id) \
             .join(
                 UserGroupRepoToPerm,
                 UserGroupToRepoBranchPermission.rule_to_perm_id == UserGroupRepoToPerm.users_group_to_perm_id) \
             .join(
                 UserGroup,
                 UserGroupRepoToPerm.users_group_id == UserGroup.users_group_id) \
             .join(
                 UserGroupMember,
                 UserGroupRepoToPerm.users_group_id == UserGroupMember.users_group_id) \
             .filter(
                 UserGroupMember.user_id == user_id,
                 UserGroup.users_group_active == true())
 
         if repo_id:
             q = q.filter(UserGroupToRepoBranchPermission.repository_id == repo_id)
         return q.order_by(UserGroupToRepoBranchPermission.rule_order).all()
 
     @classmethod
     def get_default_group_perms(cls, user_id, repo_group_id=None):
         q = Session().query(UserRepoGroupToPerm, RepoGroup, Permission)\
             .join(
                 Permission,
                 UserRepoGroupToPerm.permission_id == Permission.permission_id)\
             .join(
                 RepoGroup,
                 UserRepoGroupToPerm.group_id == RepoGroup.group_id)\
             .filter(UserRepoGroupToPerm.user_id == user_id)
         if repo_group_id:
             q = q.filter(UserRepoGroupToPerm.group_id == repo_group_id)
         return q.all()
 
     @classmethod
     def get_default_group_perms_from_user_group(
             cls, user_id, repo_group_id=None):
         q = Session().query(UserGroupRepoGroupToPerm, RepoGroup, Permission)\
             .join(
                 Permission,
                 UserGroupRepoGroupToPerm.permission_id ==
                 Permission.permission_id)\
             .join(
                 RepoGroup,
                 UserGroupRepoGroupToPerm.group_id == RepoGroup.group_id)\
             .join(
                 UserGroup,
                 UserGroupRepoGroupToPerm.users_group_id ==
                 UserGroup.users_group_id)\
             .join(
                 UserGroupMember,
                 UserGroupRepoGroupToPerm.users_group_id ==
                 UserGroupMember.users_group_id)\
             .filter(
                 UserGroupMember.user_id == user_id,
                 UserGroup.users_group_active == true())
         if repo_group_id:
             q = q.filter(UserGroupRepoGroupToPerm.group_id == repo_group_id)
         return q.all()
 
     @classmethod
     def get_default_user_group_perms(cls, user_id, user_group_id=None):
         q = Session().query(UserUserGroupToPerm, UserGroup, Permission)\
             .join((Permission, UserUserGroupToPerm.permission_id == Permission.permission_id))\
             .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\
             .filter(UserUserGroupToPerm.user_id == user_id)
         if user_group_id:
             q = q.filter(UserUserGroupToPerm.user_group_id == user_group_id)
         return q.all()
 
     @classmethod
     def get_default_user_group_perms_from_user_group(
             cls, user_id, user_group_id=None):
         TargetUserGroup = aliased(UserGroup, name='target_user_group')
         q = Session().query(UserGroupUserGroupToPerm, UserGroup, Permission)\
             .join(
                 Permission,
                 UserGroupUserGroupToPerm.permission_id ==
                 Permission.permission_id)\
             .join(
                 TargetUserGroup,
                 UserGroupUserGroupToPerm.target_user_group_id ==
                 TargetUserGroup.users_group_id)\
             .join(
                 UserGroup,
                 UserGroupUserGroupToPerm.user_group_id ==
                 UserGroup.users_group_id)\
             .join(
                 UserGroupMember,
                 UserGroupUserGroupToPerm.user_group_id ==
                 UserGroupMember.users_group_id)\
             .filter(
                 UserGroupMember.user_id == user_id,
                 UserGroup.users_group_active == true())
         if user_group_id:
             q = q.filter(
                 UserGroupUserGroupToPerm.user_group_id == user_group_id)
 
         return q.all()
 
 
 class UserRepoToPerm(Base, BaseModel):
     __tablename__ = 'repo_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'repository_id', 'permission_id'),
         base_table_args
     )
 
     repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     repository = relationship('Repository')
     permission = relationship('Permission')
 
     branch_perm_entry = relationship('UserToRepoBranchPermission', cascade="all, delete-orphan", lazy='joined')
 
     @classmethod
     def create(cls, user, repository, permission):
         n = cls()
         n.user = user
         n.repository = repository
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<%s => %s >' % (self.user, self.repository)
 
 
 class UserUserGroupToPerm(Base, BaseModel):
     __tablename__ = 'user_user_group_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'user_group_id', 'permission_id'),
         base_table_args
     )
 
     user_user_group_to_perm_id = Column("user_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     user_group = relationship('UserGroup')
     permission = relationship('Permission')
 
     @classmethod
     def create(cls, user, user_group, permission):
         n = cls()
         n.user = user
         n.user_group = user_group
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<%s => %s >' % (self.user, self.user_group)
 
 
 class UserToPerm(Base, BaseModel):
     __tablename__ = 'user_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'permission_id'),
         base_table_args
     )
 
     user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     permission = relationship('Permission', lazy='joined')
 
     def __unicode__(self):
         return u'<%s => %s >' % (self.user, self.permission)
 
 
 class UserGroupRepoToPerm(Base, BaseModel):
     __tablename__ = 'users_group_repo_to_perm'
     __table_args__ = (
         UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
         base_table_args
     )
 
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
 
     users_group = relationship('UserGroup')
     permission = relationship('Permission')
     repository = relationship('Repository')
     user_group_branch_perms = relationship('UserGroupToRepoBranchPermission', cascade='all')
 
     @classmethod
     def create(cls, users_group, repository, permission):
         n = cls()
         n.users_group = users_group
         n.repository = repository
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<UserGroupRepoToPerm:%s => %s >' % (self.users_group, self.repository)
 
 
 class UserGroupUserGroupToPerm(Base, BaseModel):
     __tablename__ = 'user_group_user_group_to_perm'
     __table_args__ = (
         UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
         CheckConstraint('target_user_group_id != user_group_id'),
         base_table_args
     )
 
     user_group_user_group_to_perm_id = Column("user_group_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     target_user_group_id = Column("target_user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
 
     target_user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id')
     user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.user_group_id==UserGroup.users_group_id')
     permission = relationship('Permission')
 
     @classmethod
     def create(cls, target_user_group, user_group, permission):
         n = cls()
         n.target_user_group = target_user_group
         n.user_group = user_group
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<UserGroupUserGroup:%s => %s >' % (self.target_user_group, self.user_group)
 
 
 class UserGroupToPerm(Base, BaseModel):
     __tablename__ = 'users_group_to_perm'
     __table_args__ = (
         UniqueConstraint('users_group_id', 'permission_id',),
         base_table_args
     )
 
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     users_group = relationship('UserGroup')
     permission = relationship('Permission')
 
 
 class UserRepoGroupToPerm(Base, BaseModel):
     __tablename__ = 'user_repo_group_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'group_id', 'permission_id'),
         base_table_args
     )
 
     group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     group = relationship('RepoGroup')
     permission = relationship('Permission')
 
     @classmethod
     def create(cls, user, repository_group, permission):
         n = cls()
         n.user = user
         n.group = repository_group
         n.permission = permission
         Session().add(n)
         return n
 
 
 class UserGroupRepoGroupToPerm(Base, BaseModel):
     __tablename__ = 'users_group_repo_group_to_perm'
     __table_args__ = (
         UniqueConstraint('users_group_id', 'group_id'),
         base_table_args
     )
 
     users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     users_group = relationship('UserGroup')
     permission = relationship('Permission')
     group = relationship('RepoGroup')
 
     @classmethod
     def create(cls, user_group, repository_group, permission):
         n = cls()
         n.users_group = user_group
         n.group = repository_group
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<UserGroupRepoGroupToPerm:%s => %s >' % (self.users_group, self.group)
 
 
 class Statistics(Base, BaseModel):
     __tablename__ = 'statistics'
     __table_args__ = (
          base_table_args
     )
 
     stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
     stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
     commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data
     commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data
     languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data
 
     repository = relationship('Repository', single_parent=True)
 
 
 class UserFollowing(Base, BaseModel):
     __tablename__ = 'user_followings'
     __table_args__ = (
         UniqueConstraint('user_id', 'follows_repository_id'),
         UniqueConstraint('user_id', 'follows_user_id'),
         base_table_args
     )
 
     user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)
     follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
 
     user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id')
 
     follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
     follows_repository = relationship('Repository', order_by='Repository.repo_name')
 
     @classmethod
     def get_repo_followers(cls, repo_id):
         return cls.query().filter(cls.follows_repo_id == repo_id)
 
 
 class CacheKey(Base, BaseModel):
     __tablename__ = 'cache_invalidation'
     __table_args__ = (
         UniqueConstraint('cache_key'),
         Index('key_idx', 'cache_key'),
         base_table_args,
     )
 
     CACHE_TYPE_FEED = 'FEED'
 
     # namespaces used to register process/thread aware caches
     REPO_INVALIDATION_NAMESPACE = 'repo_cache:{repo_id}'
     SETTINGS_INVALIDATION_NAMESPACE = 'system_settings'
 
     cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     cache_key = Column("cache_key", String(255), nullable=True, unique=None, default=None)
     cache_args = Column("cache_args", String(255), nullable=True, unique=None, default=None)
     cache_state_uid = Column("cache_state_uid", String(255), nullable=True, unique=None, default=None)
     cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)
 
     def __init__(self, cache_key, cache_args='', cache_state_uid=None):
         self.cache_key = cache_key
         self.cache_args = cache_args
         self.cache_active = False
         # first key should be same for all entries, since all workers should share it
         self.cache_state_uid = cache_state_uid or self.generate_new_state_uid()
 
     def __unicode__(self):
         return u"<%s('%s:%s[%s]')>" % (
             self.__class__.__name__,
             self.cache_id, self.cache_key, self.cache_active)
 
     def _cache_key_partition(self):
         prefix, repo_name, suffix = self.cache_key.partition(self.cache_args)
         return prefix, repo_name, suffix
 
     def get_prefix(self):
         """
         Try to extract prefix from existing cache key. The key could consist
         of prefix, repo_name, suffix
         """
         # this returns prefix, repo_name, suffix
         return self._cache_key_partition()[0]
 
     def get_suffix(self):
         """
         get suffix that might have been used in _get_cache_key to
         generate self.cache_key. Only used for informational purposes
         in repo_edit.mako.
         """
         # prefix, repo_name, suffix
         return self._cache_key_partition()[2]
 
     @classmethod
     def generate_new_state_uid(cls, based_on=None):
         if based_on:
             return str(uuid.uuid5(uuid.NAMESPACE_URL, safe_str(based_on)))
         else:
             return str(uuid.uuid4())
 
     @classmethod
     def delete_all_cache(cls):
         """
         Delete all cache keys from database.
         Should only be run when all instances are down and all entries
         thus stale.
         """
         cls.query().delete()
         Session().commit()
 
     @classmethod
     def set_invalidate(cls, cache_uid, delete=False):
         """
         Mark all caches of a repo as invalid in the database.
         """
 
         try:
             qry = Session().query(cls).filter(cls.cache_args == cache_uid)
             if delete:
                 qry.delete()
                 log.debug('cache objects deleted for cache args %s',
                           safe_str(cache_uid))
             else:
                 qry.update({"cache_active": False,
                             "cache_state_uid": cls.generate_new_state_uid()})
                 log.debug('cache objects marked as invalid for cache args %s',
                           safe_str(cache_uid))
 
             Session().commit()
         except Exception:
             log.exception(
                 'Cache key invalidation failed for cache args %s',
                 safe_str(cache_uid))
             Session().rollback()
 
     @classmethod
     def get_active_cache(cls, cache_key):
         inv_obj = cls.query().filter(cls.cache_key == cache_key).scalar()
         if inv_obj:
             return inv_obj
         return None
 
     @classmethod
     def get_namespace_map(cls, namespace):
         return {
             x.cache_key: x
             for x in cls.query().filter(cls.cache_args == namespace)}
 
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
     __table_args__ = (
         Index('cc_revision_idx', 'revision'),
         base_table_args,
     )
 
     COMMENT_OUTDATED = u'comment_outdated'
     COMMENT_TYPE_NOTE = u'note'
     COMMENT_TYPE_TODO = u'todo'
     COMMENT_TYPES = [COMMENT_TYPE_NOTE, COMMENT_TYPE_TODO]
 
     OP_IMMUTABLE = u'immutable'
     OP_CHANGEABLE = u'changeable'
 
     comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True)
     repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
     revision = Column('revision', String(40), nullable=True)
     pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
     pull_request_version_id = Column("pull_request_version_id", Integer(), ForeignKey('pull_request_versions.pull_request_version_id'), nullable=True)
     line_no = Column('line_no', Unicode(10), nullable=True)
     hl_lines = Column('hl_lines', Unicode(512), nullable=True)
     f_path = Column('f_path', Unicode(1000), nullable=True)
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
     text = Column('text', UnicodeText().with_variant(UnicodeText(25000), 'mysql'), nullable=False)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     renderer = Column('renderer', Unicode(64), nullable=True)
     display_state = Column('display_state',  Unicode(128), nullable=True)
     immutable_state = Column('immutable_state', Unicode(128), nullable=True, default=OP_CHANGEABLE)
 
     comment_type = Column('comment_type',  Unicode(128), nullable=True, default=COMMENT_TYPE_NOTE)
     resolved_comment_id = Column('resolved_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'), nullable=True)
 
     resolved_comment = relationship('ChangesetComment', remote_side=comment_id, back_populates='resolved_by')
     resolved_by = relationship('ChangesetComment', back_populates='resolved_comment')
 
     author = relationship('User', lazy='joined')
     repo = relationship('Repository')
     status_change = relationship('ChangesetStatus', cascade="all, delete-orphan", lazy='joined')
     pull_request = relationship('PullRequest', lazy='joined')
     pull_request_version = relationship('PullRequestVersion')
 
     @classmethod
     def get_users(cls, revision=None, pull_request_id=None):
         """
         Returns user associated with this ChangesetComment. ie those
         who actually commented
 
         :param cls:
         :param revision:
         """
         q = Session().query(User)\
                 .join(ChangesetComment.author)
         if revision:
             q = q.filter(cls.revision == revision)
         elif pull_request_id:
             q = q.filter(cls.pull_request_id == pull_request_id)
         return q.all()
 
     @classmethod
     def get_index_from_version(cls, pr_version, versions):
         num_versions = [x.pull_request_version_id for x in versions]
         try:
             return num_versions.index(pr_version) +1
         except (IndexError, ValueError):
             return
 
     @property
     def outdated(self):
         return self.display_state == self.COMMENT_OUTDATED
 
     @property
     def immutable(self):
         return self.immutable_state == self.OP_IMMUTABLE
 
     def outdated_at_version(self, version):
         """
         Checks if comment is outdated for given pull request version
         """
         return self.outdated and self.pull_request_version_id != version
 
     def older_than_version(self, version):
         """
         Checks if comment is made from previous version than given
         """
         if version is None:
             return self.pull_request_version_id is not None
 
         return self.pull_request_version_id < version
 
     @property
     def resolved(self):
         return self.resolved_by[0] if self.resolved_by else None
 
     @property
     def is_todo(self):
         return self.comment_type == self.COMMENT_TYPE_TODO
 
     @property
     def is_inline(self):
         return self.line_no and self.f_path
 
     def get_index_version(self, versions):
         return self.get_index_from_version(
             self.pull_request_version_id, versions)
 
     def __repr__(self):
         if self.comment_id:
             return '<DB:Comment #%s>' % self.comment_id
         else:
             return '<DB:Comment at %#x>' % id(self)
 
     def get_api_data(self):
         comment = self
         data = {
             'comment_id': comment.comment_id,
             'comment_type': comment.comment_type,
             'comment_text': comment.text,
             'comment_status': comment.status_change,
             'comment_f_path': comment.f_path,
             'comment_lineno': comment.line_no,
             'comment_author': comment.author,
             'comment_created_on': comment.created_on,
             'comment_resolved_by': self.resolved,
             'comment_commit_id': comment.revision,
             'comment_pull_request_id': comment.pull_request_id,
         }
         return data
 
     def __json__(self):
         data = dict()
         data.update(self.get_api_data())
         return data
 
 
 class ChangesetStatus(Base, BaseModel):
     __tablename__ = 'changeset_statuses'
     __table_args__ = (
         Index('cs_revision_idx', 'revision'),
         Index('cs_version_idx', 'version'),
         UniqueConstraint('repo_id', 'revision', 'version'),
         base_table_args
     )
 
     STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'
     STATUS_APPROVED = 'approved'
     STATUS_REJECTED = 'rejected'
     STATUS_UNDER_REVIEW = 'under_review'
 
     STATUSES = [
         (STATUS_NOT_REVIEWED, _("Not Reviewed")),  # (no icon) and default
         (STATUS_APPROVED, _("Approved")),
         (STATUS_REJECTED, _("Rejected")),
         (STATUS_UNDER_REVIEW, _("Under Review")),
     ]
 
     changeset_status_id = Column('changeset_status_id', Integer(), nullable=False, primary_key=True)
     repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
     revision = Column('revision', String(40), nullable=False)
     status = Column('status', String(128), nullable=False, default=DEFAULT)
     changeset_comment_id = Column('changeset_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'))
     modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
     version = Column('version', Integer(), nullable=False, default=0)
     pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
 
     author = relationship('User', lazy='joined')
     repo = relationship('Repository')
     comment = relationship('ChangesetComment', lazy='joined')
     pull_request = relationship('PullRequest', lazy='joined')
 
     def __unicode__(self):
         return u"<%s('%s[v%s]:%s')>" % (
             self.__class__.__name__,
             self.status, self.version, self.author
         )
 
     @classmethod
     def get_status_lbl(cls, value):
         return dict(cls.STATUSES).get(value)
 
     @property
     def status_lbl(self):
         return ChangesetStatus.get_status_lbl(self.status)
 
     def get_api_data(self):
         status = self
         data = {
             'status_id': status.changeset_status_id,
             'status': status.status,
         }
         return data
 
     def __json__(self):
         data = dict()
         data.update(self.get_api_data())
         return data
 
 
 class _SetState(object):
     """
     Context processor allowing changing state for sensitive operation such as
     pull request update or merge
     """
 
     def __init__(self, pull_request, pr_state, back_state=None):
         self._pr = pull_request
         self._org_state = back_state or pull_request.pull_request_state
         self._pr_state = pr_state
         self._current_state = None
 
     def __enter__(self):
         log.debug('StateLock: entering set state context of pr %s, setting state to: `%s`',
                   self._pr, self._pr_state)
         self.set_pr_state(self._pr_state)
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if exc_val is not None:
             log.error(traceback.format_exc(exc_tb))
             return None
 
         self.set_pr_state(self._org_state)
         log.debug('StateLock: exiting set state context of pr %s, setting state to: `%s`',
                   self._pr, self._org_state)
 
     @property
     def state(self):
         return self._current_state
 
     def set_pr_state(self, pr_state):
         try:
             self._pr.pull_request_state = pr_state
             Session().add(self._pr)
             Session().commit()
             self._current_state = pr_state
         except Exception:
             log.exception('Failed to set PullRequest %s state to %s', self._pr, pr_state)
             raise
 
 
 class _PullRequestBase(BaseModel):
     """
     Common attributes of pull request and version entries.
     """
 
     # .status values
     STATUS_NEW = u'new'
     STATUS_OPEN = u'open'
     STATUS_CLOSED = u'closed'
 
     # available states
     STATE_CREATING = u'creating'
     STATE_UPDATING = u'updating'
     STATE_MERGING = u'merging'
     STATE_CREATED = u'created'
 
     title = Column('title', Unicode(255), nullable=True)
     description = Column(
         'description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'),
         nullable=True)
     description_renderer = Column('description_renderer', Unicode(64), nullable=True)
 
     # new/open/closed status of pull request (not approve/reject/etc)
     status = Column('status', Unicode(255), nullable=False, default=STATUS_NEW)
     created_on = Column(
         'created_on', DateTime(timezone=False), nullable=False,
         default=datetime.datetime.now)
     updated_on = Column(
         'updated_on', DateTime(timezone=False), nullable=False,
         default=datetime.datetime.now)
 
     pull_request_state = Column("pull_request_state", String(255), nullable=True)
 
     @declared_attr
     def user_id(cls):
         return Column(
             "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
             unique=None)
 
     # 500 revisions max
     _revisions = Column(
         'revisions', UnicodeText().with_variant(UnicodeText(20500), 'mysql'))
 
     common_ancestor_id = Column('common_ancestor_id', Unicode(255), nullable=True)
 
     @declared_attr
     def source_repo_id(cls):
         # TODO: dan: rename column to source_repo_id
         return Column(
             'org_repo_id', Integer(), ForeignKey('repositories.repo_id'),
             nullable=False)
 
     _source_ref = Column('org_ref', Unicode(255), nullable=False)
 
     @hybrid_property
     def source_ref(self):
         return self._source_ref
 
     @source_ref.setter
     def source_ref(self, val):
         parts = (val or '').split(':')
         if len(parts) != 3:
             raise ValueError(
                 'Invalid reference format given: {}, expected X:Y:Z'.format(val))
         self._source_ref = safe_unicode(val)
 
     _target_ref = Column('other_ref', Unicode(255), nullable=False)
 
     @hybrid_property
     def target_ref(self):
         return self._target_ref
 
     @target_ref.setter
     def target_ref(self, val):
         parts = (val or '').split(':')
         if len(parts) != 3:
             raise ValueError(
                 'Invalid reference format given: {}, expected X:Y:Z'.format(val))
         self._target_ref = safe_unicode(val)
 
     @declared_attr
     def target_repo_id(cls):
         # TODO: dan: rename column to target_repo_id
         return Column(
             'other_repo_id', Integer(), ForeignKey('repositories.repo_id'),
             nullable=False)
 
     _shadow_merge_ref = Column('shadow_merge_ref', Unicode(255), nullable=True)
 
     # TODO: dan: rename column to last_merge_source_rev
     _last_merge_source_rev = Column(
         'last_merge_org_rev', String(40), nullable=True)
     # TODO: dan: rename column to last_merge_target_rev
     _last_merge_target_rev = Column(
         'last_merge_other_rev', String(40), nullable=True)
     _last_merge_status = Column('merge_status', Integer(), nullable=True)
     last_merge_metadata = Column(
         'last_merge_metadata', MutationObj.as_mutable(
             JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
 
     merge_rev = Column('merge_rev', String(40), nullable=True)
 
     reviewer_data = Column(
         'reviewer_data_json', MutationObj.as_mutable(
             JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
 
     @property
     def reviewer_data_json(self):
         return json.dumps(self.reviewer_data)
 
     @property
     def work_in_progress(self):
         """checks if pull request is work in progress by checking the title"""
         title = self.title.upper()
         if re.match(r'^(\[WIP\]\s*|WIP:\s*|WIP\s+)', title):
             return True
         return False
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.description)
 
     @hybrid_property
     def revisions(self):
         return self._revisions.split(':') if self._revisions else []
 
     @revisions.setter
     def revisions(self, val):
         self._revisions = u':'.join(val)
 
     @hybrid_property
     def last_merge_status(self):
         return safe_int(self._last_merge_status)
 
     @last_merge_status.setter
     def last_merge_status(self, val):
         self._last_merge_status = val
 
     @declared_attr
     def author(cls):
         return relationship('User', lazy='joined')
 
     @declared_attr
     def source_repo(cls):
         return relationship(
             'Repository',
             primaryjoin='%s.source_repo_id==Repository.repo_id' % cls.__name__)
 
     @property
     def source_ref_parts(self):
         return self.unicode_to_reference(self.source_ref)
 
     @declared_attr
     def target_repo(cls):
         return relationship(
             'Repository',
             primaryjoin='%s.target_repo_id==Repository.repo_id' % cls.__name__)
 
     @property
     def target_ref_parts(self):
         return self.unicode_to_reference(self.target_ref)
 
     @property
     def shadow_merge_ref(self):
         return self.unicode_to_reference(self._shadow_merge_ref)
 
     @shadow_merge_ref.setter
     def shadow_merge_ref(self, ref):
         self._shadow_merge_ref = self.reference_to_unicode(ref)
 
     @staticmethod
     def unicode_to_reference(raw):
         """
         Convert a unicode (or string) to a reference object.
         If unicode evaluates to False it returns None.
         """
         if raw:
             refs = raw.split(':')
             return Reference(*refs)
         else:
             return None
 
     @staticmethod
     def reference_to_unicode(ref):
         """
         Convert a reference object to unicode.
         If reference is None it returns None.
         """
         if ref:
             return u':'.join(ref)
         else:
             return None
 
     def get_api_data(self, with_merge_state=True):
         from rhodecode.model.pull_request import PullRequestModel
 
         pull_request = self
         if with_merge_state:
             merge_response, merge_status, msg = \
                 PullRequestModel().merge_status(pull_request)
             merge_state = {
                 'status': merge_status,
                 'message': safe_unicode(msg),
             }
         else:
             merge_state = {'status': 'not_available',
                            'message': 'not_available'}
 
         merge_data = {
             'clone_url': PullRequestModel().get_shadow_clone_url(pull_request),
             'reference': (
                 pull_request.shadow_merge_ref._asdict()
                 if pull_request.shadow_merge_ref else None),
         }
 
         data = {
             'pull_request_id': pull_request.pull_request_id,
             'url': PullRequestModel().get_url(pull_request),
             'title': pull_request.title,
             'description': pull_request.description,
             'status': pull_request.status,
             'state': pull_request.pull_request_state,
             'created_on': pull_request.created_on,
             'updated_on': pull_request.updated_on,
             'commit_ids': pull_request.revisions,
             'review_status': pull_request.calculated_review_status(),
             'mergeable': merge_state,
             'source': {
                 'clone_url': pull_request.source_repo.clone_url(),
                 'repository': pull_request.source_repo.repo_name,
                 'reference': {
                     'name': pull_request.source_ref_parts.name,
                     'type': pull_request.source_ref_parts.type,
                     'commit_id': pull_request.source_ref_parts.commit_id,
                 },
             },
             'target': {
                 'clone_url': pull_request.target_repo.clone_url(),
                 'repository': pull_request.target_repo.repo_name,
                 'reference': {
                     'name': pull_request.target_ref_parts.name,
                     'type': pull_request.target_ref_parts.type,
                     'commit_id': pull_request.target_ref_parts.commit_id,
                 },
             },
             'merge': merge_data,
             'author': pull_request.author.get_api_data(include_secrets=False,
                                                        details='basic'),
             'reviewers': [
                 {
                     'user': reviewer.get_api_data(include_secrets=False,
                                                   details='basic'),
                     'reasons': reasons,
                     'review_status': st[0][1].status if st else 'not_reviewed',
                 }
                 for obj, reviewer, reasons, mandatory, st in
                 pull_request.reviewers_statuses()
             ]
         }
 
         return data
 
     def set_state(self, pull_request_state, final_state=None):
         """
         # goes from initial state to updating to initial state.
         # initial state can be changed by specifying back_state=
         with pull_request_obj.set_state(PullRequest.STATE_UPDATING):
            pull_request.merge()
 
         :param pull_request_state:
         :param final_state:
 
         """
 
         return _SetState(self, pull_request_state, back_state=final_state)
 
 
 class PullRequest(Base, _PullRequestBase):
     __tablename__ = 'pull_requests'
     __table_args__ = (
         base_table_args,
     )
 
     pull_request_id = Column(
         'pull_request_id', Integer(), nullable=False, primary_key=True)
 
     def __repr__(self):
         if self.pull_request_id:
             return '<DB:PullRequest #%s>' % self.pull_request_id
         else:
             return '<DB:PullRequest at %#x>' % id(self)
 
     reviewers = relationship('PullRequestReviewers', cascade="all, delete-orphan")
     statuses = relationship('ChangesetStatus', cascade="all, delete-orphan")
     comments = relationship('ChangesetComment', cascade="all, delete-orphan")
     versions = relationship('PullRequestVersion', cascade="all, delete-orphan",
                             lazy='dynamic')
 
     @classmethod
     def get_pr_display_object(cls, pull_request_obj, org_pull_request_obj,
                               internal_methods=None):
 
         class PullRequestDisplay(object):
             """
             Special object wrapper for showing PullRequest data via Versions
             It mimics PR object as close as possible. This is read only object
             just for display
             """
 
             def __init__(self, attrs, internal=None):
                 self.attrs = attrs
                 # internal have priority over the given ones via attrs
                 self.internal = internal or ['versions']
 
             def __getattr__(self, item):
                 if item in self.internal:
                     return getattr(self, item)
                 try:
                     return self.attrs[item]
                 except KeyError:
                     raise AttributeError(
                         '%s object has no attribute %s' % (self, item))
 
             def __repr__(self):
                 return '<DB:PullRequestDisplay #%s>' % self.attrs.get('pull_request_id')
 
             def versions(self):
                 return pull_request_obj.versions.order_by(
                     PullRequestVersion.pull_request_version_id).all()
 
             def is_closed(self):
                 return pull_request_obj.is_closed()
 
             def is_state_changing(self):
                 return pull_request_obj.is_state_changing()
 
             @property
             def pull_request_version_id(self):
                 return getattr(pull_request_obj, 'pull_request_version_id', None)
 
         attrs = StrictAttributeDict(pull_request_obj.get_api_data(with_merge_state=False))
 
         attrs.author = StrictAttributeDict(
             pull_request_obj.author.get_api_data())
         if pull_request_obj.target_repo:
             attrs.target_repo = StrictAttributeDict(
                 pull_request_obj.target_repo.get_api_data())
             attrs.target_repo.clone_url = pull_request_obj.target_repo.clone_url
 
         if pull_request_obj.source_repo:
             attrs.source_repo = StrictAttributeDict(
                 pull_request_obj.source_repo.get_api_data())
             attrs.source_repo.clone_url = pull_request_obj.source_repo.clone_url
 
         attrs.source_ref_parts = pull_request_obj.source_ref_parts
         attrs.target_ref_parts = pull_request_obj.target_ref_parts
         attrs.revisions = pull_request_obj.revisions
         attrs.common_ancestor_id = pull_request_obj.common_ancestor_id
         attrs.shadow_merge_ref = org_pull_request_obj.shadow_merge_ref
         attrs.reviewer_data = org_pull_request_obj.reviewer_data
         attrs.reviewer_data_json = org_pull_request_obj.reviewer_data_json
 
         return PullRequestDisplay(attrs, internal=internal_methods)
 
     def is_closed(self):
         return self.status == self.STATUS_CLOSED
 
     def is_state_changing(self):
         return self.pull_request_state != PullRequest.STATE_CREATED
 
     def __json__(self):
         return {
             'revisions': self.revisions,
             'versions': self.versions_count
         }
 
     def calculated_review_status(self):
         from rhodecode.model.changeset_status import ChangesetStatusModel
         return ChangesetStatusModel().calculated_review_status(self)
 
     def reviewers_statuses(self):
         from rhodecode.model.changeset_status import ChangesetStatusModel
         return ChangesetStatusModel().reviewers_statuses(self)
 
     @property
     def workspace_id(self):
         from rhodecode.model.pull_request import PullRequestModel
         return PullRequestModel()._workspace_id(self)
 
     def get_shadow_repo(self):
         workspace_id = self.workspace_id
         shadow_repository_path = self.target_repo.get_shadow_repository_path(workspace_id)
         if os.path.isdir(shadow_repository_path):
             vcs_obj = self.target_repo.scm_instance()
             return vcs_obj.get_shadow_instance(shadow_repository_path)
 
     @property
     def versions_count(self):
         """
         return number of versions this PR have, e.g a PR that once been
         updated will have 2 versions
         """
         return self.versions.count() + 1
 
 
 class PullRequestVersion(Base, _PullRequestBase):
     __tablename__ = 'pull_request_versions'
     __table_args__ = (
         base_table_args,
     )
 
     pull_request_version_id = Column(
         'pull_request_version_id', Integer(), nullable=False, primary_key=True)
     pull_request_id = Column(
         'pull_request_id', Integer(),
         ForeignKey('pull_requests.pull_request_id'), nullable=False)
     pull_request = relationship('PullRequest')
 
     def __repr__(self):
         if self.pull_request_version_id:
             return '<DB:PullRequestVersion #%s>' % self.pull_request_version_id
         else:
             return '<DB:PullRequestVersion at %#x>' % id(self)
 
     @property
     def reviewers(self):
         return self.pull_request.reviewers
 
     @property
     def versions(self):
         return self.pull_request.versions
 
     def is_closed(self):
         # calculate from original
         return self.pull_request.status == self.STATUS_CLOSED
 
     def is_state_changing(self):
         return self.pull_request.pull_request_state != PullRequest.STATE_CREATED
 
     def calculated_review_status(self):
         return self.pull_request.calculated_review_status()
 
     def reviewers_statuses(self):
         return self.pull_request.reviewers_statuses()
 
 
 class PullRequestReviewers(Base, BaseModel):
     __tablename__ = 'pull_request_reviewers'
     __table_args__ = (
         base_table_args,
     )
 
     @hybrid_property
     def reasons(self):
         if not self._reasons:
             return []
         return self._reasons
 
     @reasons.setter
     def reasons(self, val):
         val = val or []
         if any(not isinstance(x, compat.string_types) for x in val):
             raise Exception('invalid reasons type, must be list of strings')
         self._reasons = val
 
     pull_requests_reviewers_id = Column(
         'pull_requests_reviewers_id', Integer(), nullable=False,
         primary_key=True)
     pull_request_id = Column(
         "pull_request_id", Integer(),
         ForeignKey('pull_requests.pull_request_id'), nullable=False)
     user_id = Column(
         "user_id", Integer(), ForeignKey('users.user_id'), nullable=True)
     _reasons = Column(
         'reason', MutationList.as_mutable(
             JsonType('list', dialect_map=dict(mysql=UnicodeText(16384)))))
 
     mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
     user = relationship('User')
     pull_request = relationship('PullRequest')
 
     rule_data = Column(
         'rule_data_json',
         JsonType(dialect_map=dict(mysql=UnicodeText(16384))))
 
     def rule_user_group_data(self):
         """
         Returns the voting user group rule data for this reviewer
         """
 
         if self.rule_data and 'vote_rule' in self.rule_data:
             user_group_data = {}
             if 'rule_user_group_entry_id' in self.rule_data:
                 # means a group with voting rules !
                 user_group_data['id'] = self.rule_data['rule_user_group_entry_id']
                 user_group_data['name'] = self.rule_data['rule_name']
                 user_group_data['vote_rule'] = self.rule_data['vote_rule']
 
             return user_group_data
 
     def __unicode__(self):
         return u"<%s('id:%s')>" % (self.__class__.__name__,
                                    self.pull_requests_reviewers_id)
 
 
 class Notification(Base, BaseModel):
     __tablename__ = 'notifications'
     __table_args__ = (
         Index('notification_type_idx', 'type'),
         base_table_args,
     )
 
     TYPE_CHANGESET_COMMENT = u'cs_comment'
     TYPE_MESSAGE = u'message'
     TYPE_MENTION = u'mention'
     TYPE_REGISTRATION = u'registration'
     TYPE_PULL_REQUEST = u'pull_request'
     TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment'
     TYPE_PULL_REQUEST_UPDATE = u'pull_request_update'
 
     notification_id = Column('notification_id', Integer(), nullable=False, primary_key=True)
     subject = Column('subject', Unicode(512), nullable=True)
     body = Column('body', UnicodeText().with_variant(UnicodeText(50000), 'mysql'), nullable=True)
     created_by = Column("created_by", Integer(), ForeignKey('users.user_id'), nullable=True)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     type_ = Column('type', Unicode(255))
 
     created_by_user = relationship('User')
     notifications_to_users = relationship('UserNotification', lazy='joined',
                                           cascade="all, delete-orphan")
 
     @property
     def recipients(self):
         return [x.user for x in UserNotification.query()\
                 .filter(UserNotification.notification == self)\
                 .order_by(UserNotification.user_id.asc()).all()]
 
     @classmethod
     def create(cls, created_by, subject, body, recipients, type_=None):
         if type_ is None:
             type_ = Notification.TYPE_MESSAGE
 
         notification = cls()
         notification.created_by_user = created_by
         notification.subject = subject
         notification.body = body
         notification.type_ = type_
         notification.created_on = datetime.datetime.now()
 
         # For each recipient link the created notification to his account
         for u in recipients:
             assoc = UserNotification()
             assoc.user_id = u.user_id
             assoc.notification = notification
 
             # if created_by is inside recipients mark his notification
             # as read
             if u.user_id == created_by.user_id:
                 assoc.read = True
             Session().add(assoc)
 
         Session().add(notification)
 
         return notification
 
 
 class UserNotification(Base, BaseModel):
     __tablename__ = 'user_to_notification'
     __table_args__ = (
         UniqueConstraint('user_id', 'notification_id'),
         base_table_args
     )
 
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
     notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), primary_key=True)
     read = Column('read', Boolean, default=False)
     sent_on = Column('sent_on', DateTime(timezone=False), nullable=True, unique=None)
 
     user = relationship('User', lazy="joined")
     notification = relationship('Notification', lazy="joined",
                                 order_by=lambda: Notification.created_on.desc(),)
 
     def mark_as_read(self):
         self.read = True
         Session().add(self)
 
 
 class UserNotice(Base, BaseModel):
     __tablename__ = 'user_notices'
     __table_args__ = (
         base_table_args
     )
 
     NOTIFICATION_TYPE_MESSAGE = 'message'
     NOTIFICATION_TYPE_NOTICE = 'notice'
 
     NOTIFICATION_LEVEL_INFO = 'info'
     NOTIFICATION_LEVEL_WARNING = 'warning'
     NOTIFICATION_LEVEL_ERROR = 'error'
 
     user_notice_id = Column('gist_id', Integer(), primary_key=True)
 
     notice_subject = Column('notice_subject', Unicode(512), nullable=True)
     notice_body = Column('notice_body', UnicodeText().with_variant(UnicodeText(50000), 'mysql'), nullable=True)
 
     notice_read = Column('notice_read', Boolean, default=False)
 
     notification_level = Column('notification_level', String(1024), default=NOTIFICATION_LEVEL_INFO)
     notification_type = Column('notification_type', String(1024), default=NOTIFICATION_TYPE_NOTICE)
 
     notice_created_by = Column('notice_created_by', Integer(), ForeignKey('users.user_id'), nullable=True)
     notice_created_on = Column('notice_created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
 
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'))
     user = relationship('User', lazy="joined", primaryjoin='User.user_id==UserNotice.user_id')
 
     @classmethod
     def create_for_user(cls, user, subject, body, notice_level=NOTIFICATION_LEVEL_INFO, allow_duplicate=False):
 
         if notice_level not in [cls.NOTIFICATION_LEVEL_ERROR,
                                 cls.NOTIFICATION_LEVEL_WARNING,
                                 cls.NOTIFICATION_LEVEL_INFO]:
             return
 
         from rhodecode.model.user import UserModel
         user = UserModel().get_user(user)
 
         new_notice = UserNotice()
         if not allow_duplicate:
             existing_msg = UserNotice().query() \
                 .filter(UserNotice.user == user) \
                 .filter(UserNotice.notice_body == body) \
                 .filter(UserNotice.notice_read == false()) \
                 .scalar()
             if existing_msg:
                 log.warning('Ignoring duplicate notice for user %s', user)
                 return
 
         new_notice.user = user
         new_notice.notice_subject = subject
         new_notice.notice_body = body
         new_notice.notification_level = notice_level
         Session().add(new_notice)
         Session().commit()
 
 
 class Gist(Base, BaseModel):
     __tablename__ = 'gists'
     __table_args__ = (
         Index('g_gist_access_id_idx', 'gist_access_id'),
         Index('g_created_on_idx', 'created_on'),
         base_table_args
     )
 
     GIST_PUBLIC = u'public'
     GIST_PRIVATE = u'private'
     DEFAULT_FILENAME = u'gistfile1.txt'
 
     ACL_LEVEL_PUBLIC = u'acl_public'
     ACL_LEVEL_PRIVATE = u'acl_private'
 
     gist_id = Column('gist_id', Integer(), primary_key=True)
     gist_access_id = Column('gist_access_id', Unicode(250))
     gist_description = Column('gist_description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
     gist_owner = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True)
     gist_expires = Column('gist_expires', Float(53), nullable=False)
     gist_type = Column('gist_type', Unicode(128), nullable=False)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     acl_level = Column('acl_level', Unicode(128), nullable=True)
 
     owner = relationship('User')
 
     def __repr__(self):
         return '<Gist:[%s]%s>' % (self.gist_type, self.gist_access_id)
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.gist_description)
 
     @classmethod
     def get_or_404(cls, id_):
         from pyramid.httpexceptions import HTTPNotFound
 
         res = cls.query().filter(cls.gist_access_id == id_).scalar()
         if not res:
             raise HTTPNotFound()
         return res
 
     @classmethod
     def get_by_access_id(cls, gist_access_id):
         return cls.query().filter(cls.gist_access_id == gist_access_id).scalar()
 
     def gist_url(self):
         from rhodecode.model.gist import GistModel
         return GistModel().get_url(self)
 
     @classmethod
     def base_path(cls):
         """
         Returns base path when all gists are stored
 
         :param cls:
         """
         from rhodecode.model.gist import GIST_STORE_LOC
         q = Session().query(RhodeCodeUi)\
             .filter(RhodeCodeUi.ui_key == URL_SEP)
         q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return os.path.join(q.one().ui_value, GIST_STORE_LOC)
 
     def get_api_data(self):
         """
         Common function for generating gist related data for API
         """
         gist = self
         data = {
             'gist_id': gist.gist_id,
             'type': gist.gist_type,
             'access_id': gist.gist_access_id,
             'description': gist.gist_description,
             'url': gist.gist_url(),
             'expires': gist.gist_expires,
             'created_on': gist.created_on,
             'modified_at': gist.modified_at,
             'content': None,
             'acl_level': gist.acl_level,
         }
         return data
 
     def __json__(self):
         data = dict(
         )
         data.update(self.get_api_data())
         return data
     # SCM functions
 
     def scm_instance(self, **kwargs):
         """
         Get an instance of VCS Repository
 
         :param kwargs:
         """
         from rhodecode.model.gist import GistModel
         full_repo_path = os.path.join(self.base_path(), self.gist_access_id)
         return get_vcs_instance(
             repo_path=safe_str(full_repo_path), create=False,
             _vcs_alias=GistModel.vcs_backend)
 
 
 class ExternalIdentity(Base, BaseModel):
     __tablename__ = 'external_identities'
     __table_args__ = (
         Index('local_user_id_idx', 'local_user_id'),
         Index('external_id_idx', 'external_id'),
         base_table_args
     )
 
     external_id = Column('external_id', Unicode(255), default=u'', primary_key=True)
     external_username = Column('external_username', Unicode(1024), default=u'')
     local_user_id = Column('local_user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
     provider_name = Column('provider_name', Unicode(255), default=u'', primary_key=True)
     access_token = Column('access_token', String(1024), default=u'')
     alt_token = Column('alt_token', String(1024), default=u'')
     token_secret = Column('token_secret', String(1024), default=u'')
 
     @classmethod
     def by_external_id_and_provider(cls, external_id, provider_name, local_user_id=None):
         """
         Returns ExternalIdentity instance based on search params
 
         :param external_id:
         :param provider_name:
         :return: ExternalIdentity
         """
         query = cls.query()
         query = query.filter(cls.external_id == external_id)
         query = query.filter(cls.provider_name == provider_name)
         if local_user_id:
             query = query.filter(cls.local_user_id == local_user_id)
         return query.first()
 
     @classmethod
     def user_by_external_id_and_provider(cls, external_id, provider_name):
         """
         Returns User instance based on search params
 
         :param external_id:
         :param provider_name:
         :return: User
         """
         query = User.query()
         query = query.filter(cls.external_id == external_id)
         query = query.filter(cls.provider_name == provider_name)
         query = query.filter(User.user_id == cls.local_user_id)
         return query.first()
 
     @classmethod
     def by_local_user_id(cls, local_user_id):
         """
         Returns all tokens for user
 
         :param local_user_id:
         :return: ExternalIdentity
         """
         query = cls.query()
         query = query.filter(cls.local_user_id == local_user_id)
         return query
 
     @classmethod
     def load_provider_plugin(cls, plugin_id):
         from rhodecode.authentication.base import loadplugin
         _plugin_id = 'egg:rhodecode-enterprise-ee#{}'.format(plugin_id)
         auth_plugin = loadplugin(_plugin_id)
         return auth_plugin
 
 
 class Integration(Base, BaseModel):
     __tablename__ = 'integrations'
     __table_args__ = (
         base_table_args
     )
 
     integration_id = Column('integration_id', Integer(), primary_key=True)
     integration_type = Column('integration_type', String(255))
     enabled = Column('enabled', Boolean(), nullable=False)
     name = Column('name', String(255), nullable=False)
     child_repos_only = Column('child_repos_only', Boolean(), nullable=False,
         default=False)
 
     settings = Column(
         'settings_json', MutationObj.as_mutable(
             JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
     repo_id = Column(
         'repo_id', Integer(), ForeignKey('repositories.repo_id'),
         nullable=True, unique=None, default=None)
     repo = relationship('Repository', lazy='joined')
 
     repo_group_id = Column(
         'repo_group_id', Integer(), ForeignKey('groups.group_id'),
         nullable=True, unique=None, default=None)
     repo_group = relationship('RepoGroup', lazy='joined')
 
     @property
     def scope(self):
         if self.repo:
             return repr(self.repo)
         if self.repo_group:
             if self.child_repos_only:
                 return repr(self.repo_group) + ' (child repos only)'
             else:
                 return repr(self.repo_group) + ' (recursive)'
         if self.child_repos_only:
             return 'root_repos'
         return 'global'
 
     def __repr__(self):
         return '<Integration(%r, %r)>' % (self.integration_type, self.scope)
 
 
 class RepoReviewRuleUser(Base, BaseModel):
     __tablename__ = 'repo_review_rules_users'
     __table_args__ = (
         base_table_args
     )
 
     repo_review_rule_user_id = Column('repo_review_rule_user_id', Integer(), primary_key=True)
     repo_review_rule_id = Column("repo_review_rule_id", Integer(), ForeignKey('repo_review_rules.repo_review_rule_id'))
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False)
     mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
     user = relationship('User')
 
     def rule_data(self):
         return {
             'mandatory': self.mandatory
         }
 
 
 class RepoReviewRuleUserGroup(Base, BaseModel):
     __tablename__ = 'repo_review_rules_users_groups'
     __table_args__ = (
         base_table_args
     )
 
     VOTE_RULE_ALL = -1
 
     repo_review_rule_users_group_id = Column('repo_review_rule_users_group_id', Integer(), primary_key=True)
     repo_review_rule_id = Column("repo_review_rule_id", Integer(), ForeignKey('repo_review_rules.repo_review_rule_id'))
     users_group_id = Column("users_group_id", Integer(),ForeignKey('users_groups.users_group_id'), nullable=False)
     mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
     vote_rule = Column("vote_rule", Integer(), nullable=True, default=VOTE_RULE_ALL)
     users_group = relationship('UserGroup')
 
     def rule_data(self):
         return {
             'mandatory': self.mandatory,
             'vote_rule': self.vote_rule
         }
 
     @property
     def vote_rule_label(self):
         if not self.vote_rule or self.vote_rule == self.VOTE_RULE_ALL:
             return 'all must vote'
         else:
             return 'min. vote {}'.format(self.vote_rule)
 
 
 class RepoReviewRule(Base, BaseModel):
     __tablename__ = 'repo_review_rules'
     __table_args__ = (
         base_table_args
     )
 
     repo_review_rule_id = Column(
         'repo_review_rule_id', Integer(), primary_key=True)
     repo_id = Column(
         "repo_id", Integer(), ForeignKey('repositories.repo_id'))
     repo = relationship('Repository', backref='review_rules')
 
     review_rule_name = Column('review_rule_name', String(255))
     _branch_pattern = Column("branch_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'), default=u'*')  # glob
     _target_branch_pattern = Column("target_branch_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'), default=u'*')  # glob
     _file_pattern = Column("file_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'), default=u'*')  # glob
 
     use_authors_for_review = Column("use_authors_for_review", Boolean(), nullable=False, default=False)
     forbid_author_to_review = Column("forbid_author_to_review", Boolean(), nullable=False, default=False)
     forbid_commit_author_to_review = Column("forbid_commit_author_to_review", Boolean(), nullable=False, default=False)
     forbid_adding_reviewers = Column("forbid_adding_reviewers", Boolean(), nullable=False, default=False)
 
     rule_users = relationship('RepoReviewRuleUser')
     rule_user_groups = relationship('RepoReviewRuleUserGroup')
 
     def _validate_pattern(self, value):
         re.compile('^' + glob2re(value) + '$')
 
     @hybrid_property
     def source_branch_pattern(self):
         return self._branch_pattern or '*'
 
     @source_branch_pattern.setter
     def source_branch_pattern(self, value):
         self._validate_pattern(value)
         self._branch_pattern = value or '*'
 
     @hybrid_property
     def target_branch_pattern(self):
         return self._target_branch_pattern or '*'
 
     @target_branch_pattern.setter
     def target_branch_pattern(self, value):
         self._validate_pattern(value)
         self._target_branch_pattern = value or '*'
 
     @hybrid_property
     def file_pattern(self):
         return self._file_pattern or '*'
 
     @file_pattern.setter
     def file_pattern(self, value):
         self._validate_pattern(value)
         self._file_pattern = value or '*'
 
     def matches(self, source_branch, target_branch, files_changed):
         """
         Check if this review rule matches a branch/files in a pull request
 
         :param source_branch: source branch name for the commit
         :param target_branch: target branch name for the commit
         :param files_changed: list of file paths changed in the pull request
         """
 
         source_branch = source_branch or ''
         target_branch = target_branch or ''
         files_changed = files_changed or []
 
         branch_matches = True
         if source_branch or target_branch:
             if self.source_branch_pattern == '*':
                 source_branch_match = True
             else:
                 if self.source_branch_pattern.startswith('re:'):
                     source_pattern = self.source_branch_pattern[3:]
                 else:
                     source_pattern = '^' + glob2re(self.source_branch_pattern) + '$'
                 source_branch_regex = re.compile(source_pattern)
                 source_branch_match = bool(source_branch_regex.search(source_branch))
             if self.target_branch_pattern == '*':
                 target_branch_match = True
             else:
                 if self.target_branch_pattern.startswith('re:'):
                     target_pattern = self.target_branch_pattern[3:]
                 else:
                     target_pattern = '^' + glob2re(self.target_branch_pattern) + '$'
                 target_branch_regex = re.compile(target_pattern)
                 target_branch_match = bool(target_branch_regex.search(target_branch))
 
             branch_matches = source_branch_match and target_branch_match
 
         files_matches = True
         if self.file_pattern != '*':
             files_matches = False
             if self.file_pattern.startswith('re:'):
                 file_pattern = self.file_pattern[3:]
             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
 
         return branch_matches and files_matches
 
     @property
     def review_users(self):
         """ Returns the users which this rule applies to """
 
         users = collections.OrderedDict()
 
         for rule_user in self.rule_users:
             if rule_user.user.active:
                 if rule_user.user not in users:
                     users[rule_user.user.username] = {
                         'user': rule_user.user,
                         'source': 'user',
                         'source_data': {},
                         'data': rule_user.rule_data()
                     }
 
         for rule_user_group in self.rule_user_groups:
             source_data = {
                 'user_group_id': rule_user_group.users_group.users_group_id,
                 'name': rule_user_group.users_group.users_group_name,
                 'members': len(rule_user_group.users_group.members)
             }
             for member in rule_user_group.users_group.members:
                 if member.user.active:
                     key = member.user.username
                     if key in users:
                         # skip this member as we have him already
                         # this prevents from override the "first" matched
                         # users with duplicates in multiple groups
                         continue
 
                     users[key] = {
                         'user': member.user,
                         'source': 'user_group',
                         'source_data': source_data,
                         'data': rule_user_group.rule_data()
                     }
 
         return users
 
     def user_group_vote_rule(self, user_id):
 
         rules = []
         if not self.rule_user_groups:
             return rules
 
         for user_group in self.rule_user_groups:
             user_group_members = [x.user_id for x in user_group.users_group.members]
             if user_id in user_group_members:
                 rules.append(user_group)
         return rules
 
     def __repr__(self):
         return '<RepoReviewerRule(id=%r, repo=%r)>' % (
             self.repo_review_rule_id, self.repo)
 
 
 class ScheduleEntry(Base, BaseModel):
     __tablename__ = 'schedule_entries'
     __table_args__ = (
         UniqueConstraint('schedule_name', name='s_schedule_name_idx'),
         UniqueConstraint('task_uid', name='s_task_uid_idx'),
         base_table_args,
     )
 
     schedule_types = ['crontab', 'timedelta', 'integer']
     schedule_entry_id = Column('schedule_entry_id', Integer(), primary_key=True)
 
     schedule_name = Column("schedule_name", String(255), nullable=False, unique=None, default=None)
     schedule_description = Column("schedule_description", String(10000), nullable=True, unique=None, default=None)
     schedule_enabled = Column("schedule_enabled", Boolean(), nullable=False, unique=None, default=True)
 
     _schedule_type = Column("schedule_type", String(255), nullable=False, unique=None, default=None)
     schedule_definition = Column('schedule_definition_json', MutationObj.as_mutable(JsonType(default=lambda: "", dialect_map=dict(mysql=LONGTEXT()))))
 
     schedule_last_run = Column('schedule_last_run', DateTime(timezone=False), nullable=True, unique=None, default=None)
     schedule_total_run_count = Column('schedule_total_run_count', Integer(), nullable=True, unique=None, default=0)
 
     # task
     task_uid = Column("task_uid", String(255), nullable=False, unique=None, default=None)
     task_dot_notation = Column("task_dot_notation", String(4096), nullable=False, unique=None, default=None)
     task_args = Column('task_args_json', MutationObj.as_mutable(JsonType(default=list, dialect_map=dict(mysql=LONGTEXT()))))
     task_kwargs = Column('task_kwargs_json', MutationObj.as_mutable(JsonType(default=dict, dialect_map=dict(mysql=LONGTEXT()))))
 
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     updated_on = Column('updated_on', DateTime(timezone=False), nullable=True, unique=None, default=None)
 
     @hybrid_property
     def schedule_type(self):
         return self._schedule_type
 
     @schedule_type.setter
     def schedule_type(self, val):
         if val not in self.schedule_types:
             raise ValueError('Value must be on of `{}` and got `{}`'.format(
                 val, self.schedule_type))
 
         self._schedule_type = val
 
     @classmethod
     def get_uid(cls, obj):
         args = obj.task_args
         kwargs = obj.task_kwargs
         if isinstance(args, JsonRaw):
             try:
                 args = json.loads(args)
             except ValueError:
                 args = tuple()
 
         if isinstance(kwargs, JsonRaw):
             try:
                 kwargs = json.loads(kwargs)
             except ValueError:
                 kwargs = dict()
 
         dot_notation = obj.task_dot_notation
         val = '.'.join(map(safe_str, [
             sorted(dot_notation), args, sorted(kwargs.items())]))
         return hashlib.sha1(val).hexdigest()
 
     @classmethod
     def get_by_schedule_name(cls, schedule_name):
         return cls.query().filter(cls.schedule_name == schedule_name).scalar()
 
     @classmethod
     def get_by_schedule_id(cls, schedule_id):
         return cls.query().filter(cls.schedule_entry_id == schedule_id).scalar()
 
     @property
     def task(self):
         return self.task_dot_notation
 
     @property
     def schedule(self):
         from rhodecode.lib.celerylib.utils import raw_2_schedule
         schedule = raw_2_schedule(self.schedule_definition, self.schedule_type)
         return schedule
 
     @property
     def args(self):
         try:
             return list(self.task_args or [])
         except ValueError:
             return list()
 
     @property
     def kwargs(self):
         try:
             return dict(self.task_kwargs or {})
         except ValueError:
             return dict()
 
     def _as_raw(self, val):
         if hasattr(val, 'de_coerce'):
             val = val.de_coerce()
             if val:
                 val = json.dumps(val)
 
         return val
 
     @property
     def schedule_definition_raw(self):
         return self._as_raw(self.schedule_definition)
 
     @property
     def args_raw(self):
         return self._as_raw(self.task_args)
 
     @property
     def kwargs_raw(self):
         return self._as_raw(self.task_kwargs)
 
     def __repr__(self):
         return '<DB:ScheduleEntry({}:{})>'.format(
             self.schedule_entry_id, self.schedule_name)
 
 
 @event.listens_for(ScheduleEntry, 'before_update')
 def update_task_uid(mapper, connection, target):
     target.task_uid = ScheduleEntry.get_uid(target)
 
 
 @event.listens_for(ScheduleEntry, 'before_insert')
 def set_task_uid(mapper, connection, target):
     target.task_uid = ScheduleEntry.get_uid(target)
 
 
 class _BaseBranchPerms(BaseModel):
     @classmethod
     def compute_hash(cls, value):
         return sha1_safe(value)
 
     @hybrid_property
     def branch_pattern(self):
         return self._branch_pattern or '*'
 
     @hybrid_property
     def branch_hash(self):
         return self._branch_hash
 
     def _validate_glob(self, value):
         re.compile('^' + glob2re(value) + '$')
 
     @branch_pattern.setter
     def branch_pattern(self, value):
         self._validate_glob(value)
         self._branch_pattern = value or '*'
         # set the Hash when setting the branch pattern
         self._branch_hash = self.compute_hash(self._branch_pattern)
 
     def matches(self, branch):
         """
         Check if this the branch matches entry
 
         :param branch: branch name for the commit
         """
 
         branch = branch or ''
 
         branch_matches = True
         if branch:
             branch_regex = re.compile('^' + glob2re(self.branch_pattern) + '$')
             branch_matches = bool(branch_regex.search(branch))
 
         return branch_matches
 
 
 class UserToRepoBranchPermission(Base, _BaseBranchPerms):
     __tablename__ = 'user_to_repo_branch_permissions'
     __table_args__ = (
         base_table_args
     )
 
     branch_rule_id = Column('branch_rule_id', Integer(), primary_key=True)
 
     repository_id = Column('repository_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
     repo = relationship('Repository', backref='user_branch_perms')
 
     permission_id = Column('permission_id', Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     permission = relationship('Permission')
 
     rule_to_perm_id = Column('rule_to_perm_id', Integer(), ForeignKey('repo_to_perm.repo_to_perm_id'), nullable=False, unique=None, default=None)
     user_repo_to_perm = relationship('UserRepoToPerm')
 
     rule_order = Column('rule_order', Integer(), nullable=False)
     _branch_pattern = Column('branch_pattern', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), default=u'*')  # glob
     _branch_hash = Column('branch_hash', UnicodeText().with_variant(UnicodeText(2048), 'mysql'))
 
     def __unicode__(self):
         return u'<UserBranchPermission(%s => %r)>' % (
             self.user_repo_to_perm, self.branch_pattern)
 
 
 class UserGroupToRepoBranchPermission(Base, _BaseBranchPerms):
     __tablename__ = 'user_group_to_repo_branch_permissions'
     __table_args__ = (
         base_table_args
     )
 
     branch_rule_id = Column('branch_rule_id', Integer(), primary_key=True)
 
     repository_id = Column('repository_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
     repo = relationship('Repository', backref='user_group_branch_perms')
 
     permission_id = Column('permission_id', Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     permission = relationship('Permission')
 
     rule_to_perm_id = Column('rule_to_perm_id', Integer(), ForeignKey('users_group_repo_to_perm.users_group_to_perm_id'), nullable=False, unique=None, default=None)
     user_group_repo_to_perm = relationship('UserGroupRepoToPerm')
 
     rule_order = Column('rule_order', Integer(), nullable=False)
     _branch_pattern = Column('branch_pattern', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), default=u'*')  # glob
     _branch_hash = Column('branch_hash', UnicodeText().with_variant(UnicodeText(2048), 'mysql'))
 
     def __unicode__(self):
         return u'<UserBranchPermission(%s => %r)>' % (
             self.user_group_repo_to_perm, self.branch_pattern)
 
 
 class UserBookmark(Base, BaseModel):
     __tablename__ = 'user_bookmarks'
     __table_args__ = (
         UniqueConstraint('user_id', 'bookmark_repo_id'),
         UniqueConstraint('user_id', 'bookmark_repo_group_id'),
         UniqueConstraint('user_id', 'bookmark_position'),
         base_table_args
     )
 
     user_bookmark_id = Column("user_bookmark_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     position = Column("bookmark_position", Integer(), nullable=False)
     title = Column("bookmark_title", String(255), nullable=True, unique=None, default=None)
     redirect_url = Column("bookmark_redirect_url", String(10240), nullable=True, unique=None, default=None)
     created_on = Column("created_on", DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
 
     bookmark_repo_id = Column("bookmark_repo_id", Integer(), ForeignKey("repositories.repo_id"), nullable=True, unique=None, default=None)
     bookmark_repo_group_id = Column("bookmark_repo_group_id", Integer(), ForeignKey("groups.group_id"), nullable=True, unique=None, default=None)
 
     user = relationship("User")
 
     repository = relationship("Repository")
     repository_group = relationship("RepoGroup")
 
     @classmethod
     def get_by_position_for_user(cls, position, user_id):
         return cls.query() \
             .filter(UserBookmark.user_id == user_id) \
             .filter(UserBookmark.position == position).scalar()
 
     @classmethod
     def get_bookmarks_for_user(cls, user_id, cache=True):
         bookmarks = cls.query() \
             .filter(UserBookmark.user_id == user_id) \
             .options(joinedload(UserBookmark.repository)) \
             .options(joinedload(UserBookmark.repository_group)) \
             .order_by(UserBookmark.position.asc())
 
         if cache:
             bookmarks = bookmarks.options(
                 FromCache("sql_cache_short", "get_user_{}_bookmarks".format(user_id))
             )
 
         return bookmarks.all()
 
     def __unicode__(self):
         return u'<UserBookmark(%s @ %r)>' % (self.position, self.redirect_url)
 
 
 class FileStore(Base, BaseModel):
     __tablename__ = 'file_store'
     __table_args__ = (
         base_table_args
     )
 
     file_store_id = Column('file_store_id', Integer(), primary_key=True)
     file_uid = Column('file_uid', String(1024), nullable=False)
     file_display_name = Column('file_display_name', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), nullable=True)
     file_description = Column('file_description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'), nullable=True)
     file_org_name = Column('file_org_name', UnicodeText().with_variant(UnicodeText(10240), 'mysql'), nullable=False)
 
     # sha256 hash
     file_hash = Column('file_hash', String(512), nullable=False)
     file_size = Column('file_size', BigInteger(), nullable=False)
 
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     accessed_on = Column('accessed_on', DateTime(timezone=False), nullable=True)
     accessed_count = Column('accessed_count', Integer(), default=0)
 
     enabled = Column('enabled', Boolean(), nullable=False, default=True)
 
     # if repo/repo_group reference is set, check for permissions
     check_acl = Column('check_acl', Boolean(), nullable=False, default=True)
 
     # hidden defines an attachment that should be hidden from showing in artifact listing
     hidden = Column('hidden', Boolean(), nullable=False, default=False)
 
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
     upload_user = relationship('User', lazy='joined', primaryjoin='User.user_id==FileStore.user_id')
 
     file_metadata = relationship('FileStoreMetadata', lazy='joined')
 
     # scope limited to user, which requester have access to
     scope_user_id = Column(
         'scope_user_id', Integer(), ForeignKey('users.user_id'),
         nullable=True, unique=None, default=None)
     user = relationship('User', lazy='joined', primaryjoin='User.user_id==FileStore.scope_user_id')
 
     # scope limited to user group, which requester have access to
     scope_user_group_id = Column(
         'scope_user_group_id', Integer(), ForeignKey('users_groups.users_group_id'),
         nullable=True, unique=None, default=None)
     user_group = relationship('UserGroup', lazy='joined')
 
     # scope limited to repo, which requester have access to
     scope_repo_id = Column(
         'scope_repo_id', Integer(), ForeignKey('repositories.repo_id'),
         nullable=True, unique=None, default=None)
     repo = relationship('Repository', lazy='joined')
 
     # scope limited to repo group, which requester have access to
     scope_repo_group_id = Column(
         'scope_repo_group_id', Integer(), ForeignKey('groups.group_id'),
         nullable=True, unique=None, default=None)
     repo_group = relationship('RepoGroup', lazy='joined')
 
     @classmethod
     def get_by_store_uid(cls, file_store_uid):
         return FileStore.query().filter(FileStore.file_uid == file_store_uid).scalar()
 
     @classmethod
     def create(cls, file_uid, filename, file_hash, file_size, file_display_name='',
                file_description='', enabled=True, hidden=False, check_acl=True,
                user_id=None, scope_user_id=None, scope_repo_id=None, scope_repo_group_id=None):
 
         store_entry = FileStore()
         store_entry.file_uid = file_uid
         store_entry.file_display_name = file_display_name
         store_entry.file_org_name = filename
         store_entry.file_size = file_size
         store_entry.file_hash = file_hash
         store_entry.file_description = file_description
 
         store_entry.check_acl = check_acl
         store_entry.enabled = enabled
         store_entry.hidden = hidden
 
         store_entry.user_id = user_id
         store_entry.scope_user_id = scope_user_id
         store_entry.scope_repo_id = scope_repo_id
         store_entry.scope_repo_group_id = scope_repo_group_id
 
         return store_entry
 
     @classmethod
     def store_metadata(cls, file_store_id, args, commit=True):
         file_store = FileStore.get(file_store_id)
         if file_store is None:
             return
 
         for section, key, value, value_type in args:
             has_key = FileStoreMetadata().query() \
                 .filter(FileStoreMetadata.file_store_id == file_store.file_store_id) \
                 .filter(FileStoreMetadata.file_store_meta_section == section) \
                 .filter(FileStoreMetadata.file_store_meta_key == key) \
                 .scalar()
             if has_key:
                 msg = 'key `{}` already defined under section `{}` for this file.'\
                     .format(key, section)
                 raise ArtifactMetadataDuplicate(msg, err_section=section, err_key=key)
 
             # NOTE(marcink): raises ArtifactMetadataBadValueType
             FileStoreMetadata.valid_value_type(value_type)
 
             meta_entry = FileStoreMetadata()
             meta_entry.file_store = file_store
             meta_entry.file_store_meta_section = section
             meta_entry.file_store_meta_key = key
             meta_entry.file_store_meta_value_type = value_type
             meta_entry.file_store_meta_value = value
 
             Session().add(meta_entry)
 
         try:
             if commit:
                 Session().commit()
         except IntegrityError:
             Session().rollback()
             raise ArtifactMetadataDuplicate('Duplicate section/key found for this file.')
 
     @classmethod
     def bump_access_counter(cls, file_uid, commit=True):
         FileStore().query()\
             .filter(FileStore.file_uid == file_uid)\
             .update({FileStore.accessed_count: (FileStore.accessed_count + 1),
                      FileStore.accessed_on: datetime.datetime.now()})
         if commit:
             Session().commit()
 
     def __json__(self):
         data = {
             'filename': self.file_display_name,
             'filename_org': self.file_org_name,
             'file_uid': self.file_uid,
             'description': self.file_description,
             'hidden': self.hidden,
             'size': self.file_size,
             'created_on': self.created_on,
             'uploaded_by': self.upload_user.get_api_data(details='basic'),
             'downloaded_times': self.accessed_count,
             'sha256': self.file_hash,
             'metadata': self.file_metadata,
         }
 
         return data
 
     def __repr__(self):
         return '<FileStore({})>'.format(self.file_store_id)
 
 
 class FileStoreMetadata(Base, BaseModel):
     __tablename__ = 'file_store_metadata'
     __table_args__ = (
         UniqueConstraint('file_store_id', 'file_store_meta_section_hash', 'file_store_meta_key_hash'),
         Index('file_store_meta_section_idx', 'file_store_meta_section', mysql_length=255),
         Index('file_store_meta_key_idx', 'file_store_meta_key', mysql_length=255),
         base_table_args
     )
     SETTINGS_TYPES = {
         'str': safe_str,
         'int': safe_int,
         'unicode': safe_unicode,
         'bool': str2bool,
         'list': functools.partial(aslist, sep=',')
     }
 
     file_store_meta_id = Column(
         "file_store_meta_id", Integer(), nullable=False, unique=True, default=None,
         primary_key=True)
     _file_store_meta_section = Column(
         "file_store_meta_section", UnicodeText().with_variant(UnicodeText(1024), 'mysql'),
         nullable=True, unique=None, default=None)
     _file_store_meta_section_hash = Column(
         "file_store_meta_section_hash", String(255),
         nullable=True, unique=None, default=None)
     _file_store_meta_key = Column(
         "file_store_meta_key", UnicodeText().with_variant(UnicodeText(1024), 'mysql'),
         nullable=True, unique=None, default=None)
     _file_store_meta_key_hash = Column(
         "file_store_meta_key_hash", String(255), nullable=True, unique=None, default=None)
     _file_store_meta_value = Column(
         "file_store_meta_value", UnicodeText().with_variant(UnicodeText(20480), 'mysql'),
         nullable=True, unique=None, default=None)
     _file_store_meta_value_type = Column(
         "file_store_meta_value_type", String(255), nullable=True, unique=None,
         default='unicode')
 
     file_store_id = Column(
         'file_store_id', Integer(), ForeignKey('file_store.file_store_id'),
         nullable=True, unique=None, default=None)
 
     file_store = relationship('FileStore', lazy='joined')
 
     @classmethod
     def valid_value_type(cls, value):
         if value.split('.')[0] not in cls.SETTINGS_TYPES:
             raise ArtifactMetadataBadValueType(
                 'value_type must be one of %s got %s' % (cls.SETTINGS_TYPES.keys(), value))
 
     @hybrid_property
     def file_store_meta_section(self):
         return self._file_store_meta_section
 
     @file_store_meta_section.setter
     def file_store_meta_section(self, value):
         self._file_store_meta_section = value
         self._file_store_meta_section_hash = _hash_key(value)
 
     @hybrid_property
     def file_store_meta_key(self):
         return self._file_store_meta_key
 
     @file_store_meta_key.setter
     def file_store_meta_key(self, value):
         self._file_store_meta_key = value
         self._file_store_meta_key_hash = _hash_key(value)
 
     @hybrid_property
     def file_store_meta_value(self):
         val = self._file_store_meta_value
 
         if self._file_store_meta_value_type:
             # e.g unicode.encrypted == unicode
             _type = self._file_store_meta_value_type.split('.')[0]
             # decode the encrypted value if it's encrypted field type
             if '.encrypted' in self._file_store_meta_value_type:
                 cipher = EncryptedTextValue()
                 val = safe_unicode(cipher.process_result_value(val, None))
             # do final type conversion
             converter = self.SETTINGS_TYPES.get(_type) or self.SETTINGS_TYPES['unicode']
             val = converter(val)
 
         return val
 
     @file_store_meta_value.setter
     def file_store_meta_value(self, val):
         val = safe_unicode(val)
         # encode the encrypted value
         if '.encrypted' in self.file_store_meta_value_type:
             cipher = EncryptedTextValue()
             val = safe_unicode(cipher.process_bind_param(val, None))
         self._file_store_meta_value = val
 
     @hybrid_property
     def file_store_meta_value_type(self):
         return self._file_store_meta_value_type
 
     @file_store_meta_value_type.setter
     def file_store_meta_value_type(self, val):
         # e.g unicode.encrypted
         self.valid_value_type(val)
         self._file_store_meta_value_type = val
 
     def __json__(self):
         data = {
             'artifact': self.file_store.file_uid,
             'section': self.file_store_meta_section,
             'key': self.file_store_meta_key,
             'value': self.file_store_meta_value,
         }
 
         return data
 
     def __repr__(self):
         return '<%s[%s]%s=>%s]>' % (self.__class__.__name__, self.file_store_meta_section,
                                     self.file_store_meta_key, self.file_store_meta_value)
 
 
 class DbMigrateVersion(Base, BaseModel):
     __tablename__ = 'db_migrate_version'
     __table_args__ = (
         base_table_args,
     )
 
     repository_id = Column('repository_id', String(250), primary_key=True)
     repository_path = Column('repository_path', Text)
     version = Column('version', Integer)
 
     @classmethod
     def set_version(cls, version):
         """
         Helper for forcing a different version, usually for debugging purposes via ishell.
         """
         ver = DbMigrateVersion.query().first()
         ver.version = version
         Session().commit()
 
 
 class DbSession(Base, BaseModel):
     __tablename__ = 'db_session'
     __table_args__ = (
         base_table_args,
     )
 
     def __repr__(self):
         return '<DB:DbSession({})>'.format(self.id)
 
     id = Column('id', Integer())
     namespace = Column('namespace', String(255), primary_key=True)
     accessed = Column('accessed', DateTime, nullable=False)
     created = Column('created', DateTime, nullable=False)
     data = Column('data', PickleType, nullable=False)

rhodecode/model/pull_request.py

@@ -1,2072 +1,2072 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
 """
 pull request model for RhodeCode
 """
 
 
 import json
 import logging
 import os
 
 import datetime
 import urllib
 import collections
 
 from pyramid import compat
 from pyramid.threadlocal import get_current_request
 
 from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.translation import lazy_ugettext
 from rhodecode.lib import helpers as h, hooks_utils, diffs
 from rhodecode.lib import audit_logger
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.hooks_daemon import prepare_callback_daemon
 from rhodecode.lib.markup_renderer import (
     DEFAULT_COMMENTS_RENDERER, RstTemplateRenderer)
 from rhodecode.lib.utils2 import (
     safe_unicode, safe_str, md5_safe, AttributeDict, safe_int,
     get_current_rhodecode_user)
 from rhodecode.lib.vcs.backends.base import (
     Reference, MergeResponse, MergeFailureReason, UpdateFailureReason,
     TargetRefMissing, SourceRefMissing)
 from rhodecode.lib.vcs.conf import settings as vcs_settings
 from rhodecode.lib.vcs.exceptions import (
     CommitDoesNotExistError, EmptyRepositoryError)
 from rhodecode.model import BaseModel
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.comment import CommentsModel
 from rhodecode.model.db import (
     or_, String, cast, PullRequest, PullRequestReviewers, ChangesetStatus,
     PullRequestVersion, ChangesetComment, Repository, RepoReviewRule, User)
 from rhodecode.model.meta import Session
 from rhodecode.model.notification import NotificationModel, \
     EmailNotificationModel
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.settings import VcsSettingsModel
 
 
 log = logging.getLogger(__name__)
 
 
 # Data structure to hold the response data when updating commits during a pull
 # request update.
 class UpdateResponse(object):
 
     def __init__(self, executed, reason, new, old, common_ancestor_id,
                  commit_changes, source_changed, target_changed):
 
         self.executed = executed
         self.reason = reason
         self.new = new
         self.old = old
         self.common_ancestor_id = common_ancestor_id
         self.changes = commit_changes
         self.source_changed = source_changed
         self.target_changed = target_changed
 
 
 def get_diff_info(
         source_repo, source_ref, target_repo, target_ref, get_authors=False,
         get_commit_authors=True):
     """
     Calculates detailed diff information for usage in preview of creation of a pull-request.
     This is also used for default reviewers logic
     """
 
     source_scm = source_repo.scm_instance()
     target_scm = target_repo.scm_instance()
 
     ancestor_id = target_scm.get_common_ancestor(target_ref, source_ref, source_scm)
     if not ancestor_id:
         raise ValueError(
             'cannot calculate diff info without a common ancestor. '
             'Make sure both repositories are related, and have a common forking commit.')
 
     # case here is that want a simple diff without incoming commits,
     # previewing what will be merged based only on commits in the source.
     log.debug('Using ancestor %s as source_ref instead of %s',
               ancestor_id, source_ref)
 
     # source of changes now is the common ancestor
     source_commit = source_scm.get_commit(commit_id=ancestor_id)
     # target commit becomes the source ref as it is the last commit
     # for diff generation this logic gives proper diff
     target_commit = source_scm.get_commit(commit_id=source_ref)
 
     vcs_diff = \
         source_scm.get_diff(commit1=source_commit, commit2=target_commit,
                             ignore_whitespace=False, context=3)
 
     diff_processor = diffs.DiffProcessor(
         vcs_diff, format='newdiff', diff_limit=None,
         file_limit=None, show_full_diff=True)
 
     _parsed = diff_processor.prepare()
 
     all_files = []
     all_files_changes = []
     changed_lines = {}
     stats = [0, 0]
     for f in _parsed:
         all_files.append(f['filename'])
         all_files_changes.append({
             'filename': f['filename'],
             'stats': f['stats']
         })
         stats[0] += f['stats']['added']
         stats[1] += f['stats']['deleted']
 
         changed_lines[f['filename']] = []
         if len(f['chunks']) < 2:
             continue
         # first line is "context" information
         for chunks in f['chunks'][1:]:
             for chunk in chunks['lines']:
                 if chunk['action'] not in ('del', 'mod'):
                     continue
                 changed_lines[f['filename']].append(chunk['old_lineno'])
 
     commit_authors = []
     user_counts = {}
     email_counts = {}
     author_counts = {}
     _commit_cache = {}
 
     commits = []
     if get_commit_authors:
         commits = target_scm.compare(
             target_ref, source_ref, source_scm, merge=True,
             pre_load=["author"])
 
         for commit in commits:
             user = User.get_from_cs_author(commit.author)
             if user and user not in commit_authors:
                 commit_authors.append(user)
 
     # lines
     if get_authors:
         target_commit = source_repo.get_commit(ancestor_id)
 
         for fname, lines in changed_lines.items():
             try:
                 node = target_commit.get_node(fname)
             except Exception:
                 continue
 
             if not isinstance(node, FileNode):
                 continue
 
             for annotation in node.annotate:
                 line_no, commit_id, get_commit_func, line_text = annotation
                 if line_no in lines:
                     if commit_id not in _commit_cache:
                         _commit_cache[commit_id] = get_commit_func()
                     commit = _commit_cache[commit_id]
                     author = commit.author
                     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
 
     return {
         'commits': commits,
         'files': all_files_changes,
         'stats': stats,
         'ancestor': ancestor_id,
         # original authors of modified files
         'original_authors': {
             'users': user_counts,
             'authors': author_counts,
             'emails': email_counts,
         },
         'commit_authors': commit_authors
     }
 
 
 class PullRequestModel(BaseModel):
 
     cls = PullRequest
 
     DIFF_CONTEXT = diffs.DEFAULT_CONTEXT
 
     UPDATE_STATUS_MESSAGES = {
         UpdateFailureReason.NONE: lazy_ugettext(
             'Pull request update successful.'),
         UpdateFailureReason.UNKNOWN: lazy_ugettext(
             'Pull request update failed because of an unknown error.'),
         UpdateFailureReason.NO_CHANGE: lazy_ugettext(
             'No update needed because the source and target have not changed.'),
         UpdateFailureReason.WRONG_REF_TYPE: lazy_ugettext(
             'Pull request cannot be updated because the reference type is '
             'not supported for an update. Only Branch, Tag or Bookmark is allowed.'),
         UpdateFailureReason.MISSING_TARGET_REF: lazy_ugettext(
             'This pull request cannot be updated because the target '
             'reference is missing.'),
         UpdateFailureReason.MISSING_SOURCE_REF: lazy_ugettext(
             'This pull request cannot be updated because the source '
             'reference is missing.'),
     }
     REF_TYPES = ['bookmark', 'book', 'tag', 'branch']
     UPDATABLE_REF_TYPES = ['bookmark', 'book', 'branch']
 
     def __get_pull_request(self, pull_request):
         return self._get_instance((
             PullRequest, PullRequestVersion), pull_request)
 
     def _check_perms(self, perms, pull_request, user, api=False):
         if not api:
             return h.HasRepoPermissionAny(*perms)(
                 user=user, repo_name=pull_request.target_repo.repo_name)
         else:
             return h.HasRepoPermissionAnyApi(*perms)(
                 user=user, repo_name=pull_request.target_repo.repo_name)
 
     def check_user_read(self, pull_request, user, api=False):
         _perms = ('repository.admin', 'repository.write', 'repository.read',)
         return self._check_perms(_perms, pull_request, user, api)
 
     def check_user_merge(self, pull_request, user, api=False):
         _perms = ('repository.admin', 'repository.write', 'hg.admin',)
         return self._check_perms(_perms, pull_request, user, api)
 
     def check_user_update(self, pull_request, user, api=False):
         owner = user.user_id == pull_request.user_id
         return self.check_user_merge(pull_request, user, api) or owner
 
     def check_user_delete(self, pull_request, user):
         owner = user.user_id == pull_request.user_id
         _perms = ('repository.admin',)
         return self._check_perms(_perms, pull_request, user) or owner
 
     def check_user_change_status(self, pull_request, user, api=False):
         reviewer = user.user_id in [x.user_id for x in
                                     pull_request.reviewers]
         return self.check_user_update(pull_request, user, api) or reviewer
 
     def check_user_comment(self, pull_request, user):
         owner = user.user_id == pull_request.user_id
         return self.check_user_read(pull_request, user) or owner
 
     def get(self, pull_request):
         return self.__get_pull_request(pull_request)
 
     def _prepare_get_all_query(self, repo_name, search_q=None, source=False,
                                statuses=None, opened_by=None, order_by=None,
                                order_dir='desc', only_created=False):
         repo = None
         if repo_name:
             repo = self._get_repo(repo_name)
 
         q = PullRequest.query()
 
         if search_q:
             like_expression = u'%{}%'.format(safe_unicode(search_q))
             q = q.join(User)
             q = q.filter(or_(
                 cast(PullRequest.pull_request_id, String).ilike(like_expression),
                 User.username.ilike(like_expression),
                 PullRequest.title.ilike(like_expression),
                 PullRequest.description.ilike(like_expression),
             ))
 
         # source or target
         if repo and source:
             q = q.filter(PullRequest.source_repo == repo)
         elif repo:
             q = q.filter(PullRequest.target_repo == repo)
 
         # closed,opened
         if statuses:
             q = q.filter(PullRequest.status.in_(statuses))
 
         # opened by filter
         if opened_by:
             q = q.filter(PullRequest.user_id.in_(opened_by))
 
         # only get those that are in "created" state
         if only_created:
             q = q.filter(PullRequest.pull_request_state == PullRequest.STATE_CREATED)
 
         if order_by:
             order_map = {
                 'name_raw': PullRequest.pull_request_id,
                 'id': PullRequest.pull_request_id,
                 'title': PullRequest.title,
                 'updated_on_raw': PullRequest.updated_on,
                 'target_repo': PullRequest.target_repo_id
             }
             if order_dir == 'asc':
                 q = q.order_by(order_map[order_by].asc())
             else:
                 q = q.order_by(order_map[order_by].desc())
 
         return q
 
     def count_all(self, repo_name, search_q=None, source=False, statuses=None,
                   opened_by=None):
         """
         Count the number of pull requests for a specific repository.
 
         :param repo_name: target or source repo
         :param search_q: filter by text
         :param source: boolean flag to specify if repo_name refers to source
         :param statuses: list of pull request statuses
         :param opened_by: author user of the pull request
         :returns: int number of pull requests
         """
         q = self._prepare_get_all_query(
             repo_name, search_q=search_q, source=source, statuses=statuses,
             opened_by=opened_by)
 
         return q.count()
 
     def get_all(self, repo_name, search_q=None, source=False, statuses=None,
                 opened_by=None, offset=0, length=None, order_by=None, order_dir='desc'):
         """
         Get all pull requests for a specific repository.
 
         :param repo_name: target or source repo
         :param search_q: filter by text
         :param source: boolean flag to specify if repo_name refers to source
         :param statuses: list of pull request statuses
         :param opened_by: author user of the pull request
         :param offset: pagination offset
         :param length: length of returned list
         :param order_by: order of the returned list
         :param order_dir: 'asc' or 'desc' ordering direction
         :returns: list of pull requests
         """
         q = self._prepare_get_all_query(
             repo_name, search_q=search_q, source=source, statuses=statuses,
             opened_by=opened_by, order_by=order_by, order_dir=order_dir)
 
         if length:
             pull_requests = q.limit(length).offset(offset).all()
         else:
             pull_requests = q.all()
 
         return pull_requests
 
     def count_awaiting_review(self, repo_name, search_q=None, source=False, statuses=None,
                               opened_by=None):
         """
         Count the number of pull requests for a specific repository that are
         awaiting review.
 
         :param repo_name: target or source repo
         :param search_q: filter by text
         :param source: boolean flag to specify if repo_name refers to source
         :param statuses: list of pull request statuses
         :param opened_by: author user of the pull request
         :returns: int number of pull requests
         """
         pull_requests = self.get_awaiting_review(
             repo_name, search_q=search_q, source=source, statuses=statuses, opened_by=opened_by)
 
         return len(pull_requests)
 
     def get_awaiting_review(self, repo_name, search_q=None, source=False, statuses=None,
                             opened_by=None, offset=0, length=None,
                             order_by=None, order_dir='desc'):
         """
         Get all pull requests for a specific repository that are awaiting
         review.
 
         :param repo_name: target or source repo
         :param search_q: filter by text
         :param source: boolean flag to specify if repo_name refers to source
         :param statuses: list of pull request statuses
         :param opened_by: author user of the pull request
         :param offset: pagination offset
         :param length: length of returned list
         :param order_by: order of the returned list
         :param order_dir: 'asc' or 'desc' ordering direction
         :returns: list of pull requests
         """
         pull_requests = self.get_all(
             repo_name, search_q=search_q, source=source, statuses=statuses,
             opened_by=opened_by, order_by=order_by, order_dir=order_dir)
 
         _filtered_pull_requests = []
         for pr in pull_requests:
             status = pr.calculated_review_status()
             if status in [ChangesetStatus.STATUS_NOT_REVIEWED,
                           ChangesetStatus.STATUS_UNDER_REVIEW]:
                 _filtered_pull_requests.append(pr)
         if length:
             return _filtered_pull_requests[offset:offset+length]
         else:
             return _filtered_pull_requests
 
     def count_awaiting_my_review(self, repo_name, search_q=None, source=False, statuses=None,
                                  opened_by=None, user_id=None):
         """
         Count the number of pull requests for a specific repository that are
         awaiting review from a specific user.
 
         :param repo_name: target or source repo
         :param search_q: filter by text
         :param source: boolean flag to specify if repo_name refers to source
         :param statuses: list of pull request statuses
         :param opened_by: author user of the pull request
         :param user_id: reviewer user of the pull request
         :returns: int number of pull requests
         """
         pull_requests = self.get_awaiting_my_review(
             repo_name, search_q=search_q, source=source, statuses=statuses,
             opened_by=opened_by, user_id=user_id)
 
         return len(pull_requests)
 
     def get_awaiting_my_review(self, repo_name, search_q=None, source=False, statuses=None,
                                opened_by=None, user_id=None, offset=0,
                                length=None, order_by=None, order_dir='desc'):
         """
         Get all pull requests for a specific repository that are awaiting
         review from a specific user.
 
         :param repo_name: target or source repo
         :param search_q: filter by text
         :param source: boolean flag to specify if repo_name refers to source
         :param statuses: list of pull request statuses
         :param opened_by: author user of the pull request
         :param user_id: reviewer user of the pull request
         :param offset: pagination offset
         :param length: length of returned list
         :param order_by: order of the returned list
         :param order_dir: 'asc' or 'desc' ordering direction
         :returns: list of pull requests
         """
         pull_requests = self.get_all(
             repo_name, search_q=search_q, source=source, statuses=statuses,
             opened_by=opened_by, order_by=order_by, order_dir=order_dir)
 
         _my = PullRequestModel().get_not_reviewed(user_id)
         my_participation = []
         for pr in pull_requests:
             if pr in _my:
                 my_participation.append(pr)
         _filtered_pull_requests = my_participation
         if length:
             return _filtered_pull_requests[offset:offset+length]
         else:
             return _filtered_pull_requests
 
     def get_not_reviewed(self, user_id):
         return [
             x.pull_request for x in PullRequestReviewers.query().filter(
                 PullRequestReviewers.user_id == user_id).all()
         ]
 
     def _prepare_participating_query(self, user_id=None, statuses=None, query='',
                                      order_by=None, order_dir='desc'):
         q = PullRequest.query()
         if user_id:
             reviewers_subquery = Session().query(
                 PullRequestReviewers.pull_request_id).filter(
                 PullRequestReviewers.user_id == user_id).subquery()
             user_filter = or_(
                 PullRequest.user_id == user_id,
                 PullRequest.pull_request_id.in_(reviewers_subquery)
             )
             q = PullRequest.query().filter(user_filter)
 
         # closed,opened
         if statuses:
             q = q.filter(PullRequest.status.in_(statuses))
 
         if query:
             like_expression = u'%{}%'.format(safe_unicode(query))
             q = q.join(User)
             q = q.filter(or_(
                 cast(PullRequest.pull_request_id, String).ilike(like_expression),
                 User.username.ilike(like_expression),
                 PullRequest.title.ilike(like_expression),
                 PullRequest.description.ilike(like_expression),
             ))
         if order_by:
             order_map = {
                 'name_raw': PullRequest.pull_request_id,
                 'title': PullRequest.title,
                 'updated_on_raw': PullRequest.updated_on,
                 'target_repo': PullRequest.target_repo_id
             }
             if order_dir == 'asc':
                 q = q.order_by(order_map[order_by].asc())
             else:
                 q = q.order_by(order_map[order_by].desc())
 
         return q
 
     def count_im_participating_in(self, user_id=None, statuses=None, query=''):
         q = self._prepare_participating_query(user_id, statuses=statuses, query=query)
         return q.count()
 
     def get_im_participating_in(
             self, user_id=None, statuses=None, query='', offset=0,
             length=None, order_by=None, order_dir='desc'):
         """
         Get all Pull requests that i'm participating in, or i have opened
         """
 
         q = self._prepare_participating_query(
             user_id, statuses=statuses, query=query, order_by=order_by,
             order_dir=order_dir)
 
         if length:
             pull_requests = q.limit(length).offset(offset).all()
         else:
             pull_requests = q.all()
 
         return pull_requests
 
     def get_versions(self, pull_request):
         """
         returns version of pull request sorted by ID descending
         """
         return PullRequestVersion.query()\
             .filter(PullRequestVersion.pull_request == pull_request)\
             .order_by(PullRequestVersion.pull_request_version_id.asc())\
             .all()
 
     def get_pr_version(self, pull_request_id, version=None):
         at_version = None
 
         if version and version == 'latest':
             pull_request_ver = PullRequest.get(pull_request_id)
             pull_request_obj = pull_request_ver
             _org_pull_request_obj = pull_request_obj
             at_version = 'latest'
         elif version:
             pull_request_ver = PullRequestVersion.get_or_404(version)
             pull_request_obj = pull_request_ver
             _org_pull_request_obj = pull_request_ver.pull_request
             at_version = pull_request_ver.pull_request_version_id
         else:
             _org_pull_request_obj = pull_request_obj = PullRequest.get_or_404(
                 pull_request_id)
 
         pull_request_display_obj = PullRequest.get_pr_display_object(
             pull_request_obj, _org_pull_request_obj)
 
         return _org_pull_request_obj, pull_request_obj, \
                pull_request_display_obj, at_version
 
     def create(self, created_by, source_repo, source_ref, target_repo,
                target_ref, revisions, reviewers, title, description=None,
                common_ancestor_id=None,
                description_renderer=None,
                reviewer_data=None, translator=None, auth_user=None):
         translator = translator or get_current_request().translate
 
         created_by_user = self._get_user(created_by)
         auth_user = auth_user or created_by_user.AuthUser()
         source_repo = self._get_repo(source_repo)
         target_repo = self._get_repo(target_repo)
 
         pull_request = PullRequest()
         pull_request.source_repo = source_repo
         pull_request.source_ref = source_ref
         pull_request.target_repo = target_repo
         pull_request.target_ref = target_ref
         pull_request.revisions = revisions
         pull_request.title = title
         pull_request.description = description
         pull_request.description_renderer = description_renderer
         pull_request.author = created_by_user
         pull_request.reviewer_data = reviewer_data
         pull_request.pull_request_state = pull_request.STATE_CREATING
         pull_request.common_ancestor_id = common_ancestor_id
 
         Session().add(pull_request)
         Session().flush()
 
         reviewer_ids = set()
         # members / reviewers
         for reviewer_object in reviewers:
             user_id, reasons, mandatory, rules = reviewer_object
             user = self._get_user(user_id)
 
             # skip duplicates
             if user.user_id in reviewer_ids:
                 continue
 
             reviewer_ids.add(user.user_id)
 
             reviewer = PullRequestReviewers()
             reviewer.user = user
             reviewer.pull_request = pull_request
             reviewer.reasons = reasons
             reviewer.mandatory = mandatory
 
             # NOTE(marcink): pick only first rule for now
             rule_id = list(rules)[0] if rules else None
             rule = RepoReviewRule.get(rule_id) if rule_id else None
             if rule:
                 review_group = rule.user_group_vote_rule(user_id)
                 # we check if this particular reviewer is member of a voting group
                 if review_group:
                     # NOTE(marcink):
                     # can be that user is member of more but we pick the first same,
                     # same as default reviewers algo
                     review_group = review_group[0]
 
                     rule_data = {
                         'rule_name':
                             rule.review_rule_name,
                         'rule_user_group_entry_id':
                             review_group.repo_review_rule_users_group_id,
                         'rule_user_group_name':
                             review_group.users_group.users_group_name,
                         'rule_user_group_members':
                             [x.user.username for x in review_group.users_group.members],
                         'rule_user_group_members_id':
                             [x.user.user_id for x in review_group.users_group.members],
                     }
                     # e.g {'vote_rule': -1, 'mandatory': True}
                     rule_data.update(review_group.rule_data())
 
                     reviewer.rule_data = rule_data
 
             Session().add(reviewer)
             Session().flush()
 
         # Set approval status to "Under Review" for all commits which are
         # part of this pull request.
         ChangesetStatusModel().set_status(
             repo=target_repo,
             status=ChangesetStatus.STATUS_UNDER_REVIEW,
             user=created_by_user,
             pull_request=pull_request
         )
         # we commit early at this point. This has to do with a fact
         # that before queries do some row-locking. And because of that
         # we need to commit and finish transaction before below validate call
         # that for large repos could be long resulting in long row locks
         Session().commit()
 
         # prepare workspace, and run initial merge simulation. Set state during that
         # operation
         pull_request = PullRequest.get(pull_request.pull_request_id)
 
         # set as merging, for merge simulation, and if finished to created so we mark
         # simulation is working fine
         with pull_request.set_state(PullRequest.STATE_MERGING,
                                     final_state=PullRequest.STATE_CREATED) as state_obj:
             MergeCheck.validate(
                 pull_request, auth_user=auth_user, translator=translator)
 
         self.notify_reviewers(pull_request, reviewer_ids)
         self.trigger_pull_request_hook(pull_request, created_by_user, 'create')
 
         creation_data = pull_request.get_api_data(with_merge_state=False)
         self._log_audit_action(
             'repo.pull_request.create', {'data': creation_data},
             auth_user, pull_request)
 
         return pull_request
 
     def trigger_pull_request_hook(self, pull_request, user, action, data=None):
         pull_request = self.__get_pull_request(pull_request)
         target_scm = pull_request.target_repo.scm_instance()
         if action == 'create':
             trigger_hook = hooks_utils.trigger_create_pull_request_hook
         elif action == 'merge':
             trigger_hook = hooks_utils.trigger_merge_pull_request_hook
         elif action == 'close':
             trigger_hook = hooks_utils.trigger_close_pull_request_hook
         elif action == 'review_status_change':
             trigger_hook = hooks_utils.trigger_review_pull_request_hook
         elif action == 'update':
             trigger_hook = hooks_utils.trigger_update_pull_request_hook
         elif action == 'comment':
             trigger_hook = hooks_utils.trigger_comment_pull_request_hook
         else:
             return
 
         log.debug('Handling pull_request %s trigger_pull_request_hook with action %s and hook: %s',
                   pull_request, action, trigger_hook)
         trigger_hook(
             username=user.username,
             repo_name=pull_request.target_repo.repo_name,
             repo_type=target_scm.alias,
             pull_request=pull_request,
             data=data)
 
     def _get_commit_ids(self, pull_request):
         """
         Return the commit ids of the merged pull request.
 
         This method is not dealing correctly yet with the lack of autoupdates
         nor with the implicit target updates.
         For example: if a commit in the source repo is already in the target it
         will be reported anyways.
         """
         merge_rev = pull_request.merge_rev
         if merge_rev is None:
             raise ValueError('This pull request was not merged yet')
 
         commit_ids = list(pull_request.revisions)
         if merge_rev not in commit_ids:
             commit_ids.append(merge_rev)
 
         return commit_ids
 
     def merge_repo(self, pull_request, user, extras):
         log.debug("Merging pull request %s", pull_request.pull_request_id)
         extras['user_agent'] = 'internal-merge'
         merge_state = self._merge_pull_request(pull_request, user, extras)
         if merge_state.executed:
             log.debug("Merge was successful, updating the pull request comments.")
             self._comment_and_close_pr(pull_request, user, merge_state)
 
             self._log_audit_action(
                 'repo.pull_request.merge',
                 {'merge_state': merge_state.__dict__},
                 user, pull_request)
 
         else:
             log.warn("Merge failed, not updating the pull request.")
         return merge_state
 
     def _merge_pull_request(self, pull_request, user, extras, merge_msg=None):
         target_vcs = pull_request.target_repo.scm_instance()
         source_vcs = pull_request.source_repo.scm_instance()
 
         message = safe_unicode(merge_msg or vcs_settings.MERGE_MESSAGE_TMPL).format(
             pr_id=pull_request.pull_request_id,
             pr_title=pull_request.title,
             source_repo=source_vcs.name,
             source_ref_name=pull_request.source_ref_parts.name,
             target_repo=target_vcs.name,
             target_ref_name=pull_request.target_ref_parts.name,
         )
 
         workspace_id = self._workspace_id(pull_request)
         repo_id = pull_request.target_repo.repo_id
         use_rebase = self._use_rebase_for_merging(pull_request)
         close_branch = self._close_branch_before_merging(pull_request)
         user_name = self._user_name_for_merging(pull_request, user)
 
         target_ref = self._refresh_reference(
             pull_request.target_ref_parts, target_vcs)
 
         callback_daemon, extras = prepare_callback_daemon(
             extras, protocol=vcs_settings.HOOKS_PROTOCOL,
             host=vcs_settings.HOOKS_HOST,
             use_direct_calls=vcs_settings.HOOKS_DIRECT_CALLS)
 
         with callback_daemon:
             # TODO: johbo: Implement a clean way to run a config_override
             # for a single call.
             target_vcs.config.set(
                 'rhodecode', 'RC_SCM_DATA', json.dumps(extras))
 
             merge_state = target_vcs.merge(
                 repo_id, workspace_id, target_ref, source_vcs,
                 pull_request.source_ref_parts,
                 user_name=user_name, user_email=user.email,
                 message=message, use_rebase=use_rebase,
                 close_branch=close_branch)
         return merge_state
 
     def _comment_and_close_pr(self, pull_request, user, merge_state, close_msg=None):
         pull_request.merge_rev = merge_state.merge_ref.commit_id
         pull_request.updated_on = datetime.datetime.now()
         close_msg = close_msg or 'Pull request merged and closed'
 
         CommentsModel().create(
             text=safe_unicode(close_msg),
             repo=pull_request.target_repo.repo_id,
             user=user.user_id,
             pull_request=pull_request.pull_request_id,
             f_path=None,
             line_no=None,
             closing_pr=True
         )
 
         Session().add(pull_request)
         Session().flush()
         # TODO: paris: replace invalidation with less radical solution
         ScmModel().mark_for_invalidation(
             pull_request.target_repo.repo_name)
         self.trigger_pull_request_hook(pull_request, user, 'merge')
 
     def has_valid_update_type(self, pull_request):
         source_ref_type = pull_request.source_ref_parts.type
         return source_ref_type in self.REF_TYPES
 
     def get_flow_commits(self, pull_request):
 
         # source repo
         source_ref_name = pull_request.source_ref_parts.name
         source_ref_type = pull_request.source_ref_parts.type
         source_ref_id = pull_request.source_ref_parts.commit_id
         source_repo = pull_request.source_repo.scm_instance()
 
         try:
             if source_ref_type in self.REF_TYPES:
                 source_commit = source_repo.get_commit(source_ref_name)
             else:
                 source_commit = source_repo.get_commit(source_ref_id)
         except CommitDoesNotExistError:
             raise SourceRefMissing()
 
         # target repo
         target_ref_name = pull_request.target_ref_parts.name
         target_ref_type = pull_request.target_ref_parts.type
         target_ref_id = pull_request.target_ref_parts.commit_id
         target_repo = pull_request.target_repo.scm_instance()
 
         try:
             if target_ref_type in self.REF_TYPES:
                 target_commit = target_repo.get_commit(target_ref_name)
             else:
                 target_commit = target_repo.get_commit(target_ref_id)
         except CommitDoesNotExistError:
             raise TargetRefMissing()
 
         return source_commit, target_commit
 
     def update_commits(self, pull_request, updating_user):
         """
         Get the updated list of commits for the pull request
         and return the new pull request version and the list
         of commits processed by this update action
 
         updating_user is the user_object who triggered the update
         """
         pull_request = self.__get_pull_request(pull_request)
         source_ref_type = pull_request.source_ref_parts.type
         source_ref_name = pull_request.source_ref_parts.name
         source_ref_id = pull_request.source_ref_parts.commit_id
 
         target_ref_type = pull_request.target_ref_parts.type
         target_ref_name = pull_request.target_ref_parts.name
         target_ref_id = pull_request.target_ref_parts.commit_id
 
         if not self.has_valid_update_type(pull_request):
             log.debug("Skipping update of pull request %s due to ref type: %s",
                       pull_request, source_ref_type)
             return UpdateResponse(
                 executed=False,
                 reason=UpdateFailureReason.WRONG_REF_TYPE,
                 old=pull_request, new=None, common_ancestor_id=None, commit_changes=None,
                 source_changed=False, target_changed=False)
 
         try:
             source_commit, target_commit = self.get_flow_commits(pull_request)
         except SourceRefMissing:
             return UpdateResponse(
                 executed=False,
                 reason=UpdateFailureReason.MISSING_SOURCE_REF,
                 old=pull_request, new=None, common_ancestor_id=None, commit_changes=None,
                 source_changed=False, target_changed=False)
         except TargetRefMissing:
             return UpdateResponse(
                 executed=False,
                 reason=UpdateFailureReason.MISSING_TARGET_REF,
                 old=pull_request, new=None, common_ancestor_id=None, commit_changes=None,
                 source_changed=False, target_changed=False)
 
         source_changed = source_ref_id != source_commit.raw_id
         target_changed = target_ref_id != target_commit.raw_id
 
         if not (source_changed or target_changed):
             log.debug("Nothing changed in pull request %s", pull_request)
             return UpdateResponse(
                 executed=False,
                 reason=UpdateFailureReason.NO_CHANGE,
                 old=pull_request, new=None, common_ancestor_id=None, commit_changes=None,
                 source_changed=target_changed, target_changed=source_changed)
 
         change_in_found = 'target repo' if target_changed else 'source repo'
         log.debug('Updating pull request because of change in %s detected',
                   change_in_found)
 
         # Finally there is a need for an update, in case of source change
         # we create a new version, else just an update
         if source_changed:
             pull_request_version = self._create_version_from_snapshot(pull_request)
             self._link_comments_to_version(pull_request_version)
         else:
             try:
                 ver = pull_request.versions[-1]
             except IndexError:
                 ver = None
 
             pull_request.pull_request_version_id = \
                 ver.pull_request_version_id if ver else None
             pull_request_version = pull_request
 
         source_repo = pull_request.source_repo.scm_instance()
         target_repo = pull_request.target_repo.scm_instance()
 
         # re-compute commit ids
         old_commit_ids = pull_request.revisions
         pre_load = ["author", "date", "message", "branch"]
         commit_ranges = target_repo.compare(
             target_commit.raw_id, source_commit.raw_id, source_repo, merge=True,
             pre_load=pre_load)
 
         target_ref = target_commit.raw_id
         source_ref = source_commit.raw_id
         ancestor_commit_id = target_repo.get_common_ancestor(
             target_ref, source_ref, source_repo)
 
         if not ancestor_commit_id:
             raise ValueError(
                 'cannot calculate diff info without a common ancestor. '
                 'Make sure both repositories are related, and have a common forking commit.')
 
         pull_request.common_ancestor_id = ancestor_commit_id
 
         pull_request.source_ref = '%s:%s:%s' % (
             source_ref_type, source_ref_name, source_commit.raw_id)
         pull_request.target_ref = '%s:%s:%s' % (
             target_ref_type, target_ref_name, ancestor_commit_id)
 
         pull_request.revisions = [
             commit.raw_id for commit in reversed(commit_ranges)]
         pull_request.updated_on = datetime.datetime.now()
         Session().add(pull_request)
         new_commit_ids = pull_request.revisions
 
         old_diff_data, new_diff_data = self._generate_update_diffs(
             pull_request, pull_request_version)
 
         # calculate commit and file changes
         commit_changes = self._calculate_commit_id_changes(
             old_commit_ids, new_commit_ids)
         file_changes = self._calculate_file_changes(
             old_diff_data, new_diff_data)
 
         # set comments as outdated if DIFFS changed
         CommentsModel().outdate_comments(
             pull_request, old_diff_data=old_diff_data,
             new_diff_data=new_diff_data)
 
         valid_commit_changes = (commit_changes.added or commit_changes.removed)
         file_node_changes = (
             file_changes.added or file_changes.modified or file_changes.removed)
         pr_has_changes = valid_commit_changes or file_node_changes
 
         # Add an automatic comment to the pull request, in case
         # anything has changed
         if pr_has_changes:
             update_comment = CommentsModel().create(
                 text=self._render_update_message(ancestor_commit_id, commit_changes, file_changes),
                 repo=pull_request.target_repo,
                 user=pull_request.author,
                 pull_request=pull_request,
                 send_email=False, renderer=DEFAULT_COMMENTS_RENDERER)
 
             # Update status to "Under Review" for added commits
             for commit_id in commit_changes.added:
                 ChangesetStatusModel().set_status(
                     repo=pull_request.source_repo,
                     status=ChangesetStatus.STATUS_UNDER_REVIEW,
                     comment=update_comment,
                     user=pull_request.author,
                     pull_request=pull_request,
                     revision=commit_id)
 
             # send update email to users
             try:
                 self.notify_users(pull_request=pull_request, updating_user=updating_user,
                                   ancestor_commit_id=ancestor_commit_id,
                                   commit_changes=commit_changes,
                                   file_changes=file_changes)
             except Exception:
                 log.exception('Failed to send email notification to users')
 
         log.debug(
             'Updated pull request %s, added_ids: %s, common_ids: %s, '
             'removed_ids: %s', pull_request.pull_request_id,
             commit_changes.added, commit_changes.common, commit_changes.removed)
         log.debug(
             'Updated pull request with the following file changes: %s',
             file_changes)
 
         log.info(
             "Updated pull request %s from commit %s to commit %s, "
             "stored new version %s of this pull request.",
             pull_request.pull_request_id, source_ref_id,
             pull_request.source_ref_parts.commit_id,
             pull_request_version.pull_request_version_id)
         Session().commit()
         self.trigger_pull_request_hook(pull_request, pull_request.author, 'update')
 
         return UpdateResponse(
             executed=True, reason=UpdateFailureReason.NONE,
             old=pull_request, new=pull_request_version,
             common_ancestor_id=ancestor_commit_id, commit_changes=commit_changes,
             source_changed=source_changed, target_changed=target_changed)
 
     def _create_version_from_snapshot(self, pull_request):
         version = PullRequestVersion()
         version.title = pull_request.title
         version.description = pull_request.description
         version.status = pull_request.status
         version.pull_request_state = pull_request.pull_request_state
         version.created_on = datetime.datetime.now()
         version.updated_on = pull_request.updated_on
         version.user_id = pull_request.user_id
         version.source_repo = pull_request.source_repo
         version.source_ref = pull_request.source_ref
         version.target_repo = pull_request.target_repo
         version.target_ref = pull_request.target_ref
 
         version._last_merge_source_rev = pull_request._last_merge_source_rev
         version._last_merge_target_rev = pull_request._last_merge_target_rev
         version.last_merge_status = pull_request.last_merge_status
         version.last_merge_metadata = pull_request.last_merge_metadata
         version.shadow_merge_ref = pull_request.shadow_merge_ref
         version.merge_rev = pull_request.merge_rev
         version.reviewer_data = pull_request.reviewer_data
 
         version.revisions = pull_request.revisions
         version.common_ancestor_id = pull_request.common_ancestor_id
         version.pull_request = pull_request
         Session().add(version)
         Session().flush()
 
         return version
 
     def _generate_update_diffs(self, pull_request, pull_request_version):
 
         diff_context = (
             self.DIFF_CONTEXT +
             CommentsModel.needed_extra_diff_context())
         hide_whitespace_changes = False
         source_repo = pull_request_version.source_repo
         source_ref_id = pull_request_version.source_ref_parts.commit_id
         target_ref_id = pull_request_version.target_ref_parts.commit_id
         old_diff = self._get_diff_from_pr_or_version(
             source_repo, source_ref_id, target_ref_id,
             hide_whitespace_changes=hide_whitespace_changes, diff_context=diff_context)
 
         source_repo = pull_request.source_repo
         source_ref_id = pull_request.source_ref_parts.commit_id
         target_ref_id = pull_request.target_ref_parts.commit_id
 
         new_diff = self._get_diff_from_pr_or_version(
             source_repo, source_ref_id, target_ref_id,
             hide_whitespace_changes=hide_whitespace_changes, diff_context=diff_context)
 
         old_diff_data = diffs.DiffProcessor(old_diff)
         old_diff_data.prepare()
         new_diff_data = diffs.DiffProcessor(new_diff)
         new_diff_data.prepare()
 
         return old_diff_data, new_diff_data
 
     def _link_comments_to_version(self, pull_request_version):
         """
         Link all unlinked comments of this pull request to the given version.
 
         :param pull_request_version: The `PullRequestVersion` to which
             the comments shall be linked.
 
         """
         pull_request = pull_request_version.pull_request
         comments = ChangesetComment.query()\
             .filter(
                 # TODO: johbo: Should we query for the repo at all here?
                 # Pending decision on how comments of PRs are to be related
                 # to either the source repo, the target repo or no repo at all.
                 ChangesetComment.repo_id == pull_request.target_repo.repo_id,
                 ChangesetComment.pull_request == pull_request,
                 ChangesetComment.pull_request_version == None)\
             .order_by(ChangesetComment.comment_id.asc())
 
         # TODO: johbo: Find out why this breaks if it is done in a bulk
         # operation.
         for comment in comments:
             comment.pull_request_version_id = (
                 pull_request_version.pull_request_version_id)
             Session().add(comment)
 
     def _calculate_commit_id_changes(self, old_ids, new_ids):
         added = [x for x in new_ids if x not in old_ids]
         common = [x for x in new_ids if x in old_ids]
         removed = [x for x in old_ids if x not in new_ids]
         total = new_ids
         return ChangeTuple(added, common, removed, total)
 
     def _calculate_file_changes(self, old_diff_data, new_diff_data):
 
         old_files = OrderedDict()
         for diff_data in old_diff_data.parsed_diff:
             old_files[diff_data['filename']] = md5_safe(diff_data['raw_diff'])
 
         added_files = []
         modified_files = []
         removed_files = []
         for diff_data in new_diff_data.parsed_diff:
             new_filename = diff_data['filename']
             new_hash = md5_safe(diff_data['raw_diff'])
 
             old_hash = old_files.get(new_filename)
             if not old_hash:
                 # file is not present in old diff, we have to figure out from parsed diff
                 # operation ADD/REMOVE
                 operations_dict = diff_data['stats']['ops']
                 if diffs.DEL_FILENODE in operations_dict:
                     removed_files.append(new_filename)
                 else:
                     added_files.append(new_filename)
             else:
                 if new_hash != old_hash:
                     modified_files.append(new_filename)
                 # now remove a file from old, since we have seen it already
                 del old_files[new_filename]
 
         # removed files is when there are present in old, but not in NEW,
         # since we remove old files that are present in new diff, left-overs
         # if any should be the removed files
         removed_files.extend(old_files.keys())
 
         return FileChangeTuple(added_files, modified_files, removed_files)
 
     def _render_update_message(self, ancestor_commit_id, changes, file_changes):
         """
         render the message using DEFAULT_COMMENTS_RENDERER (RST renderer),
         so it's always looking the same disregarding on which default
         renderer system is using.
 
         :param ancestor_commit_id: ancestor raw_id
         :param changes: changes named tuple
         :param file_changes: file changes named tuple
 
         """
         new_status = ChangesetStatus.get_status_lbl(
             ChangesetStatus.STATUS_UNDER_REVIEW)
 
         changed_files = (
             file_changes.added + file_changes.modified + file_changes.removed)
 
         params = {
             'under_review_label': new_status,
             'added_commits': changes.added,
             'removed_commits': changes.removed,
             'changed_files': changed_files,
             'added_files': file_changes.added,
             'modified_files': file_changes.modified,
             'removed_files': file_changes.removed,
             'ancestor_commit_id': ancestor_commit_id
         }
         renderer = RstTemplateRenderer()
         return renderer.render('pull_request_update.mako', **params)
 
     def edit(self, pull_request, title, description, description_renderer, user):
         pull_request = self.__get_pull_request(pull_request)
         old_data = pull_request.get_api_data(with_merge_state=False)
         if pull_request.is_closed():
             raise ValueError('This pull request is closed')
         if title:
             pull_request.title = title
         pull_request.description = description
         pull_request.updated_on = datetime.datetime.now()
         pull_request.description_renderer = description_renderer
         Session().add(pull_request)
         self._log_audit_action(
             'repo.pull_request.edit', {'old_data': old_data},
             user, pull_request)
 
     def update_reviewers(self, pull_request, reviewer_data, user):
         """
         Update the reviewers in the pull request
 
         :param pull_request: the pr to update
         :param reviewer_data: list of tuples
             [(user, ['reason1', 'reason2'], mandatory_flag, [rules])]
         """
         pull_request = self.__get_pull_request(pull_request)
         if pull_request.is_closed():
             raise ValueError('This pull request is closed')
 
         reviewers = {}
         for user_id, reasons, mandatory, rules in reviewer_data:
             if isinstance(user_id, (int, compat.string_types)):
                 user_id = self._get_user(user_id).user_id
             reviewers[user_id] = {
                 'reasons': reasons, 'mandatory': mandatory}
 
         reviewers_ids = set(reviewers.keys())
         current_reviewers = PullRequestReviewers.query()\
             .filter(PullRequestReviewers.pull_request ==
                     pull_request).all()
         current_reviewers_ids = set([x.user.user_id for x in current_reviewers])
 
         ids_to_add = reviewers_ids.difference(current_reviewers_ids)
         ids_to_remove = current_reviewers_ids.difference(reviewers_ids)
 
         log.debug("Adding %s reviewers", ids_to_add)
         log.debug("Removing %s reviewers", ids_to_remove)
         changed = False
         added_audit_reviewers = []
         removed_audit_reviewers = []
 
         for uid in ids_to_add:
             changed = True
             _usr = self._get_user(uid)
             reviewer = PullRequestReviewers()
             reviewer.user = _usr
             reviewer.pull_request = pull_request
             reviewer.reasons = reviewers[uid]['reasons']
             # NOTE(marcink): mandatory shouldn't be changed now
             # reviewer.mandatory = reviewers[uid]['reasons']
             Session().add(reviewer)
             added_audit_reviewers.append(reviewer.get_dict())
 
         for uid in ids_to_remove:
             changed = True
             # NOTE(marcink): we fetch "ALL" reviewers using .all(). This is an edge case
             # that prevents and fixes cases that we added the same reviewer twice.
             # this CAN happen due to the lack of DB checks
             reviewers = PullRequestReviewers.query()\
                 .filter(PullRequestReviewers.user_id == uid,
                         PullRequestReviewers.pull_request == pull_request)\
                 .all()
 
             for obj in reviewers:
                 added_audit_reviewers.append(obj.get_dict())
                 Session().delete(obj)
 
         if changed:
             Session().expire_all()
             pull_request.updated_on = datetime.datetime.now()
             Session().add(pull_request)
 
         # finally store audit logs
         for user_data in added_audit_reviewers:
             self._log_audit_action(
                 'repo.pull_request.reviewer.add', {'data': user_data},
                 user, pull_request)
         for user_data in removed_audit_reviewers:
             self._log_audit_action(
                 'repo.pull_request.reviewer.delete', {'old_data': user_data},
                 user, pull_request)
 
         self.notify_reviewers(pull_request, ids_to_add)
         return ids_to_add, ids_to_remove
 
     def get_url(self, pull_request, request=None, permalink=False):
         if not request:
             request = get_current_request()
 
         if permalink:
             return request.route_url(
                 'pull_requests_global',
                 pull_request_id=pull_request.pull_request_id,)
         else:
             return request.route_url('pullrequest_show',
                 repo_name=safe_str(pull_request.target_repo.repo_name),
                 pull_request_id=pull_request.pull_request_id,)
 
     def get_shadow_clone_url(self, pull_request, request=None):
         """
         Returns qualified url pointing to the shadow repository. If this pull
         request is closed there is no shadow repository and ``None`` will be
         returned.
         """
         if pull_request.is_closed():
             return None
         else:
             pr_url = urllib.unquote(self.get_url(pull_request, request=request))
             return safe_unicode('{pr_url}/repository'.format(pr_url=pr_url))
 
     def notify_reviewers(self, pull_request, reviewers_ids):
         # notification to reviewers
         if not reviewers_ids:
             return
 
         log.debug('Notify following reviewers about pull-request %s', reviewers_ids)
 
         pull_request_obj = pull_request
         # get the current participants of this pull request
         recipients = reviewers_ids
         notification_type = EmailNotificationModel.TYPE_PULL_REQUEST
 
         pr_source_repo = pull_request_obj.source_repo
         pr_target_repo = pull_request_obj.target_repo
 
         pr_url = h.route_url('pullrequest_show',
                              repo_name=pr_target_repo.repo_name,
                              pull_request_id=pull_request_obj.pull_request_id,)
 
         # set some variables for email notification
         pr_target_repo_url = h.route_url(
             'repo_summary', repo_name=pr_target_repo.repo_name)
 
         pr_source_repo_url = h.route_url(
             'repo_summary', repo_name=pr_source_repo.repo_name)
 
         # pull request specifics
         pull_request_commits = [
             (x.raw_id, x.message)
             for x in map(pr_source_repo.get_commit, pull_request.revisions)]
 
         kwargs = {
             'user': pull_request.author,
             'pull_request': pull_request_obj,
             'pull_request_commits': pull_request_commits,
 
             'pull_request_target_repo': pr_target_repo,
             'pull_request_target_repo_url': pr_target_repo_url,
 
             'pull_request_source_repo': pr_source_repo,
             'pull_request_source_repo_url': pr_source_repo_url,
 
             'pull_request_url': pr_url,
         }
 
         # pre-generate the subject for notification itself
         (subject,
          _h, _e,  # we don't care about those
          body_plaintext) = EmailNotificationModel().render_email(
             notification_type, **kwargs)
 
         # create notification objects, and emails
         NotificationModel().create(
             created_by=pull_request.author,
             notification_subject=subject,
             notification_body=body_plaintext,
             notification_type=notification_type,
             recipients=recipients,
             email_kwargs=kwargs,
         )
 
     def notify_users(self, pull_request, updating_user, ancestor_commit_id,
                      commit_changes, file_changes):
 
         updating_user_id = updating_user.user_id
         reviewers = set([x.user.user_id for x in pull_request.reviewers])
         # NOTE(marcink): send notification to all other users except to
         # person who updated the PR
         recipients = reviewers.difference(set([updating_user_id]))
 
         log.debug('Notify following recipients about pull-request update %s', recipients)
 
         pull_request_obj = pull_request
 
         # send email about the update
         changed_files = (
                 file_changes.added + file_changes.modified + file_changes.removed)
 
         pr_source_repo = pull_request_obj.source_repo
         pr_target_repo = pull_request_obj.target_repo
 
         pr_url = h.route_url('pullrequest_show',
                              repo_name=pr_target_repo.repo_name,
                              pull_request_id=pull_request_obj.pull_request_id,)
 
         # set some variables for email notification
         pr_target_repo_url = h.route_url(
             'repo_summary', repo_name=pr_target_repo.repo_name)
 
         pr_source_repo_url = h.route_url(
             'repo_summary', repo_name=pr_source_repo.repo_name)
 
         email_kwargs = {
             'date': datetime.datetime.now(),
             'updating_user': updating_user,
 
             'pull_request': pull_request_obj,
 
             'pull_request_target_repo': pr_target_repo,
             'pull_request_target_repo_url': pr_target_repo_url,
 
             'pull_request_source_repo': pr_source_repo,
             'pull_request_source_repo_url': pr_source_repo_url,
 
             'pull_request_url': pr_url,
 
             'ancestor_commit_id': ancestor_commit_id,
             'added_commits': commit_changes.added,
             'removed_commits': commit_changes.removed,
             'changed_files': changed_files,
             'added_files': file_changes.added,
             'modified_files': file_changes.modified,
             'removed_files': file_changes.removed,
         }
 
         (subject,
          _h, _e,  # we don't care about those
          body_plaintext) = EmailNotificationModel().render_email(
             EmailNotificationModel.TYPE_PULL_REQUEST_UPDATE, **email_kwargs)
 
         # create notification objects, and emails
         NotificationModel().create(
             created_by=updating_user,
             notification_subject=subject,
             notification_body=body_plaintext,
             notification_type=EmailNotificationModel.TYPE_PULL_REQUEST_UPDATE,
             recipients=recipients,
             email_kwargs=email_kwargs,
         )
 
     def delete(self, pull_request, user=None):
         if not user:
             user = getattr(get_current_rhodecode_user(), 'username', None)
 
         pull_request = self.__get_pull_request(pull_request)
         old_data = pull_request.get_api_data(with_merge_state=False)
         self._cleanup_merge_workspace(pull_request)
         self._log_audit_action(
             'repo.pull_request.delete', {'old_data': old_data},
             user, pull_request)
         Session().delete(pull_request)
 
     def close_pull_request(self, pull_request, user):
         pull_request = self.__get_pull_request(pull_request)
         self._cleanup_merge_workspace(pull_request)
         pull_request.status = PullRequest.STATUS_CLOSED
         pull_request.updated_on = datetime.datetime.now()
         Session().add(pull_request)
         self.trigger_pull_request_hook(pull_request, pull_request.author, 'close')
 
         pr_data = pull_request.get_api_data(with_merge_state=False)
         self._log_audit_action(
             'repo.pull_request.close', {'data': pr_data}, user, pull_request)
 
     def close_pull_request_with_comment(
             self, pull_request, user, repo, message=None, auth_user=None):
 
         pull_request_review_status = pull_request.calculated_review_status()
 
         if pull_request_review_status == ChangesetStatus.STATUS_APPROVED:
             # approved only if we have voting consent
             status = ChangesetStatus.STATUS_APPROVED
         else:
             status = ChangesetStatus.STATUS_REJECTED
         status_lbl = ChangesetStatus.get_status_lbl(status)
 
         default_message = (
             'Closing with status change {transition_icon} {status}.'
         ).format(transition_icon='>', status=status_lbl)
         text = message or default_message
 
         # create a comment, and link it to new status
         comment = CommentsModel().create(
             text=text,
             repo=repo.repo_id,
             user=user.user_id,
             pull_request=pull_request.pull_request_id,
             status_change=status_lbl,
             status_change_type=status,
             closing_pr=True,
             auth_user=auth_user,
         )
 
         # calculate old status before we change it
         old_calculated_status = pull_request.calculated_review_status()
         ChangesetStatusModel().set_status(
             repo.repo_id,
             status,
             user.user_id,
             comment=comment,
             pull_request=pull_request.pull_request_id
         )
 
         Session().flush()
 
         self.trigger_pull_request_hook(pull_request, user, 'comment',
                                        data={'comment': comment})
 
         # we now calculate the status of pull request again, and based on that
         # calculation trigger status change. This might happen in cases
         # that non-reviewer admin closes a pr, which means his vote doesn't
         # change the status, while if he's a reviewer this might change it.
         calculated_status = pull_request.calculated_review_status()
         if old_calculated_status != calculated_status:
             self.trigger_pull_request_hook(pull_request, user, 'review_status_change',
                                            data={'status': calculated_status})
 
         # finally close the PR
         PullRequestModel().close_pull_request(pull_request.pull_request_id, user)
 
         return comment, status
 
     def merge_status(self, pull_request, translator=None, force_shadow_repo_refresh=False):
         _ = translator or get_current_request().translate
 
         if not self._is_merge_enabled(pull_request):
             return None, False, _('Server-side pull request merging is disabled.')
 
         if pull_request.is_closed():
             return None, False, _('This pull request is closed.')
 
         merge_possible, msg = self._check_repo_requirements(
             target=pull_request.target_repo, source=pull_request.source_repo,
             translator=_)
         if not merge_possible:
             return None, merge_possible, msg
 
         try:
             merge_response = self._try_merge(
                 pull_request, force_shadow_repo_refresh=force_shadow_repo_refresh)
             log.debug("Merge response: %s", merge_response)
             return merge_response, merge_response.possible, merge_response.merge_status_message
         except NotImplementedError:
             return None, False, _('Pull request merging is not supported.')
 
     def _check_repo_requirements(self, target, source, translator):
         """
         Check if `target` and `source` have compatible requirements.
 
         Currently this is just checking for largefiles.
         """
         _ = translator
         target_has_largefiles = self._has_largefiles(target)
         source_has_largefiles = self._has_largefiles(source)
         merge_possible = True
         message = u''
 
         if target_has_largefiles != source_has_largefiles:
             merge_possible = False
             if source_has_largefiles:
                 message = _(
                     'Target repository large files support is disabled.')
             else:
                 message = _(
                     'Source repository large files support is disabled.')
 
         return merge_possible, message
 
     def _has_largefiles(self, repo):
         largefiles_ui = VcsSettingsModel(repo=repo).get_ui_settings(
             'extensions', 'largefiles')
         return largefiles_ui and largefiles_ui[0].active
 
     def _try_merge(self, pull_request, force_shadow_repo_refresh=False):
         """
         Try to merge the pull request and return the merge status.
         """
         log.debug(
             "Trying out if the pull request %s can be merged. Force_refresh=%s",
             pull_request.pull_request_id, force_shadow_repo_refresh)
         target_vcs = pull_request.target_repo.scm_instance()
         # Refresh the target reference.
         try:
             target_ref = self._refresh_reference(
                 pull_request.target_ref_parts, target_vcs)
         except CommitDoesNotExistError:
             merge_state = MergeResponse(
                 False, False, None, MergeFailureReason.MISSING_TARGET_REF,
                 metadata={'target_ref': pull_request.target_ref_parts})
             return merge_state
 
         target_locked = pull_request.target_repo.locked
         if target_locked and target_locked[0]:
             locked_by = 'user:{}'.format(target_locked[0])
             log.debug("The target repository is locked by %s.", locked_by)
             merge_state = MergeResponse(
                 False, False, None, MergeFailureReason.TARGET_IS_LOCKED,
                 metadata={'locked_by': locked_by})
         elif force_shadow_repo_refresh or self._needs_merge_state_refresh(
                 pull_request, target_ref):
             log.debug("Refreshing the merge status of the repository.")
             merge_state = self._refresh_merge_state(
                 pull_request, target_vcs, target_ref)
         else:
             possible = pull_request.last_merge_status == MergeFailureReason.NONE
             metadata = {
                 'unresolved_files': '',
                 'target_ref': pull_request.target_ref_parts,
                 'source_ref': pull_request.source_ref_parts,
             }
             if pull_request.last_merge_metadata:
                 metadata.update(pull_request.last_merge_metadata)
 
             if not possible and target_ref.type == 'branch':
                 # NOTE(marcink): case for mercurial multiple heads on branch
                 heads = target_vcs._heads(target_ref.name)
                 if len(heads) != 1:
                     heads = '\n,'.join(target_vcs._heads(target_ref.name))
                     metadata.update({
                         'heads': heads
                     })
 
             merge_state = MergeResponse(
                 possible, False, None, pull_request.last_merge_status, metadata=metadata)
 
         return merge_state
 
     def _refresh_reference(self, reference, vcs_repository):
         if reference.type in self.UPDATABLE_REF_TYPES:
             name_or_id = reference.name
         else:
             name_or_id = reference.commit_id
 
         refreshed_commit = vcs_repository.get_commit(name_or_id)
         refreshed_reference = Reference(
             reference.type, reference.name, refreshed_commit.raw_id)
         return refreshed_reference
 
     def _needs_merge_state_refresh(self, pull_request, target_reference):
         return not(
             pull_request.revisions and
             pull_request.revisions[0] == pull_request._last_merge_source_rev and
             target_reference.commit_id == pull_request._last_merge_target_rev)
 
     def _refresh_merge_state(self, pull_request, target_vcs, target_reference):
         workspace_id = self._workspace_id(pull_request)
         source_vcs = pull_request.source_repo.scm_instance()
         repo_id = pull_request.target_repo.repo_id
         use_rebase = self._use_rebase_for_merging(pull_request)
         close_branch = self._close_branch_before_merging(pull_request)
         merge_state = target_vcs.merge(
             repo_id, workspace_id,
             target_reference, source_vcs, pull_request.source_ref_parts,
             dry_run=True, use_rebase=use_rebase,
             close_branch=close_branch)
 
         # Do not store the response if there was an unknown error.
         if merge_state.failure_reason != MergeFailureReason.UNKNOWN:
             pull_request._last_merge_source_rev = \
                 pull_request.source_ref_parts.commit_id
             pull_request._last_merge_target_rev = target_reference.commit_id
             pull_request.last_merge_status = merge_state.failure_reason
             pull_request.last_merge_metadata = merge_state.metadata
 
             pull_request.shadow_merge_ref = merge_state.merge_ref
             Session().add(pull_request)
             Session().commit()
 
         return merge_state
 
     def _workspace_id(self, pull_request):
         workspace_id = 'pr-%s' % pull_request.pull_request_id
         return workspace_id
 
     def generate_repo_data(self, repo, commit_id=None, branch=None,
                            bookmark=None, translator=None):
         from rhodecode.model.repo import RepoModel
 
         all_refs, selected_ref = \
             self._get_repo_pullrequest_sources(
                 repo.scm_instance(), commit_id=commit_id,
                 branch=branch, bookmark=bookmark, translator=translator)
 
         refs_select2 = []
         for element in all_refs:
             children = [{'id': x[0], 'text': x[1]} for x in element[0]]
             refs_select2.append({'text': element[1], 'children': children})
 
         return {
             'user': {
                 'user_id': repo.user.user_id,
                 'username': repo.user.username,
                 'firstname': repo.user.first_name,
                 'lastname': repo.user.last_name,
                 'gravatar_link': h.gravatar_url(repo.user.email, 14),
             },
             'name': repo.repo_name,
             'link': RepoModel().get_url(repo),
             'description': h.chop_at_smart(repo.description_safe, '\n'),
             'refs': {
                 'all_refs': all_refs,
                 'selected_ref': selected_ref,
                 'select2_refs': refs_select2
             }
         }
 
     def generate_pullrequest_title(self, source, source_ref, target):
         return u'{source}#{at_ref} to {target}'.format(
             source=source,
             at_ref=source_ref,
             target=target,
         )
 
     def _cleanup_merge_workspace(self, pull_request):
         # Merging related cleanup
         repo_id = pull_request.target_repo.repo_id
         target_scm = pull_request.target_repo.scm_instance()
         workspace_id = self._workspace_id(pull_request)
 
         try:
             target_scm.cleanup_merge_workspace(repo_id, workspace_id)
         except NotImplementedError:
             pass
 
     def _get_repo_pullrequest_sources(
             self, repo, commit_id=None, branch=None, bookmark=None,
             translator=None):
         """
         Return a structure with repo's interesting commits, suitable for
         the selectors in pullrequest controller
 
         :param commit_id: a commit that must be in the list somehow
             and selected by default
         :param branch: a branch that must be in the list and selected
             by default - even if closed
         :param bookmark: a bookmark that must be in the list and selected
         """
         _ = translator or get_current_request().translate
 
         commit_id = safe_str(commit_id) if commit_id else None
         branch = safe_unicode(branch) if branch else None
         bookmark = safe_unicode(bookmark) if bookmark else None
 
         selected = None
 
         # order matters: first source that has commit_id in it will be selected
         sources = []
         sources.append(('book', repo.bookmarks.items(), _('Bookmarks'), bookmark))
         sources.append(('branch', repo.branches.items(), _('Branches'), branch))
 
         if commit_id:
             ref_commit = (h.short_id(commit_id), commit_id)
             sources.append(('rev', [ref_commit], _('Commit IDs'), commit_id))
 
         sources.append(
             ('branch', repo.branches_closed.items(), _('Closed Branches'), branch),
         )
 
         groups = []
 
         for group_key, ref_list, group_name, match in sources:
             group_refs = []
             for ref_name, ref_id in ref_list:
                 ref_key = u'{}:{}:{}'.format(group_key, ref_name, ref_id)
                 group_refs.append((ref_key, ref_name))
 
                 if not selected:
                     if set([commit_id, match]) & set([ref_id, ref_name]):
                         selected = ref_key
 
             if group_refs:
                 groups.append((group_refs, group_name))
 
         if not selected:
             ref = commit_id or branch or bookmark
             if ref:
                 raise CommitDoesNotExistError(
                     u'No commit refs could be found matching: {}'.format(ref))
             elif repo.DEFAULT_BRANCH_NAME in repo.branches:
                 selected = u'branch:{}:{}'.format(
                     safe_unicode(repo.DEFAULT_BRANCH_NAME),
                     safe_unicode(repo.branches[repo.DEFAULT_BRANCH_NAME])
                 )
             elif repo.commit_ids:
                 # make the user select in this case
                 selected = None
             else:
                 raise EmptyRepositoryError()
         return groups, selected
 
     def get_diff(self, source_repo, source_ref_id, target_ref_id,
                  hide_whitespace_changes, diff_context):
 
         return self._get_diff_from_pr_or_version(
             source_repo, source_ref_id, target_ref_id,
             hide_whitespace_changes=hide_whitespace_changes, diff_context=diff_context)
 
     def _get_diff_from_pr_or_version(
             self, source_repo, source_ref_id, target_ref_id,
             hide_whitespace_changes, diff_context):
 
         target_commit = source_repo.get_commit(
             commit_id=safe_str(target_ref_id))
         source_commit = source_repo.get_commit(
             commit_id=safe_str(source_ref_id), maybe_unreachable=True)
         if isinstance(source_repo, Repository):
             vcs_repo = source_repo.scm_instance()
         else:
             vcs_repo = source_repo
 
         # TODO: johbo: In the context of an update, we cannot reach
         # the old commit anymore with our normal mechanisms. It needs
         # some sort of special support in the vcs layer to avoid this
         # workaround.
         if (source_commit.raw_id == vcs_repo.EMPTY_COMMIT_ID and
                 vcs_repo.alias == 'git'):
             source_commit.raw_id = safe_str(source_ref_id)
 
         log.debug('calculating diff between '
                   'source_ref:%s and target_ref:%s for repo `%s`',
                   target_ref_id, source_ref_id,
                   safe_unicode(vcs_repo.path))
 
         vcs_diff = vcs_repo.get_diff(
             commit1=target_commit, commit2=source_commit,
             ignore_whitespace=hide_whitespace_changes, context=diff_context)
         return vcs_diff
 
     def _is_merge_enabled(self, pull_request):
         return self._get_general_setting(
             pull_request, 'rhodecode_pr_merge_enabled')
 
     def _use_rebase_for_merging(self, pull_request):
         repo_type = pull_request.target_repo.repo_type
         if repo_type == 'hg':
             return self._get_general_setting(
                 pull_request, 'rhodecode_hg_use_rebase_for_merging')
         elif repo_type == 'git':
             return self._get_general_setting(
                 pull_request, 'rhodecode_git_use_rebase_for_merging')
 
         return False
 
     def _user_name_for_merging(self, pull_request, user):
         env_user_name_attr = os.environ.get('RC_MERGE_USER_NAME_ATTR', '')
         if env_user_name_attr and hasattr(user, env_user_name_attr):
             user_name_attr = env_user_name_attr
         else:
             user_name_attr = 'short_contact'
 
         user_name = getattr(user, user_name_attr)
         return user_name
 
     def _close_branch_before_merging(self, pull_request):
         repo_type = pull_request.target_repo.repo_type
         if repo_type == 'hg':
             return self._get_general_setting(
                 pull_request, 'rhodecode_hg_close_branch_before_merging')
         elif repo_type == 'git':
             return self._get_general_setting(
                 pull_request, 'rhodecode_git_close_branch_before_merging')
 
         return False
 
     def _get_general_setting(self, pull_request, settings_key, default=False):
         settings_model = VcsSettingsModel(repo=pull_request.target_repo)
         settings = settings_model.get_general_settings()
         return settings.get(settings_key, default)
 
     def _log_audit_action(self, action, action_data, user, pull_request):
         audit_logger.store(
             action=action,
             action_data=action_data,
             user=user,
             repo=pull_request.target_repo)
 
     def get_reviewer_functions(self):
         """
         Fetches functions for validation and fetching default reviewers.
         If available we use the EE package, else we fallback to CE
         package functions
         """
         try:
             from rc_reviewers.utils import get_default_reviewers_data
             from rc_reviewers.utils import validate_default_reviewers
         except ImportError:
             from rhodecode.apps.repository.utils import get_default_reviewers_data
             from rhodecode.apps.repository.utils import validate_default_reviewers
 
         return get_default_reviewers_data, validate_default_reviewers
 
 
 class MergeCheck(object):
     """
     Perform Merge Checks and returns a check object which stores information
     about merge errors, and merge conditions
     """
     TODO_CHECK = 'todo'
     PERM_CHECK = 'perm'
     REVIEW_CHECK = 'review'
     MERGE_CHECK = 'merge'
     WIP_CHECK = 'wip'
 
     def __init__(self):
         self.review_status = None
         self.merge_possible = None
         self.merge_msg = ''
         self.merge_response = None
         self.failed = None
         self.errors = []
         self.error_details = OrderedDict()
         self.source_commit = AttributeDict()
         self.target_commit = AttributeDict()
 
     def __repr__(self):
         return '<MergeCheck(possible:{}, failed:{}, errors:{})>'.format(
             self.merge_possible, self.failed, self.errors)
 
     def push_error(self, error_type, message, error_key, details):
         self.failed = True
         self.errors.append([error_type, message])
         self.error_details[error_key] = dict(
             details=details,
             error_type=error_type,
             message=message
         )
 
     @classmethod
     def validate(cls, pull_request, auth_user, translator, fail_early=False,
                  force_shadow_repo_refresh=False):
         _ = translator
         merge_check = cls()
 
         # title has WIP:
         if pull_request.work_in_progress:
             log.debug("MergeCheck: cannot merge, title has wip: marker.")
 
             msg = _('WIP marker in title prevents from accidental merge.')
             merge_check.push_error('error', msg, cls.WIP_CHECK, pull_request.title)
             if fail_early:
                 return merge_check
 
         # permissions to merge
         user_allowed_to_merge = PullRequestModel().check_user_merge(pull_request, auth_user)
         if not user_allowed_to_merge:
             log.debug("MergeCheck: cannot merge, approval is pending.")
 
             msg = _('User `{}` not allowed to perform merge.').format(auth_user.username)
             merge_check.push_error('error', msg, cls.PERM_CHECK, auth_user.username)
             if fail_early:
                 return merge_check
 
         # permission to merge into the target branch
         target_commit_id = pull_request.target_ref_parts.commit_id
         if pull_request.target_ref_parts.type == 'branch':
             branch_name = pull_request.target_ref_parts.name
         else:
             # for mercurial we can always figure out the branch from the commit
             # in case of bookmark
             target_commit = pull_request.target_repo.get_commit(target_commit_id)
             branch_name = target_commit.branch
 
         rule, branch_perm = auth_user.get_rule_and_branch_permission(
             pull_request.target_repo.repo_name, branch_name)
         if branch_perm and branch_perm == 'branch.none':
             msg = _('Target branch `{}` changes rejected by rule {}.').format(
                 branch_name, rule)
             merge_check.push_error('error', msg, cls.PERM_CHECK, auth_user.username)
             if fail_early:
                 return merge_check
 
         # review status, must be always present
         review_status = pull_request.calculated_review_status()
         merge_check.review_status = review_status
 
         status_approved = review_status == ChangesetStatus.STATUS_APPROVED
         if not status_approved:
             log.debug("MergeCheck: cannot merge, approval is pending.")
 
             msg = _('Pull request reviewer approval is pending.')
 
             merge_check.push_error('warning', msg, cls.REVIEW_CHECK, review_status)
 
             if fail_early:
                 return merge_check
 
         # left over TODOs
         todos = CommentsModel().get_pull_request_unresolved_todos(pull_request)
         if todos:
             log.debug("MergeCheck: cannot merge, {} "
                       "unresolved TODOs left.".format(len(todos)))
 
             if len(todos) == 1:
                 msg = _('Cannot merge, {} TODO still not resolved.').format(
                     len(todos))
             else:
                 msg = _('Cannot merge, {} TODOs still not resolved.').format(
                     len(todos))
 
             merge_check.push_error('warning', msg, cls.TODO_CHECK, todos)
 
             if fail_early:
                 return merge_check
 
         # merge possible, here is the filesystem simulation + shadow repo
         merge_response, merge_status, msg = PullRequestModel().merge_status(
             pull_request, translator=translator,
             force_shadow_repo_refresh=force_shadow_repo_refresh)
 
         merge_check.merge_possible = merge_status
         merge_check.merge_msg = msg
         merge_check.merge_response = merge_response
 
         source_ref_id = pull_request.source_ref_parts.commit_id
         target_ref_id = pull_request.target_ref_parts.commit_id
 
         try:
             source_commit, target_commit = PullRequestModel().get_flow_commits(pull_request)
             merge_check.source_commit.changed = source_ref_id != source_commit.raw_id
             merge_check.source_commit.ref_spec = pull_request.source_ref_parts
             merge_check.source_commit.current_raw_id = source_commit.raw_id
             merge_check.source_commit.previous_raw_id = source_ref_id
 
             merge_check.target_commit.changed = target_ref_id != target_commit.raw_id
             merge_check.target_commit.ref_spec = pull_request.target_ref_parts
             merge_check.target_commit.current_raw_id = target_commit.raw_id
             merge_check.target_commit.previous_raw_id = target_ref_id
         except (SourceRefMissing, TargetRefMissing):
             pass
 
         if not merge_status:
             log.debug("MergeCheck: cannot merge, pull request merge not possible.")
             merge_check.push_error('warning', msg, cls.MERGE_CHECK, None)
 
             if fail_early:
                 return merge_check
 
         log.debug('MergeCheck: is failed: %s', merge_check.failed)
         return merge_check
 
     @classmethod
     def get_merge_conditions(cls, pull_request, translator):
         _ = translator
         merge_details = {}
 
         model = PullRequestModel()
         use_rebase = model._use_rebase_for_merging(pull_request)
 
         if use_rebase:
             merge_details['merge_strategy'] = dict(
                 details={},
                 message=_('Merge strategy: rebase')
             )
         else:
             merge_details['merge_strategy'] = dict(
                 details={},
                 message=_('Merge strategy: explicit merge commit')
             )
 
         close_branch = model._close_branch_before_merging(pull_request)
         if close_branch:
             repo_type = pull_request.target_repo.repo_type
             close_msg = ''
             if repo_type == 'hg':
                 close_msg = _('Source branch will be closed after merge.')
             elif repo_type == 'git':
                 close_msg = _('Source branch will be deleted after merge.')
 
             merge_details['close_branch'] = dict(
                 details={},
                 message=close_msg
             )
 
         return merge_details
 
 
 ChangeTuple = collections.namedtuple(
     'ChangeTuple', ['added', 'common', 'removed', 'total'])
 
 FileChangeTuple = collections.namedtuple(
     'FileChangeTuple', ['added', 'modified', 'removed'])

rhodecode/public/css/code-block.less

@@ -1,1314 +1,1322 b''
 // Default styles
 
 .diff-collapse {
     margin: @padding 0;
     text-align: right;
 }
 
 .diff-container {
     margin-bottom: @space;
 
     .diffblock {
         margin-bottom: @space;
     }
 
     &.hidden {
         display: none;
         overflow: hidden;
     }
 }
 
 
 div.diffblock .sidebyside {
  background: #ffffff;
 }
 
 div.diffblock {
     overflow-x: auto;
     overflow-y: hidden;
     clear: both;
     padding: 0px;
     background: @grey6;
     border: @border-thickness solid @grey5;
     -webkit-border-radius: @border-radius @border-radius 0px 0px;
     border-radius: @border-radius @border-radius 0px 0px;
 
 
     .comments-number {
         float: right;
     }
 
     // BEGIN CODE-HEADER STYLES
 
     .code-header {
         background: @grey6;
         padding: 10px 0 10px 0;
         height: auto;
         width: 100%;
 
         .hash {
             float: left;
             padding: 2px 0 0 2px;
         }
 
         .date {
             float: left;
             text-transform: uppercase;
             padding: 4px 0px 0px 2px;
         }
 
         div {
             margin-left: 4px;
         }
 
         div.compare_header {
             min-height: 40px;
             margin: 0;
             padding: 0 @padding;
 
             .drop-menu {
                 float:left;
                 display: block;
                 margin:0 0 @padding 0;
             }
 
             .compare-label {
                 float: left;
                 clear: both;
                 display: inline-block;
                 min-width: 5em;
                 margin: 0;
                 padding: @button-padding @button-padding @button-padding 0;
                 font-weight: @text-semibold-weight;
                 font-family: @text-semibold;
             }
 
             .compare-buttons {
                 float: left;
                 margin: 0;
                 padding: 0 0 @padding;
 
                 .btn {
                     margin: 0 @padding 0 0;
                 }
             }
         }
 
     }
 
     .parents {
         float: left;
         width: 100px;
         font-weight: 400;
         vertical-align: middle;
         padding: 0px 2px 0px 2px;
         background-color: @grey6;
 
         #parent_link {
            margin: 00px 2px;
 
            &.double {
                margin: 0px 2px;
             }
 
             &.disabled{
                 margin-right: @padding;
             }
         }
     }
 
     .children {
         float: right;
         width: 100px;
         font-weight: 400;
         vertical-align: middle;
         text-align: right;
         padding: 0px 2px 0px 2px;
         background-color: @grey6;
 
         #child_link {
            margin: 0px 2px;
 
            &.double {
                margin: 0px 2px;
             }
 
             &.disabled{
                 margin-right: @padding;
             }
         }
     }
 
     .changeset_header {
         height: 16px;
 
         & > div{
             margin-right: @padding;
        }
     }
 
     .changeset_file {
         text-align: left;
         float: left;
         padding: 0;
 
         a{
             display: inline-block;
             margin-right: 0.5em;
         }
 
        #selected_mode{
             margin-left: 0;
        }
     }
 
     .diff-menu-wrapper {
         float: left;
     }
 
     .diff-menu {
         position: absolute;
         background: none repeat scroll 0 0 #FFFFFF;
         border-color: #003367 @grey3 @grey3;
         border-right: 1px solid @grey3;
         border-style: solid solid solid;
         border-width: @border-thickness;
         box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2);
         margin-top: 5px;
         margin-left: 1px;
     }
 
     .diff-actions, .editor-actions {
         float: left;
 
         input{
             margin: 0 0.5em 0 0;
         }
     }
 
     // END CODE-HEADER STYLES
 
     // BEGIN CODE-BODY STYLES
 
     .code-body {
         padding: 0;
         background-color: #ffffff;
         position: relative;
         max-width: none;
         box-sizing: border-box;
         // TODO: johbo: Parent has overflow: auto, this forces the child here
         // to have the intended size and to scroll. Should be simplified.
         width: 100%;
         overflow-x: auto;
     }
 
     pre.raw {
         background: white;
         color: @grey1;
     }
     // END CODE-BODY STYLES
 
 }
 
 
 table.code-difftable {
     border-collapse: collapse;
     width: 99%;
     border-radius: 0px !important;
 
      td {
         padding: 0 !important;
         background: none !important;
         border: 0 !important;
     }
 
     .context {
         background: none repeat scroll 0 0 #DDE7EF;
     }
 
     .add {
         background: none repeat scroll 0 0 #DDFFDD;
 
         ins {
             background: none repeat scroll 0 0 #AAFFAA;
             text-decoration: none;
         }
     }
 
     .del {
         background: none repeat scroll 0 0 #FFDDDD;
 
         del {
             background: none repeat scroll 0 0 #FFAAAA;
             text-decoration: none;
         }
     }
 
     /** LINE NUMBERS **/
     .lineno {
         padding-left: 2px !important;
         padding-right: 2px;
         text-align: right;
         width: 32px;
         -moz-user-select: none;
         -webkit-user-select: none;
         border-right: @border-thickness solid @grey5 !important;
         border-left: 0px solid #CCC !important;
         border-top: 0px solid #CCC !important;
         border-bottom: none !important;
 
         a {
             &:extend(pre);
             text-align: right;
             padding-right: 2px;
             cursor: pointer;
             display: block;
             width: 32px;
         }
     }
 
     .context {
         cursor: auto;
         &:extend(pre);
     }
 
     .lineno-inline {
         background: none repeat scroll 0 0 #FFF !important;
         padding-left: 2px;
         padding-right: 2px;
         text-align: right;
         width: 30px;
         -moz-user-select: none;
         -webkit-user-select: none;
     }
 
     /** CODE **/
     .code {
         display: block;
         width: 100%;
 
         td {
             margin: 0;
             padding: 0;
         }
 
         pre {
             margin: 0;
             padding: 0;
             margin-left: .5em;
         }
     }
 }
 
 
 // Comments
 .comment-selected-hl {
     border-left: 6px solid @comment-highlight-color !important;
     padding-left: 3px !important;
     margin-left: -7px !important;
 }
 
 div.comment:target,
 div.comment-outdated:target {
     .comment-selected-hl;
 }
 
 //TODO: anderson: can't get an absolute number out of anything, so had to put the
 //current values that might change. But to make it clear I put as a calculation
 @comment-max-width: 1065px;
 @pr-extra-margin: 34px;
 @pr-border-spacing: 4px;
 @pr-comment-width: @comment-max-width - @pr-extra-margin - @pr-border-spacing;
 
 // Pull Request
 .cs_files .code-difftable {
     border: @border-thickness solid @grey5; //borders only on PRs
 
     .comment-inline-form,
     div.comment {
         width: @pr-comment-width;
     }
 }
 
 // Changeset
 .code-difftable {
     .comment-inline-form,
     div.comment {
         width: @comment-max-width;
     }
 }
 
 //Style page
 @style-extra-margin: @sidebar-width + (@sidebarpadding * 3) + @padding;
 #style-page .code-difftable{
     .comment-inline-form,
     div.comment {
         width: @comment-max-width - @style-extra-margin;
     }
 }
 
 #context-bar > h2 {
     font-size: 20px;
 }
 
 #context-bar > h2> a {
     font-size: 20px;
 }
 // end of defaults
 
 .file_diff_buttons {
     padding: 0 0 @padding;
 
     .drop-menu {
         float: left;
         margin: 0 @padding 0 0;
     }
     .btn {
         margin: 0 @padding 0 0;
     }
 }
 
 .code-body.textarea.editor {
     max-width: none;
     padding: 15px;
 }
 
 td.injected_diff{
     max-width: 1178px;
     overflow-x: auto;
     overflow-y: hidden;
 
     div.diff-container,
     div.diffblock{
         max-width: 100%;
     }
 
     div.code-body {
         max-width: 1124px;
         overflow-x: auto;
         overflow-y: hidden;
         padding: 0;
     }
     div.diffblock {
         border: none;
     }
 
     &.inline-form {
         width: 99%
     }
  }
 
 
 table.code-difftable {
     width: 100%;
 }
 
 /** PYGMENTS COLORING **/
 div.codeblock {
 
     // TODO: johbo: Added interim to get rid of the margin around
     // Select2 widgets. This needs further cleanup.
     overflow: auto;
     padding: 0px;
     border: @border-thickness solid @grey6;
     .border-radius(@border-radius);
 
     #remove_gist {
         float: right;
     }
 
     .gist_url {
         padding: 0px 0px 35px 0px;
     }
 
     .gist-desc {
         clear: both;
         margin: 0 0 10px 0;
         code {
             white-space: pre-line;
             line-height: inherit
         }
     }
 
     .author {
         clear: both;
         vertical-align: middle;
         font-weight: @text-bold-weight;
         font-family: @text-bold;
     }
 
     .btn-mini {
         float: left;
         margin: 0 5px 0 0;
     }
 
     .code-header {
         padding: @padding;
         border-bottom: @border-thickness solid @grey5;
 
         .rc-user {
             min-width: 0;
             margin-right: .5em;
         }
 
         .stats {
             clear: both;
             margin: 0 0 @padding 0;
             padding: 0;
             .left {
                 float: left;
                 clear: left;
                 max-width: 75%;
                 margin: 0 0 @padding 0;
 
                 &.item {
                     margin-right: @padding;
                     &.last { border-right: none; }
                 }
             }
             .buttons { float: right; }
             .author {
                 height: 25px; margin-left: 15px; font-weight: bold;
             }
         }
 
         .commit {
             margin: 5px 0 0 26px;
             font-weight: normal;
             white-space: pre-wrap;
         }
     }
 
     .message {
         position: relative;
         margin: @padding;
 
         .codeblock-label {
             margin: 0 0 1em 0;
         }
     }
 
     .code-body {
         padding: 0.8em 1em;
         background-color: #ffffff;
         min-width: 100%;
         box-sizing: border-box;
         // TODO: johbo: Parent has overflow: auto, this forces the child here
         // to have the intended size and to scroll. Should be simplified.
         width: 100%;
         overflow-x: auto;
 
         img.rendered-binary {
             height: auto;
             width: auto;
         }
 
         .markdown-block {
             padding: 1em 0;
         }
     }
 
     .codeblock-header {
         background: @grey7;
         height: 36px;
     }
 
     .path {
         border-bottom: 1px solid @grey6;
         padding: .65em 1em;
         height: 18px;
     }
 }
 
 .code-highlighttable,
 div.codeblock {
 
     &.readme {
         background-color: white;
     }
 
     .markdown-block table {
         border-collapse: collapse;
 
         th,
         td {
             padding: .5em;
             border: @border-thickness solid @border-default-color;
         }
     }
 
     table {
         border: 0px;
         margin: 0;
         letter-spacing: normal;
 
 
         td {
             border: 0px;
             vertical-align: top;
         }
     }
 }
 
 div.codeblock .code-header .search-path { padding: 0 0 0 10px; }
 div.search-code-body {
     background-color: #ffffff; padding: 5px 0 5px 10px;
     pre {
         .match { background-color: #faffa6;}
         .break { display: block; width: 100%; background-color: #DDE7EF; color: #747474; }
     }
     .code-highlighttable {
         border-collapse: collapse;
 
         tr:hover {
             background: #fafafa;
         }
         td.code {
           padding-left: 10px;
         }
         td.line {
             border-right: 1px solid #ccc !important;
             padding-right: 10px;
             text-align: right;
             font-family: @text-monospace;
             span {
                 white-space: pre-wrap;
                 color: #666666;
             }
         }
     }
 }
 
 div.annotatediv { margin-left: 2px; margin-right: 4px; }
 .code-highlight {
     margin: 0; padding: 0; border-left: @border-thickness solid @grey5;
     pre, .linenodiv pre { padding: 0 5px; margin: 0; }
     pre div:target {background-color: @comment-highlight-color !important;}
 }
 
 .linenos a { text-decoration: none; }
 
 .CodeMirror-selected { background: @rchighlightblue; }
 .CodeMirror-focused .CodeMirror-selected { background: @rchighlightblue; }
 .CodeMirror ::selection { background: @rchighlightblue; }
 .CodeMirror ::-moz-selection { background: @rchighlightblue; }
 
 .code { display: block; border:0px !important; }
 
 .code-highlight, /* TODO: dan: merge codehilite into code-highlight */
 .codehilite {
     /*ElasticMatch is custom RhodeCode TAG*/
 
     .c-ElasticMatch {
         background-color: #faffa6;
         padding: 0.2em;
     }
 }
 
 /* This can be generated with `pygmentize -S default -f html` */
 .code-highlight,
 .codehilite {
     /*ElasticMatch is custom RhodeCode TAG*/
     .c-ElasticMatch { background-color: #faffa6; padding: 0.2em;}
     .hll { background-color: #ffffcc }
     .c { color: #408080; font-style: italic } /* Comment */
     .err, .codehilite .err { border: none } /* Error */
     .k { color: #008000; font-weight: bold } /* Keyword */
     .o { color: #666666 } /* Operator */
     .ch { color: #408080; font-style: italic } /* Comment.Hashbang */
     .cm { color: #408080; font-style: italic } /* Comment.Multiline */
     .cp { color: #BC7A00 } /* Comment.Preproc */
     .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */
     .c1 { color: #408080; font-style: italic } /* Comment.Single */
     .cs { color: #408080; font-style: italic } /* Comment.Special */
     .gd { color: #A00000 } /* Generic.Deleted */
     .ge { font-style: italic } /* Generic.Emph */
     .gr { color: #FF0000 } /* Generic.Error */
     .gh { color: #000080; font-weight: bold } /* Generic.Heading */
     .gi { color: #00A000 } /* Generic.Inserted */
     .go { color: #888888 } /* Generic.Output */
     .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
     .gs { font-weight: bold } /* Generic.Strong */
     .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
     .gt { color: #0044DD } /* Generic.Traceback */
     .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
     .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
     .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
     .kp { color: #008000 } /* Keyword.Pseudo */
     .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
     .kt { color: #B00040 } /* Keyword.Type */
     .m { color: #666666 } /* Literal.Number */
     .s { color: #BA2121 } /* Literal.String */
     .na { color: #7D9029 } /* Name.Attribute */
     .nb { color: #008000 } /* Name.Builtin */
     .nc { color: #0000FF; font-weight: bold } /* Name.Class */
     .no { color: #880000 } /* Name.Constant */
     .nd { color: #AA22FF } /* Name.Decorator */
     .ni { color: #999999; font-weight: bold } /* Name.Entity */
     .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
     .nf { color: #0000FF } /* Name.Function */
     .nl { color: #A0A000 } /* Name.Label */
     .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
     .nt { color: #008000; font-weight: bold } /* Name.Tag */
     .nv { color: #19177C } /* Name.Variable */
     .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
     .w { color: #bbbbbb } /* Text.Whitespace */
     .mb { color: #666666 } /* Literal.Number.Bin */
     .mf { color: #666666 } /* Literal.Number.Float */
     .mh { color: #666666 } /* Literal.Number.Hex */
     .mi { color: #666666 } /* Literal.Number.Integer */
     .mo { color: #666666 } /* Literal.Number.Oct */
     .sa { color: #BA2121 } /* Literal.String.Affix */
     .sb { color: #BA2121 } /* Literal.String.Backtick */
     .sc { color: #BA2121 } /* Literal.String.Char */
     .dl { color: #BA2121 } /* Literal.String.Delimiter */
     .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
     .s2 { color: #BA2121 } /* Literal.String.Double */
     .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
     .sh { color: #BA2121 } /* Literal.String.Heredoc */
     .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
     .sx { color: #008000 } /* Literal.String.Other */
     .sr { color: #BB6688 } /* Literal.String.Regex */
     .s1 { color: #BA2121 } /* Literal.String.Single */
     .ss { color: #19177C } /* Literal.String.Symbol */
     .bp { color: #008000 } /* Name.Builtin.Pseudo */
     .fm { color: #0000FF } /* Name.Function.Magic */
     .vc { color: #19177C } /* Name.Variable.Class */
     .vg { color: #19177C } /* Name.Variable.Global */
     .vi { color: #19177C } /* Name.Variable.Instance */
     .vm { color: #19177C } /* Name.Variable.Magic */
     .il { color: #666666 } /* Literal.Number.Integer.Long */
 
 }
 
 /* customized pre blocks for markdown/rst */
 pre.literal-block, .codehilite pre{
     padding: @padding;
     border: 1px solid @grey6;
     .border-radius(@border-radius);
     background-color: @grey7;
 }
 
 
 /* START NEW CODE BLOCK CSS */
 
 @cb-line-height: 18px;
 @cb-line-code-padding: 10px;
 @cb-text-padding: 5px;
 
 @pill-padding: 2px 7px;
 @pill-padding-small: 2px 2px 1px 2px;
 
 input.filediff-collapse-state {
     display: none;
 
     &:checked + .filediff { /* file diff is collapsed */
         .cb {
             display: none
         }
         .filediff-collapse-indicator {
             float: left;
             cursor: pointer;
             margin: 1px -5px;
         }
         .filediff-collapse-indicator:before {
             content: '\f105';
         }
 
         .filediff-menu {
             display: none;
         }
 
     }
 
     &+ .filediff { /* file diff is expanded */
 
         .filediff-collapse-indicator {
             float: left;
             cursor: pointer;
             margin: 1px -5px;
         }
         .filediff-collapse-indicator:before {
             content: '\f107';
         }
 
         .filediff-menu {
             display: block;
         }
 
         margin: 10px 0;
         &:nth-child(2) {
             margin: 0;
         }
     }
 }
 
 .filediffs .anchor {
     display: block;
     height: 40px;
     margin-top: -40px;
     visibility: hidden;
 }
 
 .filediffs .anchor:nth-of-type(1) {
     display: block;
     height: 80px;
     margin-top: -80px;
     visibility: hidden;
 }
 
 .cs_files {
     clear: both;
 }
 
 #diff-file-sticky{
     will-change: min-height;
     height: 80px;
 }
 
 .sidebar__inner{
     transform: translate(0, 0); /* For browsers don't support translate3d. */
     transform: translate3d(0, 0, 0);
     will-change: position, transform;
     height: 65px;
     background-color: #fff;
     padding: 5px 0px;
 }
 
 .sidebar__bar {
     padding: 5px 0px 0px 0px
 }
 
 .fpath-placeholder {
     clear: both;
     visibility: hidden
 }
 
 .is-affixed {
 
     .sidebar__inner {
         z-index: 30;
     }
 
     .sidebar_inner_shadow {
         position: fixed;
         top: 75px;
         right: -100%;
         left: -100%;
         z-index: 30;
         display: block;
         height: 5px;
         content: "";
         background: linear-gradient(rgba(0, 0, 0, 0.075), rgba(0, 0, 0, 0.001)) repeat-x 0 0;
         border-top: 1px solid rgba(0, 0, 0, 0.15);
     }
 
     .fpath-placeholder {
         visibility: visible !important;
     }
 }
 
 .diffset-menu {
 
 }
 
 #todo-box {
     clear:both;
     display: none;
     text-align: right
 }
 
 .diffset {
     margin: 0px auto;
     .diffset-heading {
         border: 1px solid @grey5;
         margin-bottom: -1px;
         // margin-top: 20px;
         h2 {
             margin: 0;
             line-height: 38px;
             padding-left: 10px;
         }
         .btn {
             margin: 0;
         }
         background: @grey6;
         display: block;
         padding: 5px;
     }
     .diffset-heading-warning {
         background: @alert3-inner;
         border: 1px solid @alert3;
     }
     &.diffset-comments-disabled {
         .cb-comment-box-opener, .comment-inline-form, .cb-comment-add-button {
             display: none !important;
         }
     }
 }
 
 .filelist {
     .pill {
         display: block;
         float: left;
         padding: @pill-padding-small;
     }
 }
 
 .pill {
     display: block;
     float: left;
     padding: @pill-padding;
 }
 
 .pill-group {
     .pill {
         opacity: .8;
         margin-right: 3px;
         font-size: 12px;
         font-weight: normal;
         min-width: 30px;
         text-align: center;
 
         &:first-child {
             border-radius: @border-radius 0 0 @border-radius;
         }
         &:last-child {
             border-radius: 0 @border-radius @border-radius 0;
         }
         &:only-child {
             border-radius: @border-radius;
             margin-right: 0;
         }
     }
 }
 
 /* Main comments*/
 #comments {
     .comment-selected {
         border-left: 6px solid @comment-highlight-color;
         padding-left: 3px;
         margin-left: -9px;
     }
 }
 
 .filediff {
     border: 1px solid @grey5;
 
     /* START OVERRIDES */
     .code-highlight {
         border: none;  // TODO: remove this border from the global
                        // .code-highlight, it doesn't belong there
     }
     label {
         margin: 0; // TODO: remove this margin definition from global label
                    // it doesn't belong there - if margin on labels
                    // are needed for a form they should be defined
                    // in the form's class
     }
     /* END OVERRIDES */
 
     * {
         box-sizing: border-box;
     }
+
+    .on-hover-icon {
+        visibility: hidden;
+    }
+
     .filediff-anchor {
         visibility: hidden;
     }
     &:hover {
         .filediff-anchor {
             visibility: visible;
         }
+        .on-hover-icon {
+            visibility: visible;
+        }
     }
 
     .filediff-heading {
         cursor: pointer;
         display: block;
         padding: 10px 10px;
     }
     .filediff-heading:after {
         content: "";
         display: table;
         clear: both;
     }
     .filediff-heading:hover {
         background: #e1e9f4 !important;
     }
 
     .filediff-menu {
         text-align: right;
         padding: 5px 5px 5px 0px;
         background: @grey7;
 
         &> a,
         &> span {
             padding: 1px;
         }
     }
 
     .filediff-collapse-button, .filediff-expand-button {
         cursor: pointer;
     }
     .filediff-collapse-button {
         display: inline;
     }
     .filediff-expand-button {
         display: none;
     }
     .filediff-collapsed .filediff-collapse-button {
         display: none;
     }
     .filediff-collapsed .filediff-expand-button {
         display: inline;
     }
 
     /**** COMMENTS ****/
 
     .filediff-menu {
         .show-comment-button {
             display: none;
         }
     }
     &.hide-comments {
         .inline-comments {
             display: none;
         }
         .filediff-menu {
             .show-comment-button {
                 display: inline;
             }
             .hide-comment-button {
                 display: none;
             }
         }
     }
 
     .hide-line-comments {
         .inline-comments {
             display: none;
         }
     }
 
     /**** END COMMENTS ****/
 
 }
 
 
 .op-added {
     color: @alert1;
 }
 
 .op-deleted {
     color: @alert2;
 }
 
 .filediff, .filelist {
 
     .pill {
         &[op="name"] {
             background: none;
             opacity: 1;
             color: white;
         }
         &[op="limited"] {
             background: @grey2;
             color: white;
         }
         &[op="binary"] {
             background: @color7;
             color: white;
         }
         &[op="modified"] {
             background: @alert1;
             color: white;
         }
         &[op="renamed"] {
             background: @color4;
             color: white;
         }
         &[op="copied"] {
             background: @color4;
             color: white;
         }
         &[op="mode"] {
             background: @grey3;
             color: white;
         }
         &[op="symlink"] {
             background: @color8;
             color: white;
         }
 
         &[op="added"] { /* added lines */
             background: @alert1;
             color: white;
         }
         &[op="deleted"] { /* deleted lines */
             background: @alert2;
             color: white;
         }
 
         &[op="created"] { /* created file */
             background: @alert1;
             color: white;
         }
         &[op="removed"] { /* deleted file */
             background: @color5;
             color: white;
         }
     }
 }
 
 
 .filediff-outdated {
     padding: 8px 0;
 
     .filediff-heading {
         opacity: .5;
     }
 }
 
 table.cb {
     width: 100%;
     border-collapse: collapse;
 
     .cb-text {
         padding: @cb-text-padding;
     }
     .cb-hunk {
         padding: @cb-text-padding;
     }
     .cb-expand {
         display: none;
     }
     .cb-collapse {
         display: inline;
     }
     &.cb-collapsed {
         .cb-line {
             display: none;
         }
         .cb-expand {
             display: inline;
         }
         .cb-collapse {
             display: none;
         }
         .cb-hunk {
             display: none;
         }
     }
 
     /* intentionally general selector since .cb-line-selected must override it
        and they both use !important since the td itself may have a random color
        generated by annotation blocks. TLDR: if you change it, make sure
        annotated block selection and line selection in file view still work */
     .cb-line-fresh .cb-content {
         background: white !important;
     }
     .cb-warning {
         background: #fff4dd;
     }
 
     &.cb-diff-sideside {
         td {
             &.cb-content {
                 width: 50%;
             }
         }
     }
 
     tr {
         &.cb-annotate {
             border-top: 1px solid #eee;
         }
 
         &.cb-comment-info {
             border-top: 1px solid #eee;
             color: rgba(0, 0, 0, 0.3);
             background: #edf2f9;
 
             td {
 
             }
         }
 
         &.cb-hunk {
             font-family: @text-monospace;
             color: rgba(0, 0, 0, 0.3);
 
             td {
                 &:first-child {
                     background: #edf2f9;
                 }
                 &:last-child {
                     background: #f4f7fb;
                 }
             }
         }
     }
 
 
     td {
         vertical-align: top;
         padding: 0;
 
         &.cb-content {
             font-size: 12.35px;
 
             &.cb-line-selected .cb-code {
                 background: @comment-highlight-color !important;
             }
 
             span.cb-code {
                 line-height: @cb-line-height;
                 padding-left: @cb-line-code-padding;
                 padding-right: @cb-line-code-padding;
                 display: block;
                 white-space: pre-wrap;
                 font-family: @text-monospace;
                 word-break: break-all;
                 .nonl {
                     color: @color5;
                 }
                 .cb-action {
                     &:before {
                         content: "  ";
                     }
                     &.cb-deletion:before {
                         content: "- ";
                     }
                     &.cb-addition:before {
                         content: "+ ";
                     }
                 }
             }
 
             &> button.cb-comment-box-opener {
 
                 padding: 2px 2px 1px 3px;
                 margin-left: -6px;
                 margin-top: -1px;
 
                 border-radius: @border-radius;
                 position: absolute;
                 display: none;
             }
             .cb-comment {
                 margin-top: 10px;
                 white-space: normal;
             }
         }
         &:hover {
             button.cb-comment-box-opener {
                 display: block;
             }
             &+ td button.cb-comment-box-opener {
                 display: block
             }
         }
 
         &.cb-data {
             text-align: right;
             width: 30px;
             font-family: @text-monospace;
 
             .icon-comment {
                 cursor: pointer;
             }
             &.cb-line-selected {
                 background: @comment-highlight-color !important;
             }
             &.cb-line-selected > div {
                 display: block;
                 background: @comment-highlight-color !important;
                 line-height: @cb-line-height;
                 color: rgba(0, 0, 0, 0.3);
             }
         }
 
         &.cb-lineno {
             padding: 0;
             width: 50px;
             color: rgba(0, 0, 0, 0.3);
             text-align: right;
             border-right: 1px solid #eee;
             font-family: @text-monospace;
             -webkit-user-select: none;
             -moz-user-select: none;
             user-select: none;
 
             a::before {
                 content: attr(data-line-no);
             }
             &.cb-line-selected {
                 background: @comment-highlight-color !important;
             }
 
             a {
                 display: block;
                 padding-right: @cb-line-code-padding;
                 padding-left: @cb-line-code-padding;
                 line-height: @cb-line-height;
                 color: rgba(0, 0, 0, 0.3);
             }
         }
 
         &.cb-empty {
             background: @grey7;
         }
 
         ins {
             color: black;
             background: #a6f3a6;
             text-decoration: none;
         }
         del {
             color: black;
             background: #f8cbcb;
             text-decoration: none;
         }
         &.cb-addition {
             background: #ecffec;
 
             &.blob-lineno {
                 background: #ddffdd;
             }
         }
         &.cb-deletion {
             background: #ffecec;
 
             &.blob-lineno {
                 background: #ffdddd;
             }
         }
         &.cb-annotate-message-spacer {
              width:8px;
              padding: 1px 0px 0px 3px;
         }
         &.cb-annotate-info {
             width: 320px;
             min-width: 320px;
             max-width: 320px;
             padding: 5px 2px;
             font-size: 13px;
 
             .cb-annotate-message {
                 padding: 2px 0px 0px 0px;
                 white-space: pre-line;
                 overflow: hidden;
             }
             .rc-user {
                 float: none;
                 padding: 0 6px 0 17px;
                 min-width: unset;
                 min-height: unset;
             }
         }
 
         &.cb-annotate-revision {
             cursor: pointer;
             text-align: right;
             padding: 1px 3px 0px 3px;
         }
     }
 }

rhodecode/public/css/main.less

@@ -1,3060 +1,3067 b''
 //Primary CSS
 
 //--- IMPORTS ------------------//
 
 @import 'helpers';
 @import 'mixins';
 @import 'rcicons';
 @import 'variables';
 @import 'bootstrap-variables';
 @import 'form-bootstrap';
 @import 'codemirror';
 @import 'legacy_code_styles';
 @import 'readme-box';
 @import 'progress-bar';
 
 @import 'type';
 @import 'alerts';
 @import 'buttons';
 @import 'tags';
 @import 'code-block';
 @import 'examples';
 @import 'login';
 @import 'main-content';
 @import 'select2';
 @import 'comments';
 @import 'panels-bootstrap';
 @import 'panels';
 @import 'deform';
 @import 'tooltips';
 @import 'sweetalert2';
 
 
 //--- BASE ------------------//
 .noscript-error {
   top: 0;
   left: 0;
   width: 100%;
   z-index: 101;
   text-align: center;
   font-size: 120%;
   color: white;
   background-color: @alert2;
   padding: 5px 0 5px 0;
   font-weight: @text-semibold-weight;
   font-family: @text-semibold;
 }
 
 html {
     display: table;
     height: 100%;
     width: 100%;
 }
 
 body {
     display: table-cell;
     width: 100%;
 }
 
 //--- LAYOUT ------------------//
 
 .hidden{
 	display: none !important;
 }
 
 .box{
 	float: left;
 	width: 100%;
 }
 
 .browser-header {
     clear: both;
 }
 .main {
   clear: both;
   padding:0 0 @pagepadding;
   height: auto;
 
 	&:after { //clearfix
 		content:"";
 		clear:both;
 		width:100%;
 		display:block;
 	}
 }
 
 .action-link{
 	margin-left: @padding;
 	padding-left: @padding;
 	border-left: @border-thickness solid @border-default-color;
 }
 
 .cursor-pointer {
   cursor: pointer;
 }
 
 input + .action-link, .action-link.first{
 	border-left: none;
 }
 
 .action-link.last{
 	margin-right: @padding;
 	padding-right: @padding;
 }
 
 .action-link.active,
 .action-link.active a{
 	color: @grey4;
 }
 
 .action-link.disabled {
     color: @grey4;
     cursor: inherit;
 }
 
+.grey-link-action {
+  cursor: pointer;
+  &:hover {
+      color: @grey2;
+  }
+  color: @grey4;
+}
 
 .clipboard-action {
   cursor: pointer;
   margin-left: 5px;
 
   &:not(.no-grey) {
 
     &:hover {
       color: @grey2;
     }
     color: @grey4;
   }
 }
 
 ul.simple-list{
 	list-style: none;
 	margin: 0;
 	padding: 0;
 }
 
 .main-content {
 	padding-bottom: @pagepadding;
 }
 
 .wide-mode-wrapper {
     max-width:4000px !important;
 }
 
 .wrapper {
 	position: relative;
 	max-width: @wrapper-maxwidth;
 	margin: 0 auto;
 }
 
 #content {
     clear: both;
     padding: 0 @contentpadding;
 }
 
 .advanced-settings-fields{
 	input{
 		margin-left: @textmargin;
 		margin-right: @padding/2;
 	}
 }
 
 .cs_files_title {
     margin: @pagepadding 0 0;
 }
 
 input.inline[type="file"] {
 	display: inline;
 }
 
 .error_page {
     margin: 10% auto;
 
     h1 {
         color: @grey2;
     }
 
     .alert {
         margin: @padding 0;
     }
 
     .error-branding {
       color: @grey4;
       font-weight: @text-semibold-weight;
       font-family: @text-semibold;
     }
 
     .error_message {
         font-family: @text-regular;
     }
 
     .sidebar {
         min-height: 275px;
         margin: 0;
         padding: 0 0 @sidebarpadding @sidebarpadding;
         border: none;
     }
 
     .main-content {
         position: relative;
         margin: 0 @sidebarpadding @sidebarpadding;
         padding: 0 0 0 @sidebarpadding;
         border-left: @border-thickness solid @grey5;
 
         @media (max-width:767px) {
             clear: both;
             width: 100%;
             margin: 0;
             border: none;
         }
     }
 
     .inner-column {
         float: left;
         width: 29.75%;
         min-height: 150px;
         margin: @sidebarpadding 2% 0 0;
         padding: 0 2% 0 0;
         border-right: @border-thickness solid @grey5;
 
         @media (max-width:767px) {
             clear: both;
             width: 100%;
             border: none;
         }
 
         ul {
             padding-left: 1.25em;
         }
 
         &:last-child {
             margin: @sidebarpadding 0 0;
             border: none;
         }
 
         h4 {
           margin: 0 0 @padding;
           font-weight: @text-semibold-weight;
           font-family: @text-semibold;
         }
     }
 }
 .error-page-logo {
     width: 130px;
     height: 160px;
 }
 
 // HEADER
 .header {
 
     // TODO: johbo: Fix login pages, so that they work without a min-height
     // for the header and then remove the min-height. I chose a smaller value
     // intentionally here to avoid rendering issues in the main navigation.
     min-height: 49px;
     min-width: 1024px;
 
 	position: relative;
 	vertical-align: bottom;
 	padding: 0 @header-padding;
 	background-color: @grey1;
 	color: @grey5;
 
 	.title {
 		overflow: visible;
 	}
 
 	&:before,
 	&:after {
 		content: "";
 		clear: both;
 		width: 100%;
 	}
 
 	// TODO: johbo: Avoids breaking "Repositories" chooser
 	.select2-container .select2-choice .select2-arrow {
 	    display: none;
 	}
 }
 
 #header-inner {
 	&.title {
 		margin: 0;
 	}
 	&:before,
 	&:after {
 		content: "";
 		clear: both;
 	}
 }
 
 // Gists
 #files_data {
     clear: both; //for firefox
     padding-top: 10px;
 }
 
 #gistid {
     margin-right: @padding;
 }
 
 // Global Settings Editor
 .textarea.editor {
 	float: left;
 	position: relative;
 	max-width: @texteditor-width;
 
 	select {
 		position: absolute;
 		top:10px;
 		right:0;
 	}
 
 	.CodeMirror {
 		margin: 0;
 	}
 
 	.help-block {
 		margin: 0 0 @padding;
 		padding:.5em;
 		background-color: @grey6;
         &.pre-formatting {
             white-space: pre;
         }
 	}
 }
 
 ul.auth_plugins {
 	margin: @padding 0 @padding @legend-width;
 	padding: 0;
 
 	li {
 		margin-bottom: @padding;
         line-height: 1em;
 		list-style-type: none;
 
 		.auth_buttons .btn {
 			margin-right: @padding;
 		}
 
 	}
 }
 
 
 // My Account PR list
 
 #show_closed {
     margin: 0 1em 0 0;
 }
 
 #pull_request_list_table {
     .closed {
         background-color: @grey6;
     }
 
     .state-creating,
     .state-updating,
     .state-merging
     {
         background-color: @grey6;
     }
 
     .td-status {
         padding-left: .5em;
     }
     .log-container .truncate {
         height: 2.75em;
         white-space: pre-line;
     }
     table.rctable .user {
         padding-left: 0;
     }
     table.rctable {
         td.td-description,
         .rc-user {
             min-width: auto;
         }
     }
 }
 
 // Pull Requests
 
 .pullrequests_section_head {
   display: block;
   clear: both;
   margin: @padding 0;
   font-weight: @text-bold-weight;
   font-family: @text-bold;
 }
 
 .pr-commit-flow  {
     position: relative;
     font-weight: 600;
 
     .tag {
         display: inline-block;
         margin: 0 1em .5em 0;
     }
 
     .clone-url {
         display: inline-block;
         margin: 0 0 .5em 0;
         padding: 0;
         line-height: 1.2em;
     }
 }
 
 .pr-mergeinfo {
       min-width: 95% !important;
       padding: 0 !important;
       border: 0;
 }
 .pr-mergeinfo-copy {
     padding: 0 0;
 }
 
 .pr-pullinfo {
       min-width: 95% !important;
       padding: 0 !important;
       border: 0;
 }
 .pr-pullinfo-copy {
     padding: 0 0;
 }
 
 .pr-title-input {
   width: 100%;
   font-size: 18px;
   margin:  0 0 4px 0;
   padding: 0;
   line-height: 1.7em;
   color: @text-color;
   letter-spacing: .02em;
   font-weight: @text-bold-weight;
   font-family: @text-bold;
 
   &:hover {
     box-shadow: none;
   }
 }
 
 #pr-title {
   input {
     border: 1px transparent;
     color: black;
     opacity: 1;
     background: #fff;
     font-size: 18px;
   }
 }
 
 .pr-title-closed-tag {
     font-size: 16px;
 }
 
 #pr-desc {
   padding: 10px 0;
 
   .markdown-block {
     padding: 0;
     margin-bottom: -30px;
   }
 }
 
 #pullrequest_title {
     width: 100%;
     box-sizing: border-box;
 }
 
 #pr_open_message {
     border: @border-thickness solid #fff;
     border-radius: @border-radius;
     text-align: left;
     overflow: hidden;
     white-space: pre-line;
 }
 
 .pr-details-title {
     height: 16px
 }
 
 .pr-details-title-author-pref {
     padding-right: 10px
 }
 
 .label-pr-detail {
   display: table-cell;
   width: 120px;
   padding-top: 7.5px;
   padding-bottom: 7.5px;
   padding-right: 7.5px;
 }
 
 .source-details ul {
   padding: 10px 16px;
 }
 
 .source-details-action {
   color: @grey4;
   font-size: 11px
 }
 
 .pr-submit-button {
     float: right;
     margin: 0 0 0 5px;
 }
 
 .pr-spacing-container {
     padding: 20px;
     clear: both
 }
 
 #pr-description-input {
     margin-bottom: 0;
 }
 
 .pr-description-label {
     vertical-align: top;
 }
 
 #open_edit_pullrequest {
   padding: 0;
 }
 
 #close_edit_pullrequest {
 
 }
 
 #delete_pullrequest {
     clear: inherit;
 
   form {
       display: inline;
   }
 
 }
 
 .perms_section_head {
     min-width: 625px;
 
     h2 {
         margin-bottom: 0;
     }
 
     .label-checkbox {
         float: left;
     }
 
     &.field {
         margin: @space 0 @padding;
     }
 
     &:first-child.field {
         margin-top: 0;
 
         .label {
             margin-top: 0;
             padding-top: 0;
         }
 
         .radios {
             padding-top: 0;
         }
     }
 
     .radios {
         position: relative;
         width: 505px;
     }
 }
 
 //--- MODULES ------------------//
 
 
 // Server Announcement
 #server-announcement {
   width: 95%;
   margin: @padding auto;
   padding: @padding;
   border-width: 2px;
   border-style: solid;
   .border-radius(2px);
   font-weight: @text-bold-weight;
   font-family: @text-bold;
 
   &.info    { border-color: @alert4; background-color: @alert4-inner; }
   &.warning { border-color: @alert3; background-color: @alert3-inner; }
   &.error   { border-color: @alert2; background-color: @alert2-inner; }
   &.success { border-color: @alert1; background-color: @alert1-inner; }
   &.neutral { border-color: @grey3; background-color: @grey6; }
 }
 
 // Fixed Sidebar Column
 .sidebar-col-wrapper {
     padding-left: @sidebar-all-width;
 
     .sidebar {
         width: @sidebar-width;
         margin-left: -@sidebar-all-width;
     }
 }
 
 .sidebar-col-wrapper.scw-small {
     padding-left: @sidebar-small-all-width;
 
     .sidebar {
         width: @sidebar-small-width;
         margin-left: -@sidebar-small-all-width;
     }
 }
 
 
 // FOOTER
 #footer {
 	padding: 0;
 	text-align: center;
 	vertical-align: middle;
 	color: @grey2;
     font-size: 11px;
 
 	p {
 		margin: 0;
 		padding: 1em;
 		line-height: 1em;
 	}
 
 	.server-instance { //server instance
 		display: none;
 	}
 
 	.title {
 		float: none;
 		margin: 0 auto;
 	}
 }
 
 button.close {
 	padding: 0;
 	cursor: pointer;
 	background: transparent;
 	border: 0;
 	.box-shadow(none);
 	-webkit-appearance: none;
 }
 
 .close {
 	float: right;
 	font-size: 21px;
 	font-family: @text-bootstrap;
 	line-height: 1em;
 	font-weight: bold;
 	color: @grey2;
 
 	&:hover,
 	&:focus {
 		color: @grey1;
 		text-decoration: none;
 		cursor: pointer;
 	}
 }
 
 // GRID
 .sorting,
 .sorting_desc,
 .sorting_asc {
 	cursor: pointer;
 }
 .sorting_desc:after {
 	content: "\00A0\25B2";
 	font-size: .75em;
 }
 .sorting_asc:after {
 	content: "\00A0\25BC";
 	font-size: .68em;
 }
 
 
 .user_auth_tokens {
 
     &.truncate {
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
     }
 
 	.fields .field .input {
 		margin: 0;
 	}
 
 	input#description {
 		width: 100px;
 		margin: 0;
 	}
 
 	.drop-menu {
 	    // TODO: johbo: Remove this, should work out of the box when
 	    // having multiple inputs inline
 		margin: 0 0 0 5px;
 	}
 }
 #user_list_table {
   .closed {
     background-color: @grey6;
   }
 }
 
 
 input, textarea {
 	&.disabled {
 		opacity: .5;
 	}
 
     &:hover {
         border-color: @grey3;
         box-shadow: @button-shadow;
     }
 
     &:focus {
         border-color: @rcblue;
         box-shadow: @button-shadow;
     }
 }
 
 // remove extra padding in firefox
 input::-moz-focus-inner { border:0; padding:0 }
 
 .adjacent input {
 	margin-bottom: @padding;
 }
 
 .permissions_boxes {
 	display: block;
 }
 
 //FORMS
 
 .medium-inline,
 input#description.medium-inline {
 	display: inline;
 	width: @medium-inline-input-width;
 	min-width: 100px;
 }
 
 select {
 	//reset
 	-webkit-appearance: none;
 	-moz-appearance: none;
 
 	display: inline-block;
 	height: 28px;
 	width: auto;
 	margin: 0 @padding @padding 0;
 	padding: 0 18px 0 8px;
 	line-height:1em;
 	font-size: @basefontsize;
 	border: @border-thickness solid @grey5;
     border-radius: @border-radius;
 	background:white url("../images/dt-arrow-dn.png") no-repeat 100% 50%;
 	color: @grey4;
     box-shadow: @button-shadow;
 
 	&:after {
 		content: "\00A0\25BE";
 	}
 
 	&:focus, &:hover {
 		outline: none;
         border-color: @grey4;
         color: @rcdarkblue;
 	}
 }
 
 option {
 	&:focus {
 		outline: none;
 	}
 }
 
 input,
 textarea {
 	padding: @input-padding;
 	border: @input-border-thickness solid @border-highlight-color;
 	.border-radius (@border-radius);
 	font-family: @text-light;
 	font-size: @basefontsize;
 
 	&.input-sm {
 		padding: 5px;
 	}
 
 	&#description {
 		min-width: @input-description-minwidth;
 		min-height: 1em;
 		padding: 10px;
 	}
 }
 
 .field-sm {
     input,
     textarea {
         padding: 5px;
     }
 }
 
 textarea {
 	display: block;
 	clear: both;
 	width: 100%;
 	min-height: 100px;
 	margin-bottom: @padding;
     .box-sizing(border-box);
     overflow: auto;
 }
 
 label {
 	font-family: @text-light;
 }
 
 // GRAVATARS
 // centers gravatar on username to the right
 
 .gravatar {
     display: inline;
     min-width: 16px;
     min-height: 16px;
     margin: -5px 0;
     padding: 0;
     line-height: 1em;
     box-sizing: content-box;
     border-radius: 50%;
 
     &.gravatar-large {
         margin: -0.5em .25em -0.5em 0;
     }
 
     & + .user {
         display: inline;
         margin: 0;
         padding: 0 0 0 .17em;
         line-height: 1em;
     }
 
     & + .no-margin {
       margin: 0
     }
 
 }
 
 .user-inline-data {
     display: inline-block;
     float: left;
     padding-left: .5em;
     line-height: 1.3em;
 }
 
 .rc-user { // gravatar + user wrapper
     float: left;
     position: relative;
     min-width: 100px;
     max-width: 200px;
     min-height: (@gravatar-size + @border-thickness * 2); // account for border
     display: block;
     padding: 0 0 0 (@gravatar-size  + @basefontsize/4);
 
 
     .gravatar {
         display: block;
         position: absolute;
         top: 0;
         left: 0;
         min-width:  @gravatar-size;
         min-height: @gravatar-size;
         margin: 0;
     }
 
     .user {
         display: block;
         max-width: 175px;
         padding-top: 2px;
         overflow: hidden;
         text-overflow: ellipsis;
     }
 }
 
 .gist-gravatar,
 .journal_container {
     .gravatar-large {
         margin: 0 .5em -10px 0;
     }
 }
 
 .gist-type-fields {
     line-height: 30px;
     height: 30px;
 
     .gist-type-fields-wrapper {
         vertical-align: middle;
         display: inline-block;
         line-height: 25px;
     }
 }
 
 // ADMIN SETTINGS
 
 // Tag Patterns
 .tag_patterns {
 	.tag_input {
 		margin-bottom: @padding;
 	}
 }
 
 .locked_input {
     position: relative;
 
     input {
         display: inline;
         margin: 3px 5px 0px 0px;
     }
 
     br {
         display: none;
     }
 
     .error-message {
         float: left;
         width: 100%;
     }
 
     .lock_input_button {
         display: inline;
     }
 
     .help-block {
         clear: both;
     }
 }
 
 // Notifications
 
 .notifications_buttons {
 	margin: 0 0 @space 0;
 	padding: 0;
 
 	.btn {
 		display: inline-block;
 	}
 }
 
 .notification-list {
 
 	div {
 		vertical-align: middle;
 	}
 
 	.container {
 		display: block;
 		margin: 0 0 @padding 0;
 	}
 
 	.delete-notifications {
 		margin-left: @padding;
 		text-align: right;
         cursor: pointer;
 	}
 
 	.read-notifications {
 		margin-left: @padding/2;
 		text-align: right;
 		width: 35px;
         cursor: pointer;
 	}
 
 	.icon-minus-sign {
 		color: @alert2;
 	}
 
 	.icon-ok-sign {
 		color: @alert1;
 	}
 }
 
 .user_settings {
 	float: left;
 	clear: both;
 	display: block;
 	width: 100%;
 
 	.gravatar_box {
 		margin-bottom: @padding;
 
 		&:after {
 			content: " ";
 			clear: both;
 			width: 100%;
 		}
 	}
 
 	.fields .field {
 		clear: both;
 	}
 }
 
 .advanced_settings {
 	margin-bottom: @space;
 
 	.help-block {
 		margin-left: 0;
 	}
 
 	button + .help-block {
 		margin-top: @padding;
 	}
 }
 
 // admin settings radio buttons and labels
 .label-2 {
 	float: left;
 	width: @label2-width;
 
 	label {
 		color: @grey1;
 	}
 }
 .checkboxes {
 	float: left;
 	width: @checkboxes-width;
 	margin-bottom: @padding;
 
 	.checkbox {
 		width: 100%;
 
 		label {
 			margin: 0;
 			padding: 0;
 		}
 	}
 
 	.checkbox + .checkbox {
 		display: inline-block;
 	}
 
 	label {
 		margin-right: 1em;
 	}
 }
 
 // CHANGELOG
 .container_header {
     float: left;
 	display: block;
 	width: 100%;
 	margin: @padding 0 @padding;
 
     #filter_changelog {
         float: left;
         margin-right: @padding;
     }
 
     .breadcrumbs_light {
         display: inline-block;
     }
 }
 
 .info_box {
 	float: right;
 }
 
 
 
 #graph_content{
 
     // adjust for table headers so that graph renders properly
     //           #graph_nodes padding - table cell padding
     padding-top: (@space - (@basefontsize * 2.4));
 
     &.graph_full_width {
         width: 100%;
         max-width: 100%;
     }
 }
 
 #graph {
 
     .pagination-left {
         float: left;
         clear: both;
     }
 
     .log-container {
         max-width: 345px;
 
         .message{
             max-width: 340px;
         }
     }
 
     .graph-col-wrapper {
 
         #graph_nodes {
             width: 100px;
             position: absolute;
             left: 70px;
             z-index: -1;
         }
     }
 
     .load-more-commits {
         text-align: center;
     }
     .load-more-commits:hover {
         background-color: @grey7;
     }
     .load-more-commits {
       a {
         display: block;
       }
     }
 }
 
 .obsolete-toggle {
     line-height: 30px;
     margin-left: -15px;
 }
 
 #rev_range_container, #rev_range_clear, #rev_range_more {
     margin-top: -5px;
     margin-bottom: -5px;
 }
 
 #filter_changelog {
     float: left;
 }
 
 
 //--- THEME ------------------//
 
 #logo {
 	float: left;
 	margin: 9px 0 0 0;
 
     .header {
     	background-color: transparent;
     }
 
     a {
     	display: inline-block;
     }
 
     img {
     	height:30px;
     }
 }
 
 .logo-wrapper {
 	float:left;
 }
 
 .branding {
 	float: left;
 	padding: 9px 2px;
 	line-height: 1em;
 	font-size: @navigation-fontsize;
 
     a {
       color: @grey5
     }
     @media screen and (max-width: 1200px) {
       display: none;
     }
 }
 
 img {
 	border: none;
 	outline: none;
 }
  user-profile-header
 label {
 
     input[type="checkbox"] {
         margin-right: 1em;
     }
     input[type="radio"] {
         margin-right: 1em;
     }
 }
 
 .review-status {
     &.under_review {
         color: @alert3;
     }
     &.approved {
         color: @alert1;
     }
     &.rejected,
     &.forced_closed{
         color: @alert2;
     }
     &.not_reviewed {
         color: @grey5;
     }
 }
 
 .review-status-under_review {
   color: @alert3;
 }
 .status-tag-under_review {
   border-color: @alert3;
 }
 
 .review-status-approved {
   color: @alert1;
 }
 .status-tag-approved {
   border-color: @alert1;
 }
 
 .review-status-rejected,
 .review-status-forced_closed {
   color: @alert2;
 }
 .status-tag-rejected,
 .status-tag-forced_closed {
   border-color: @alert2;
 }
 
 .review-status-not_reviewed {
   color: @grey5;
 }
 .status-tag-not_reviewed {
   border-color: @grey5;
 }
 
 .test_pattern_preview {
 	margin: @space 0;
 
 	p {
         margin-bottom: 0;
 		border-bottom: @border-thickness solid @border-default-color;
 		color: @grey3;
 	}
 
 	.btn {
 		margin-bottom: @padding;
 	}
 }
 #test_pattern_result {
     display: none;
     &:extend(pre);
     padding: .9em;
     color: @grey3;
     background-color: @grey7;
     border-right: @border-thickness solid @border-default-color;
     border-bottom: @border-thickness solid @border-default-color;
     border-left: @border-thickness solid @border-default-color;
 }
 
 #repo_vcs_settings {
     #inherit_overlay_vcs_default {
         display: none;
     }
     #inherit_overlay_vcs_custom {
         display: custom;
     }
     &.inherited {
         #inherit_overlay_vcs_default {
             display: block;
         }
         #inherit_overlay_vcs_custom {
             display: none;
         }
     }
 }
 
 .issue-tracker-link {
 	color: @rcblue;
 }
 
 // Issue Tracker Table Show/Hide
 #repo_issue_tracker {
     #inherit_overlay {
         display: none;
     }
     #custom_overlay {
         display: custom;
     }
     &.inherited {
         #inherit_overlay {
             display: block;
         }
         #custom_overlay {
             display: none;
         }
     }
 }
 table.issuetracker {
     &.readonly {
         tr, td {
             color: @grey3;
         }
     }
     .edit {
         display: none;
     }
     .editopen {
         .edit {
             display: inline;
         }
         .entry {
             display: none;
         }
     }
     tr td.td-action {
         min-width: 117px;
     }
     td input {
         max-width: none;
         min-width: 30px;
         width: 80%;
     }
     .issuetracker_pref input {
         width: 40%;
     }
     input.edit_issuetracker_update {
         margin-right: 0;
         width: auto;
     }
 }
 
 table.integrations {
     .td-icon {
         width: 20px;
         .integration-icon {
             height: 20px;
             width: 20px;
         }
     }
 }
 
 .integrations {
     a.integration-box {
         color: @text-color;
         &:hover {
             .panel {
                 background: #fbfbfb;
             }
         }
         .integration-icon {
           width: 30px;
           height: 30px;
           margin-right: 20px;
           float: left;
         }
 
         .panel-body {
             padding: 10px;
         }
         .panel {
             margin-bottom: 10px;
         }
         h2 {
             display: inline-block;
             margin: 0;
             min-width: 140px;
         }
     }
     a.integration-box.dummy-integration {
       color: @grey4
     }
 }
 
 //Permissions Settings
 #add_perm {
     margin: 0 0 @padding;
 	cursor: pointer;
 }
 
 .perm_ac {
     input {
         width: 95%;
     }
 }
 
 .autocomplete-suggestions {
     width: auto !important; // overrides autocomplete.js
     min-width: 278px;
     margin: 0;
     border: @border-thickness solid @grey5;
     border-radius: @border-radius;
     color: @grey2;
     background-color: white;
 }
 
 .autocomplete-qfilter-suggestions {
     width: auto !important; // overrides autocomplete.js
     max-height: 100% !important;
     min-width: 376px;
     margin: 0;
     border: @border-thickness solid @grey5;
     color: @grey2;
     background-color: white;
 }
 
 .autocomplete-selected {
     background: #F0F0F0;
 }
 
 .ac-container-wrap {
 	margin: 0;
 	padding: 8px;
 	border-bottom: @border-thickness solid @grey5;
 	list-style-type: none;
 	cursor: pointer;
 
 		&:hover {
 			background-color: @grey7;
 	}
 
 	img {
         height: @gravatar-size;
         width: @gravatar-size;
 		margin-right: 1em;
 	}
 
 	strong {
 		font-weight: normal;
 	}
 }
 
 // Settings Dropdown
 .user-menu .container {
     padding: 0 4px;
     margin: 0;
 }
 
 .user-menu .gravatar {
     cursor: pointer;
 }
 
 .codeblock {
 	margin-bottom: @padding;
     clear: both;
 
     .stats {
         overflow: hidden;
     }
 
     .message{
         textarea{
             margin: 0;
         }
     }
 
     .code-header {
     	.stats {
             line-height: 2em;
 
     		.revision_id {
     			margin-left: 0;
     		}
 			.buttons {
                 padding-right: 0;
 			}
     	}
 
         .item{
             margin-right: 0.5em;
         }
     }
 
     #editor_container {
       position: relative;
       margin: @padding 10px;
     }
 }
 
 #file_history_container {
     display: none;
 }
 
 .file-history-inner {
     margin-bottom: 10px;
 }
 
 // Pull Requests
 .summary-details {
     width: 72%;
 }
 .pr-summary {
     border-bottom: @border-thickness solid @grey5;
     margin-bottom: @space;
 }
 
 .reviewers-title {
   width: 25%;
   min-width: 200px;
 
   &.first-panel {
     margin-top: 34px;
   }
 }
 
 .reviewers {
     width: 25%;
     min-width: 200px;
 }
 .reviewers ul li {
     position: relative;
     width: 100%;
     padding-bottom: 8px;
     list-style-type: none;
 }
 
 .reviewer_entry {
   min-height: 55px;
 }
 
 .reviewers_member {
     width: 100%;
     overflow: auto;
 }
 .reviewer_reason {
     padding-left: 20px;
     line-height: 1.5em;
 }
 .reviewer_status {
     display: inline-block;
     width: 25px;
     min-width: 25px;
     height: 1.2em;
     line-height: 1em;
 }
 
 .reviewer_name {
     display: inline-block;
     max-width: 83%;
     padding-right: 20px;
     vertical-align: middle;
     line-height: 1;
 
     .rc-user {
         min-width: 0;
         margin: -2px 1em 0 0;
     }
 
     .reviewer {
         float: left;
     }
 }
 
 .reviewer_member_mandatory {
     position: absolute;
     left: 15px;
     top: 8px;
     width: 16px;
     font-size: 11px;
     margin: 0;
     padding: 0;
     color: black;
 }
 
 .reviewer_member_mandatory_remove,
 .reviewer_member_remove {
     position: absolute;
     right: 0;
     top: 0;
     width: 16px;
     margin-bottom: 10px;
     padding: 0;
     color: black;
 }
 
 .reviewer_member_mandatory_remove {
   color: @grey4;
 }
 
 .reviewer_member_status {
     margin-top: 5px;
 }
 .pr-summary #summary{
     width: 100%;
 }
 .pr-summary .action_button:hover {
     border: 0;
     cursor: pointer;
 }
 .pr-details-title {
     padding-bottom: 8px;
     border-bottom: @border-thickness solid @grey5;
 
     .action_button.disabled {
         color: @grey4;
         cursor: inherit;
     }
     .action_button {
         color: @rcblue;
     }
 }
 .pr-details-content {
     margin-top: @textmargin - 5;
     margin-bottom: @textmargin - 5;
 }
 
 .pr-reviewer-rules {
    padding: 10px 0px 20px 0px;
 }
 
 .todo-resolved {
   text-decoration: line-through;
 }
 
 .todo-table {
   width: 100%;
 
   td {
     padding: 5px 0px;
   }
 
   .td-todo-number {
     text-align: left;
     white-space: nowrap;
     width: 15%;
   }
 
   .td-todo-gravatar {
     width: 5%;
 
     img {
       margin: -3px 0;
     }
   }
 
 }
 
 .todo-comment-text-wrapper {
   display: inline-grid;
 }
 
 .todo-comment-text {
   margin-left: 5px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 
 .group_members {
     margin-top: 0;
     padding: 0;
     list-style: outside none none;
 
     img {
         height: @gravatar-size;
         width: @gravatar-size;
         margin-right: .5em;
         margin-left: 3px;
     }
 
     .to-delete {
         .user {
           text-decoration: line-through;
         }
     }
 }
 
 .compare_view_commits_title {
   .disabled {
     cursor: inherit;
     &:hover{
       background-color: inherit;
       color: inherit;
     }
   }
 }
 
 .subtitle-compare {
   margin: -15px 0px 0px 0px;
 }
 
 // new entry in group_members
 .td-author-new-entry {
   background-color: rgba(red(@alert1), green(@alert1), blue(@alert1), 0.3);
 }
 
 .usergroup_member_remove {
     width: 16px;
     margin-bottom: 10px;
     padding: 0;
     color: black !important;
     cursor: pointer;
 }
 
 .reviewer_ac .ac-input {
     width: 92%;
     margin-bottom: 1em;
 }
 
 .compare_view_commits tr{
     height: 20px;
 }
 .compare_view_commits td {
     vertical-align: top;
     padding-top: 10px;
 }
 .compare_view_commits .author {
     margin-left: 5px;
 }
 
 .compare_view_commits {
   .color-a {
     color: @alert1;
   }
 
   .color-c {
     color: @color3;
   }
 
   .color-r {
     color: @color5;
   }
 
   .color-a-bg {
     background-color: @alert1;
   }
 
   .color-c-bg {
     background-color: @alert3;
   }
 
   .color-r-bg {
     background-color: @alert2;
   }
 
   .color-a-border {
     border: 1px solid @alert1;
   }
 
   .color-c-border {
     border: 1px solid @alert3;
   }
 
   .color-r-border {
     border: 1px solid @alert2;
   }
 
   .commit-change-indicator {
     width: 15px;
     height: 15px;
     position: relative;
     left: 15px;
   }
 
   .commit-change-content {
     text-align: center;
     vertical-align: middle;
     line-height: 15px;
   }
 }
 
 .compare_view_filepath {
     color: @grey1;
 }
 
 .show_more {
     display: inline-block;
     width: 0;
     height: 0;
     vertical-align: middle;
     content: "";
     border: 4px solid;
     border-right-color: transparent;
     border-bottom-color: transparent;
     border-left-color: transparent;
     font-size: 0;
 }
 
 .journal_more .show_more {
     display: inline;
 
     &:after {
         content: none;
     }
 }
 
 .compare_view_commits .collapse_commit:after {
     cursor: pointer;
     content: "\00A0\25B4";
     margin-left: -3px;
     font-size: 17px;
     color: @grey4;
 }
 
 .diff_links {
     margin-left: 8px;
 }
 
 #pull_request_overview {
   div.ancestor {
       margin: -33px 0;
   }
 }
 
 div.ancestor {
 
 }
 
 .cs_icon_td input[type="checkbox"] {
     display: none;
 }
 
 .cs_icon_td .expand_file_icon:after {
     cursor: pointer;
     content: "\00A0\25B6";
     font-size: 12px;
     color: @grey4;
 }
 
 .cs_icon_td .collapse_file_icon:after {
     cursor: pointer;
     content: "\00A0\25BC";
     font-size: 12px;
     color: @grey4;
 }
 
 /*new binary
 NEW_FILENODE = 1
 DEL_FILENODE = 2
 MOD_FILENODE = 3
 RENAMED_FILENODE = 4
 COPIED_FILENODE = 5
 CHMOD_FILENODE = 6
 BIN_FILENODE = 7
 */
 .cs_files_expand {
     font-size: @basefontsize + 5px;
     line-height: 1.8em;
     float: right;
 }
 
 .cs_files_expand span{
     color: @rcblue;
     cursor: pointer;
 }
 .cs_files {
     clear: both;
 	padding-bottom: @padding;
 
     .cur_cs {
         margin: 10px 2px;
         font-weight: bold;
     }
 
     .node {
         float: left;
     }
 
     .changes {
         float: right;
         color: white;
         font-size: @basefontsize - 4px;
         margin-top: 4px;
         opacity: 0.6;
         filter: Alpha(opacity=60); /* IE8 and earlier */
 
         .added {
             background-color: @alert1;
             float: left;
             text-align: center;
         }
 
         .deleted {
             background-color: @alert2;
             float: left;
             text-align: center;
         }
 
         .bin {
             background-color: @alert1;
             text-align: center;
         }
 
         /*new binary*/
         .bin.bin1 {
             background-color: @alert1;
             text-align: center;
         }
 
         /*deleted binary*/
         .bin.bin2 {
             background-color: @alert2;
             text-align: center;
         }
 
         /*mod binary*/
         .bin.bin3 {
             background-color: @grey2;
             text-align: center;
         }
 
         /*rename file*/
         .bin.bin4 {
             background-color: @alert4;
             text-align: center;
         }
 
         /*copied file*/
         .bin.bin5 {
             background-color: @alert4;
             text-align: center;
         }
 
         /*chmod file*/
         .bin.bin6 {
             background-color: @grey2;
             text-align: center;
         }
     }
 }
 
 .cs_files .cs_added, .cs_files .cs_A,
 .cs_files .cs_added, .cs_files .cs_M,
 .cs_files .cs_added, .cs_files .cs_D {
     height: 16px;
     padding-right: 10px;
     margin-top: 7px;
     text-align: left;
 }
 
 .cs_icon_td {
   min-width: 16px;
   width: 16px;
 }
 
 .pull-request-merge {
     border: 1px solid @grey5;
     padding: 10px 0px 20px;
     margin-top: 10px;
     margin-bottom: 20px;
 }
 
 .pull-request-merge-refresh {
   margin: 2px 7px;
   a {
     color: @grey3;
   }
 }
 
 .pull-request-merge ul {
     padding: 0px 0px;
 }
 
 .pull-request-merge li {
     list-style-type: none;
 }
 
 .pull-request-merge .pull-request-wrap {
     height: auto;
     padding: 0px 0px;
     text-align: right;
 }
 
 .pull-request-merge span {
     margin-right: 5px;
 }
 
 .pull-request-merge-actions {
     min-height: 30px;
     padding: 0px 0px;
 }
 
 .pull-request-merge-info {
   padding: 0px 5px 5px 0px;
 }
 
 .merge-status {
   margin-right: 5px;
 }
 
 .merge-message {
     font-size: 1.2em
 }
 
 .merge-message.success i,
 .merge-icon.success i {
     color:@alert1;
 }
 
 .merge-message.warning i,
 .merge-icon.warning i {
   color: @alert3;
 }
 
 .merge-message.error i,
 .merge-icon.error i  {
     color:@alert2;
 }
 
 .pr-versions {
     font-size: 1.1em;
     padding: 7.5px;
 
     table {
 
     }
 
     td {
       line-height: 15px;
     }
 
     .compare-radio-button {
       position: relative;
       top: -3px;
     }
 }
 
 
 #close_pull_request {
     margin-right: 0px;
 }
 
 .empty_data {
     color: @grey4;
 }
 
 #changeset_compare_view_content {
     clear: both;
     width: 100%;
     box-sizing: border-box;
     .border-radius(@border-radius);
 
     .help-block {
         margin: @padding 0;
         color: @text-color;
         &.pre-formatting {
             white-space: pre;
         }
     }
 
     .empty_data {
         margin: @padding 0;
     }
 
     .alert {
         margin-bottom: @space;
     }
 }
 
 .table_disp {
 	.status {
 		width: auto;
 	}
 }
 
 
 .creation_in_progress {
   color: @grey4
 }
 
 .status_box_menu {
     margin: 0;
 }
 
 .notification-table{
 	margin-bottom: @space;
 	display: table;
 	width: 100%;
 
 	.container{
 		display: table-row;
 
 		.notification-header{
 			border-bottom: @border-thickness solid @border-default-color;
 		}
 
 		.notification-subject{
 			display: table-cell;
 		}
 	}
 }
 
 // Notifications
 .notification-header{
 	display: table;
 	width: 100%;
 	padding: floor(@basefontsize/2) 0;
     line-height: 1em;
 
 	.desc, .delete-notifications, .read-notifications{
 		display: table-cell;
 		text-align: left;
 	}
 
 	.delete-notifications, .read-notifications{
 		width: 35px;
 		min-width: 35px; //fixes when only one button is displayed
 	}
 }
 
 .notification-body {
     .markdown-block,
 	.rst-block {
 		padding: @padding 0;
 	}
 
 	.notification-subject {
 		padding: @textmargin 0;
 		border-bottom: @border-thickness solid @border-default-color;
 	}
 }
 
 .notice-messages {
     .markdown-block,
 	.rst-block {
 		padding: 0;
 	}
 }
 
 .notifications_buttons{
 	float: right;
 }
 
 #notification-status{
   display: inline;
 }
 
 // Repositories
 
 #summary.fields{
 	display: table;
 
 	.field{
 		display: table-row;
 
 		.label-summary{
 			display: table-cell;
 			min-width: @label-summary-minwidth;
 			padding-top: @padding/2;
 			padding-bottom: @padding/2;
 			padding-right: @padding/2;
 		}
 
 		.input{
 			display: table-cell;
 			padding: @padding/2;
 
 			input{
 				min-width: 29em;
 				padding:  @padding/4;
 			}
 		}
 		.statistics, .downloads{
 			.disabled{
 				color: @grey4;
 			}
 		}
 	}
 }
 
 #summary{
 	width: 70%;
 }
 
 
 // Journal
 .journal.title {
 	h5 {
 		float: left;
 		margin: 0;
 		width: 70%;
 	}
 
 	ul {
 		float: right;
 		display: inline-block;
 		margin: 0;
 		width: 30%;
 		text-align: right;
 
 		li {
 			display: inline;
 			font-size: @journal-fontsize;
             line-height: 1em;
 
             list-style-type: none;
 		}
 	}
 }
 
 .filterexample {
     position: absolute;
     top: 95px;
     left: @contentpadding;
     color: @rcblue;
     font-size: 11px;
     font-family: @text-regular;
     cursor: help;
 
     &:hover {
         color: @rcdarkblue;
     }
 
     @media (max-width:768px) {
         position: relative;
         top: auto;
         left: auto;
         display: block;
     }
 }
 
 
 #journal{
 	margin-bottom: @space;
 
 	.journal_day{
 		margin-bottom: @textmargin/2;
 		padding-bottom: @textmargin/2;
 		font-size: @journal-fontsize;
 		border-bottom: @border-thickness solid @border-default-color;
 	}
 
 	.journal_container{
 		margin-bottom: @space;
 
 		.journal_user{
 			display: inline-block;
 		}
 		.journal_action_container{
 			display: block;
 			margin-top: @textmargin;
 
 			div{
 				display: inline;
 			}
 
 			div.journal_action_params{
 				display: block;
 			}
 
 			div.journal_repo:after{
 				content: "\A";
 				white-space: pre;
 			}
 
 			div.date{
 				display: block;
 				margin-bottom: @textmargin;
 			}
 		}
 	}
 }
 
 // Files
 .edit-file-title {
     font-size: 16px;
 
     .title-heading {
       padding: 2px;
     }
 }
 
 .edit-file-fieldset {
     margin: @sidebarpadding 0;
 
     .fieldset {
         .left-label {
             width: 13%;
         }
         .right-content {
             width: 87%;
             max-width: 100%;
         }
         .filename-label {
             margin-top: 13px;
         }
         .commit-message-label {
             margin-top: 4px;
         }
         .file-upload-input {
             input {
                 display: none;
             }
           margin-top: 10px;
         }
         .file-upload-label {
           margin-top: 10px;
         }
         p {
             margin-top: 5px;
         }
 
     }
     .custom-path-link {
         margin-left: 5px;
     }
     #commit {
         resize: vertical;
     }
 }
 
 .delete-file-preview {
     max-height: 250px;
 }
 
 .new-file,
 #filter_activate,
 #filter_deactivate {
     float: right;
     margin: 0 0 0 10px;
 }
 
 .file-upload-transaction-wrapper {
     margin-top: 57px;
     clear: both;
 }
 
 .file-upload-transaction-wrapper .error {
     color: @color5;
 }
 
 .file-upload-transaction {
     min-height: 200px;
     padding: 54px;
     border: 1px solid @grey5;
     text-align: center;
     clear: both;
 }
 
 .file-upload-transaction i {
     font-size: 48px
 }
 
 h3.files_location{
     line-height: 2.4em;
 }
 
 .browser-nav {
     width: 100%;
 	display: table;
     margin-bottom: 20px;
 
 	.info_box {
         float: left;
 		display: inline-table;
 		height: 2.5em;
 
         .browser-cur-rev, .info_box_elem {
 			display: table-cell;
 			vertical-align: middle;
 		}
 
         .drop-menu {
             margin: 0 10px;
         }
 
 		.info_box_elem {
 			border-top: @border-thickness solid @grey5;
 			border-bottom: @border-thickness solid @grey5;
             box-shadow: @button-shadow;
 
             #at_rev, a {
                 padding: 0.6em 0.4em;
                 margin: 0;
                 .box-shadow(none);
                 border: 0;
                 height: 12px;
                 color: @grey2;
             }
 
             input#at_rev {
                 max-width: 50px;
                 text-align: center;
             }
 
 			&.previous {
 				border: @border-thickness solid @grey5;
                 border-top-left-radius: @border-radius;
                 border-bottom-left-radius: @border-radius;
 
                 &:hover {
                     border-color: @grey4;
                 }
 
                 .disabled {
                   color: @grey5;
                   cursor: not-allowed;
                   opacity: 0.5;
                 }
 			}
 
 			&.next {
 				border: @border-thickness solid @grey5;
                 border-top-right-radius: @border-radius;
                 border-bottom-right-radius: @border-radius;
 
                 &:hover {
                     border-color: @grey4;
                 }
 
                 .disabled {
                   color: @grey5;
                   cursor: not-allowed;
                   opacity: 0.5;
                 }
 			}
 		}
 
 		.browser-cur-rev {
 
 			span{
                 margin: 0;
 				color: @rcblue;
                 height: 12px;
                 display: inline-block;
                 padding:  0.7em 1em ;
                 border: @border-thickness solid @rcblue;
                 margin-right: @padding;
 			}
 		}
 
 	}
 
     .select-index-number {
         margin: 0 0 0 20px;
         color: @grey3;
     }
 
 	.search_activate {
 		display: table-cell;
 		vertical-align: middle;
 
 		input, label{
 			margin: 0;
 			padding: 0;
 		}
 
 		input{
 			margin-left: @textmargin;
 		}
 
 	}
 }
 
 .browser-cur-rev{
 	margin-bottom: @textmargin;
 }
 
 #node_filter_box_loading{
 	.info_text;
 }
 
 .browser-search {
 	margin: -25px 0px 5px 0px;
 }
 
 .files-quick-filter {
   float: right;
   width: 180px;
   position: relative;
 }
 
 .files-filter-box {
   display: flex;
   padding: 0px;
   border-radius: 3px;
   margin-bottom: 0;
 
   a {
     border: none !important;
   }
 
   li {
     list-style-type: none
   }
 }
 
 .files-filter-box-path {
   line-height: 33px;
   padding: 0;
   width: 20px;
   position: absolute;
   z-index: 11;
   left: 5px;
 }
 
 .files-filter-box-input {
   margin-right: 0;
 
   input {
     border: 1px solid @white;
     padding-left: 25px;
     width: 145px;
 
     &:hover {
         border-color: @grey6;
     }
 
     &:focus {
         border-color: @grey5;
     }
   }
 }
 
 .browser-result{
 	td a{
 		margin-left: 0.5em;
 		display: inline-block;
 
 		em {
           font-weight: @text-bold-weight;
           font-family: @text-bold;
         }
 	}
 }
 
 .browser-highlight{
 	background-color: @grey5-alpha;
 }
 
 
 .edit-file-fieldset #location,
 .edit-file-fieldset #filename {
   display: flex;
   width: -moz-available; /* WebKit-based browsers will ignore this. */
   width: -webkit-fill-available; /* Mozilla-based browsers will ignore this. */
   width: fill-available;
   border: 0;
 }
 
 .path-items {
   display: flex;
   padding: 0;
   border: 1px solid #eeeeee;
   width: 100%;
   float: left;
 
   .breadcrumb-path {
     line-height: 30px;
     padding: 0 4px;
     white-space: nowrap;
   }
 
   .upload-form {
     margin-top: 46px;
   }
 
   .location-path {
     width: -moz-available; /* WebKit-based browsers will ignore this. */
     width: -webkit-fill-available; /* Mozilla-based browsers will ignore this. */
     width: fill-available;
 
     .file-name-input {
       padding: 0.5em 0;
     }
 
   }
 
   ul {
     display: flex;
     margin: 0;
     padding: 0;
     width: 100%;
   }
 
   li {
     list-style-type: none;
   }
 
 }
 
 .editor-items {
   height: 40px;
   margin: 10px 0 -17px 10px;
 
   .editor-action {
     cursor: pointer;
   }
 
   .editor-action.active {
     border-bottom: 2px solid #5C5C5C;
   }
 
   li {
     list-style-type: none;
   }
 }
 
 .edit-file-fieldset .message textarea {
   border: 1px solid #eeeeee;
 }
 
 #files_data .codeblock {
   background-color: #F5F5F5;
 }
 
 #editor_preview {
   background: white;
 }
 
 .show-editor {
   padding: 10px;
   background-color: white;
 
 }
 
 .show-preview {
   padding: 10px;
   background-color: white;
   border-left: 1px solid #eeeeee;
 }
 // quick filter
 .grid-quick-filter {
   float: right;
     position: relative;
 }
 
 .grid-filter-box {
   display: flex;
   padding: 0px;
   border-radius: 3px;
   margin-bottom: 0;
 
   a {
     border: none !important;
   }
 
   li {
     list-style-type: none
   }
 }
 
 .grid-filter-box-icon {
   line-height: 33px;
   padding: 0;
   width: 20px;
   position: absolute;
   z-index: 11;
   left: 5px;
 }
 
 .grid-filter-box-input {
   margin-right: 0;
 
   input {
     border: 1px solid @white;
     padding-left: 25px;
     width: 145px;
 
     &:hover {
         border-color: @grey6;
     }
 
     &:focus {
         border-color: @grey5;
     }
   }
 }
 
 
 
 // Search
 
 .search-form{
     #q {
         width: @search-form-width;
     }
 	.fields{
 		margin: 0 0 @space;
 	}
 
 	label{
 		display: inline-block;
 		margin-right: @textmargin;
 		padding-top: 0.25em;
 	}
 
 
 	.results{
 		clear: both;
 		margin: 0 0 @padding;
 	}
 
     .search-tags {
       padding: 5px 0;
     }
 }
 
 div.search-feedback-items {
 	display: inline-block;
 }
 
 div.search-code-body {
     background-color: #ffffff; padding: 5px 0 5px 10px;
     pre {
         .match { background-color: #faffa6;}
         .break { display: block; width: 100%; background-color: #DDE7EF; color: #747474; }
     }
 }
 
 .expand_commit.search {
     .show_more.open {
         height: auto;
         max-height: none;
     }
 }
 
 .search-results {
 
     h2 {
         margin-bottom: 0;
     }
     .codeblock {
         border: none;
         background: transparent;
     }
 
     .codeblock-header {
         border: none;
         background: transparent;
     }
 
     .code-body {
         border: @border-thickness solid @grey6;
         .border-radius(@border-radius);
     }
 
     .td-commit {
         &:extend(pre);
         border-bottom: @border-thickness solid @border-default-color;
     }
 
     .message {
         height: auto;
         max-width: 350px;
         white-space: normal;
         text-overflow: initial;
         overflow: visible;
 
         .match { background-color: #faffa6;}
         .break { background-color: #DDE7EF; width: 100%; color: #747474; display: block; }
     }
 
     .path {
       border-bottom: none !important;
       border-left: 1px solid @grey6 !important;
       border-right: 1px solid @grey6 !important;
     }
 }
 
 table.rctable td.td-search-results div {
     max-width: 100%;
 }
 
 #tip-box, .tip-box{
 	padding: @menupadding/2;
 	display: block;
 	border: @border-thickness solid @border-highlight-color;
 	.border-radius(@border-radius);
 	background-color: white;
     z-index: 99;
     white-space: pre-wrap;
 }
 
 #linktt {
     width: 79px;
 }
 
 #help_kb .modal-content{
 	max-width: 750px;
 	margin: 10% auto;
 
 	table{
 		td,th{
 			border-bottom: none;
 			line-height: 2.5em;
 		}
 		th{
 			padding-bottom: @textmargin/2;
 		}
 		td.keys{
 			text-align: center;
 		}
 	}
 
 	.block-left{
 		width: 45%;
 		margin-right: 5%;
 	}
 	.modal-footer{
 		clear: both;
 	}
 	.key.tag{
 		padding: 0.5em;
 		background-color: @rcblue;
 		color: white;
 		border-color: @rcblue;
 		.box-shadow(none);
 	}
 }
 
 
 
 //--- IMPORTS FOR REFACTORED STYLES ------------------//
 
 @import 'statistics-graph';
 @import 'tables';
 @import 'forms';
 @import 'diff';
 @import 'summary';
 @import 'navigation';
 
 //--- SHOW/HIDE SECTIONS --//
 
 .btn-collapse {
     float: right;
     text-align: right;
     font-family: @text-light;
     font-size: @basefontsize;
     cursor: pointer;
     border: none;
     color: @rcblue;
 }
 
 table.rctable,
 table.dataTable {
     .btn-collapse {
         float: right;
         text-align: right;
     }
 }
 
 table.rctable {
   &.permissions {
 
     th.td-owner {
       padding: 0;
     }
 
     th {
       font-weight: normal;
       padding: 0 5px;
     }
 
   }
 }
 
 
 // TODO: johbo: Fix for IE10, this avoids that we see a border
 // and padding around checkboxes and radio boxes. Move to the right place,
 // or better: Remove this once we did the form refactoring.
 input[type=checkbox],
 input[type=radio] {
     padding: 0;
     border: none;
 }
 
 .toggle-ajax-spinner{
   height: 16px;
   width: 16px;
 }
 
 
 .markup-form .clearfix {
     .border-radius(@border-radius);
     margin: 0px;
 }
 
 .markup-form-area {
     padding: 8px 12px;
     border: 1px solid @grey4;
     .border-radius(@border-radius);
 }
 
 .markup-form-area-header .nav-links {
     display: flex;
     flex-flow: row wrap;
     -webkit-flex-flow: row wrap;
     width: 100%;
 }
 
 .markup-form-area-footer {
     display: flex;
 }
 
 .markup-form-area-footer .toolbar {
 
 }
 
 // markup Form
 div.markup-form {
     margin-top: 20px;
 }
 
 .markup-form strong {
     display: block;
     margin-bottom: 15px;
 }
 
 .markup-form textarea {
     width: 100%;
     height: 100px;
     font-family: @text-monospace;
 }
 
 form.markup-form {
     margin-top: 10px;
     margin-left: 10px;
 }
 
 .markup-form .comment-block-ta,
 .markup-form .preview-box {
     .border-radius(@border-radius);
     .box-sizing(border-box);
     background-color: white;
 }
 
 .markup-form .preview-box.unloaded {
     height: 50px;
     text-align: center;
     padding: 20px;
     background-color: white;
 }
 
 
 .dropzone-wrapper {
   border: 1px solid @grey5;
   padding: 20px;
 }
 
 .dropzone,
 .dropzone-pure {
   border: 2px dashed @grey5;
   border-radius: 5px;
   background: white;
   min-height: 200px;
   padding: 54px;
 
   .dz-message {
     font-weight: 700;
     text-align: center;
     margin: 2em 0;
   }
 
 }
 
 .dz-preview {
   margin: 10px 0 !important;
   position: relative;
   vertical-align: top;
   padding: 10px;
   border-bottom: 1px solid @grey5;
 }
 
 .dz-filename {
   font-weight: 700;
   float: left;
 }
 
 .dz-sending {
   float: right;
 }
 
 .dz-response {
   clear: both
 }
 
 .dz-filename-size {
   float: right
 }
 
 .dz-error-message {
   color: @alert2;
   padding-top: 10px;
   clear: both;
 }
 
 
 .user-hovercard {
   padding: 5px;
 }
 
 .user-hovercard-icon {
   display: inline;
   padding: 0;
   box-sizing: content-box;
   border-radius: 50%;
   float: left;
 }
 
 .user-hovercard-name {
   float: right;
   vertical-align: top;
   padding-left: 10px;
   min-width: 150px;
 }
 
 .user-hovercard-bio {
   clear: both;
   padding-top: 10px;
 }
 
 .user-hovercard-header {
   clear: both;
   min-height: 10px;
 }
 
 .user-hovercard-footer {
   clear: both;
   min-height: 10px;
 }
 
 .user-group-hovercard {
   padding: 5px;
 }
 
 .user-group-hovercard-icon {
   display: inline;
   padding: 0;
   box-sizing: content-box;
   border-radius: 50%;
   float: left;
 }
 
 .user-group-hovercard-name {
   float: left;
   vertical-align: top;
   padding-left: 10px;
   min-width: 150px;
 }
 
 .user-group-hovercard-icon i {
   border: 1px solid @grey4;
   border-radius: 4px;
 }
 
 .user-group-hovercard-bio {
   clear: both;
   padding-top: 10px;
   line-height: 1.0em;
 }
 
 .user-group-hovercard-header {
   clear: both;
   min-height: 10px;
 }
 
 .user-group-hovercard-footer {
   clear: both;
   min-height: 10px;
 }
 
 .pr-hovercard-header {
   clear: both;
   display: block;
   line-height: 20px;
 }
 
 .pr-hovercard-user {
   display: flex;
   align-items: center;
   padding-left: 5px;
 }
 
 .pr-hovercard-title {
   padding-top: 5px;
 }
  No newline at end of file

rhodecode/public/css/sweetalert2.less

@@ -1,1544 +1,1544 b''
 .swal2-popup.swal2-toast {
   flex-direction: row;
   align-items: center;
   width: auto;
   padding: 0.625em;
   overflow-y: hidden;
   background: #fff;
   box-shadow: none;
 }
 
 .swal2-popup.swal2-toast .swal2-header {
   flex-direction: row;
 }
 
 .swal2-popup.swal2-toast .swal2-title {
   flex-grow: 1;
   justify-content: flex-start;
   margin: 0 0.6em;
   font-size: 1em;
 }
 
 .swal2-popup.swal2-toast .swal2-footer {
   margin: 0.5em 0 0;
   padding: 0.5em 0 0;
   font-size: 0.8em;
 }
 
 .swal2-popup.swal2-toast .swal2-close {
   position: static;
   width: 0.8em;
   height: 0.8em;
   line-height: 0.8;
 }
 
 .swal2-popup.swal2-toast .swal2-content {
   justify-content: flex-start;
   font-size: 1em;
 }
 
 .swal2-popup.swal2-toast .swal2-icon {
   width: 2em;
   min-width: 2em;
   height: 2em;
   margin: 0;
 }
 
 .swal2-popup.swal2-toast .swal2-icon .swal2-icon-content {
   display: flex;
   align-items: center;
   font-size: 1.8em;
   font-weight: bold;
 }
 
 @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
   .swal2-popup.swal2-toast .swal2-icon .swal2-icon-content {
     font-size: 0.25em;
   }
 }
 
 .swal2-popup.swal2-toast .swal2-icon.swal2-success .swal2-success-ring {
   width: 2em;
   height: 2em;
 }
 
 .swal2-popup.swal2-toast .swal2-icon.swal2-error [class^=swal2-x-mark-line] {
   top: 0.875em;
   width: 1.375em;
 }
 
 .swal2-popup.swal2-toast .swal2-icon.swal2-error [class^=swal2-x-mark-line][class$=left] {
   left: 0.3125em;
 }
 
 .swal2-popup.swal2-toast .swal2-icon.swal2-error [class^=swal2-x-mark-line][class$=right] {
   right: 0.3125em;
 }
 
 .swal2-popup.swal2-toast .swal2-actions {
   flex-basis: auto !important;
   width: auto;
   height: auto;
   margin: 0 0.3125em;
 }
 
 .swal2-popup.swal2-toast .swal2-styled {
   margin: 0 0.3125em;
   padding: 0.3125em 0.625em;
   font-size: 1em;
 }
 
 .swal2-popup.swal2-toast .swal2-styled:focus {
   box-shadow: 0 0 0 1px #fff, 0 0 0 3px rgba(50, 100, 150, 0.4);
 }
 
 .swal2-popup.swal2-toast .swal2-success {
   border-color: @alert1;
 }
 
 .swal2-popup.swal2-toast .swal2-success [class^=swal2-success-circular-line] {
   position: absolute;
   width: 1.6em;
   height: 3em;
   transform: rotate(45deg);
   border-radius: 50%;
 }
 
 .swal2-popup.swal2-toast .swal2-success [class^=swal2-success-circular-line][class$=left] {
   top: -0.8em;
   left: -0.5em;
   transform: rotate(-45deg);
   transform-origin: 2em 2em;
   border-radius: 4em 0 0 4em;
 }
 
 .swal2-popup.swal2-toast .swal2-success [class^=swal2-success-circular-line][class$=right] {
   top: -0.25em;
   left: 0.9375em;
   transform-origin: 0 1.5em;
   border-radius: 0 4em 4em 0;
 }
 
 .swal2-popup.swal2-toast .swal2-success .swal2-success-ring {
   width: 2em;
   height: 2em;
 }
 
 .swal2-popup.swal2-toast .swal2-success .swal2-success-fix {
   top: 0;
   left: 0.4375em;
   width: 0.4375em;
   height: 2.6875em;
 }
 
 .swal2-popup.swal2-toast .swal2-success [class^=swal2-success-line] {
   height: 0.3125em;
 }
 
 .swal2-popup.swal2-toast .swal2-success [class^=swal2-success-line][class$=tip] {
   top: 1.125em;
   left: 0.1875em;
   width: 0.75em;
 }
 
 .swal2-popup.swal2-toast .swal2-success [class^=swal2-success-line][class$=long] {
   top: 0.9375em;
   right: 0.1875em;
   width: 1.375em;
 }
 
 .swal2-popup.swal2-toast .swal2-success.swal2-icon-show .swal2-success-line-tip {
   -webkit-animation: swal2-toast-animate-success-line-tip 0.75s;
   animation: swal2-toast-animate-success-line-tip 0.75s;
 }
 
 .swal2-popup.swal2-toast .swal2-success.swal2-icon-show .swal2-success-line-long {
   -webkit-animation: swal2-toast-animate-success-line-long 0.75s;
   animation: swal2-toast-animate-success-line-long 0.75s;
 }
 
 .swal2-popup.swal2-toast.swal2-show {
   -webkit-animation: swal2-toast-show 0.5s;
   animation: swal2-toast-show 0.5s;
 }
 
 .swal2-popup.swal2-toast.swal2-hide {
   -webkit-animation: swal2-toast-hide 0.1s forwards;
   animation: swal2-toast-hide 0.1s forwards;
 }
 
 .swal2-container {
   display: flex;
   position: fixed;
   z-index: 1060;
   top: 0;
   right: 0;
   bottom: 0;
   left: 0;
   flex-direction: row;
   align-items: center;
   justify-content: center;
   padding: 0.625em;
   overflow-x: hidden;
   transition: background-color 0.1s;
   -webkit-overflow-scrolling: touch;
 }
 
 .swal2-container.swal2-backdrop-show, .swal2-container.swal2-noanimation {
   background: rgba(0, 0, 0, 0.4);
 }
 
 .swal2-container.swal2-backdrop-hide {
   background: transparent !important;
 }
 
 .swal2-container.swal2-top {
   align-items: flex-start;
 }
 
 .swal2-container.swal2-top-start, .swal2-container.swal2-top-left {
   align-items: flex-start;
   justify-content: flex-start;
 }
 
 .swal2-container.swal2-top-end, .swal2-container.swal2-top-right {
   align-items: flex-start;
   justify-content: flex-end;
 }
 
 .swal2-container.swal2-center {
   align-items: center;
 }
 
 .swal2-container.swal2-center-start, .swal2-container.swal2-center-left {
   align-items: center;
   justify-content: flex-start;
 }
 
 .swal2-container.swal2-center-end, .swal2-container.swal2-center-right {
   align-items: center;
   justify-content: flex-end;
 }
 
 .swal2-container.swal2-bottom {
   align-items: flex-end;
 }
 
 .swal2-container.swal2-bottom-start, .swal2-container.swal2-bottom-left {
   align-items: flex-end;
   justify-content: flex-start;
 }
 
 .swal2-container.swal2-bottom-end, .swal2-container.swal2-bottom-right {
   align-items: flex-end;
   justify-content: flex-end;
 }
 
 .swal2-container.swal2-bottom > :first-child,
 .swal2-container.swal2-bottom-start > :first-child,
 .swal2-container.swal2-bottom-left > :first-child,
 .swal2-container.swal2-bottom-end > :first-child,
 .swal2-container.swal2-bottom-right > :first-child {
   margin-top: auto;
 }
 
 .swal2-container.swal2-grow-fullscreen > .swal2-modal {
   display: flex !important;
   flex: 1;
   align-self: stretch;
   justify-content: center;
 }
 
 .swal2-container.swal2-grow-row > .swal2-modal {
   display: flex !important;
   flex: 1;
   align-content: center;
   justify-content: center;
 }
 
 .swal2-container.swal2-grow-column {
   flex: 1;
   flex-direction: column;
 }
 
 .swal2-container.swal2-grow-column.swal2-top, .swal2-container.swal2-grow-column.swal2-center, .swal2-container.swal2-grow-column.swal2-bottom {
   align-items: center;
 }
 
 .swal2-container.swal2-grow-column.swal2-top-start, .swal2-container.swal2-grow-column.swal2-center-start, .swal2-container.swal2-grow-column.swal2-bottom-start, .swal2-container.swal2-grow-column.swal2-top-left, .swal2-container.swal2-grow-column.swal2-center-left, .swal2-container.swal2-grow-column.swal2-bottom-left {
   align-items: flex-start;
 }
 
 .swal2-container.swal2-grow-column.swal2-top-end, .swal2-container.swal2-grow-column.swal2-center-end, .swal2-container.swal2-grow-column.swal2-bottom-end, .swal2-container.swal2-grow-column.swal2-top-right, .swal2-container.swal2-grow-column.swal2-center-right, .swal2-container.swal2-grow-column.swal2-bottom-right {
   align-items: flex-end;
 }
 
 .swal2-container.swal2-grow-column > .swal2-modal {
   display: flex !important;
   flex: 1;
   align-content: center;
   justify-content: center;
 }
 
 .swal2-container.swal2-no-transition {
   transition: none !important;
 }
 
 .swal2-container:not(.swal2-top):not(.swal2-top-start):not(.swal2-top-end):not(.swal2-top-left):not(.swal2-top-right):not(.swal2-center-start):not(.swal2-center-end):not(.swal2-center-left):not(.swal2-center-right):not(.swal2-bottom):not(.swal2-bottom-start):not(.swal2-bottom-end):not(.swal2-bottom-left):not(.swal2-bottom-right):not(.swal2-grow-fullscreen) > .swal2-modal {
   margin: auto;
 }
 
 @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
   .swal2-container .swal2-modal {
     margin: 0 !important;
   }
 }
 
 .swal2-popup {
   display: none;
   position: relative;
   box-sizing: border-box;
   flex-direction: column;
   justify-content: center;
   width: 38em;
   max-width: 100%;
   padding: 1.25em;
   border: none;
   border-radius: 0;
   background: #fff;
   font-family: inherit;
-  font-size: 1rem;
+  font-size: 13px;
 }
 
 .swal2-popup:focus {
   outline: none;
 }
 
 .swal2-popup.swal2-loading {
   overflow-y: hidden;
 }
 
 .swal2-header {
   display: flex;
   flex-direction: column;
   align-items: center;
 }
 
 .swal2-title {
   position: relative;
   max-width: 100%;
   margin: 0 0 0.4em;
   padding: 0;
   color: #595959;
   font-size: 1.875em;
   font-weight: 600;
   text-align: center;
   text-transform: none;
   word-wrap: break-word;
 }
 
 .swal2-actions {
   display: flex;
   z-index: 1;
   flex-wrap: wrap;
   align-items: center;
   justify-content: center;
   width: 100%;
   margin: 1.25em auto 0;
 }
 
 .swal2-actions:not(.swal2-loading) .swal2-styled[disabled] {
   opacity: 0.4;
 }
 
 .swal2-actions:not(.swal2-loading) .swal2-styled:hover {
   background-image: linear-gradient(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));
 }
 
 .swal2-actions:not(.swal2-loading) .swal2-styled:active {
   background-image: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2));
 }
 
 .swal2-actions.swal2-loading .swal2-styled.swal2-confirm {
   box-sizing: border-box;
   width: 2.5em;
   height: 2.5em;
   margin: 0.46875em;
   padding: 0;
   -webkit-animation: swal2-rotate-loading 1.5s linear 0s infinite normal;
   animation: swal2-rotate-loading 1.5s linear 0s infinite normal;
   border: 0.25em solid transparent;
   border-radius: 100%;
   border-color: transparent;
   background-color: transparent !important;
   color: transparent !important;
   cursor: default;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
 
 .swal2-actions.swal2-loading .swal2-styled.swal2-cancel {
   margin-right: 30px;
   margin-left: 30px;
 }
 
 .swal2-actions.swal2-loading :not(.swal2-styled).swal2-confirm::after {
   content: "";
   display: inline-block;
   width: 15px;
   height: 15px;
   margin-left: 5px;
   -webkit-animation: swal2-rotate-loading 1.5s linear 0s infinite normal;
   animation: swal2-rotate-loading 1.5s linear 0s infinite normal;
   border: 3px solid #999999;
   border-radius: 50%;
   border-right-color: transparent;
   box-shadow: 1px 1px 1px #fff;
 }
 
 .swal2-styled {
   margin: 0.3125em;
   padding: 0.625em 2em;
   box-shadow: none;
   font-weight: 500;
 }
 
 .swal2-styled:not([disabled]) {
   cursor: pointer;
 }
 
 .swal2-styled.swal2-confirm {
   border: 0;
   border-radius: 0;
   background: initial;
   background-color: @alert4;
   color: #fff;
   font-size: 1.0625em;
 }
 
 .swal2-styled.swal2-cancel {
   border: 0;
   border-radius: 0;
   background: initial;
   background-color: #aaa;
   color: #fff;
   font-size: 1.0625em;
 }
 
 .swal2-styled:focus {
   outline: none;
   box-shadow: 0 0 0 1px #fff, 0 0 0 3px rgba(50, 100, 150, 0.4);
 }
 
 .swal2-styled::-moz-focus-inner {
   border: 0;
 }
 
 .swal2-footer {
   justify-content: center;
   margin: 1.25em 0 0;
   padding: 1em 0 0;
   border-top: 1px solid #eee;
   color: #545454;
   font-size: 1em;
 }
 
 .swal2-timer-progress-bar-container {
   position: absolute;
   right: 0;
   bottom: 0;
   left: 0;
   height: 0.25em;
   overflow: hidden;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
 
 .swal2-timer-progress-bar {
   width: 100%;
   height: 0.25em;
   background: rgba(0, 0, 0, 0.2);
 }
 
 .swal2-image {
   max-width: 100%;
   margin: 1.25em auto;
 }
 
 .swal2-close {
   position: absolute;
   z-index: 2;
   /* 1617 */
   top: 0;
   right: 0;
   align-items: center;
   justify-content: center;
   width: 1.2em;
   height: 1.2em;
   padding: 0;
   overflow: hidden;
   transition: color 0.1s ease-out;
   border: none;
   border-radius: 0;
   background: transparent;
   color: #cccccc;
   font-family: serif;
   font-size: 2.5em;
   line-height: 1.2;
   cursor: pointer;
 }
 
 .swal2-close:hover {
   transform: none;
   background: transparent;
   color: #f27474;
 }
 
 .swal2-close::-moz-focus-inner {
   border: 0;
 }
 
 .swal2-content {
   z-index: 1;
   justify-content: center;
   margin: 0;
   padding: 0;
   color: #545454;
   font-size: 1.125em;
   font-weight: normal;
   line-height: normal;
   text-align: center;
   word-wrap: break-word;
 }
 
 .swal2-input,
 .swal2-file,
 .swal2-textarea,
 .swal2-select,
 .swal2-radio,
 .swal2-checkbox {
   margin: 1em auto;
 }
 
 .swal2-input,
 .swal2-file,
 .swal2-textarea {
   box-sizing: border-box;
   width: 100%;
   transition: initial;
   border: 1px solid #d9d9d9;
   border-radius: 0;
   background: inherit;
   box-shadow: none;
   color: inherit;
   font-size: 1.125em;
 }
 
 .swal2-input.swal2-inputerror,
 .swal2-file.swal2-inputerror,
 .swal2-textarea.swal2-inputerror {
   border-color: #f27474 !important;
   box-shadow: 0 0 2px #f27474 !important;
 }
 
 .swal2-input:focus,
 .swal2-file:focus,
 .swal2-textarea:focus {
   border: 1px solid #b4dbed;
   outline: none;
   box-shadow: 0 0 3px #c4e6f5;
 }
 
 .swal2-input::-webkit-input-placeholder, .swal2-file::-webkit-input-placeholder, .swal2-textarea::-webkit-input-placeholder {
   color: #cccccc;
 }
 
 .swal2-input::-moz-placeholder, .swal2-file::-moz-placeholder, .swal2-textarea::-moz-placeholder {
   color: #cccccc;
 }
 
 .swal2-input:-ms-input-placeholder, .swal2-file:-ms-input-placeholder, .swal2-textarea:-ms-input-placeholder {
   color: #cccccc;
 }
 
 .swal2-input::-ms-input-placeholder, .swal2-file::-ms-input-placeholder, .swal2-textarea::-ms-input-placeholder {
   color: #cccccc;
 }
 
 .swal2-input::placeholder,
 .swal2-file::placeholder,
 .swal2-textarea::placeholder {
   color: #cccccc;
 }
 
 .swal2-range {
   margin: 1em auto;
   background: #fff;
 }
 
 .swal2-range input {
   width: 80%;
 }
 
 .swal2-range output {
   width: 20%;
   color: inherit;
   font-weight: 600;
   text-align: center;
 }
 
 .swal2-range input,
 .swal2-range output {
   height: 2.625em;
   padding: 0;
   font-size: 1.125em;
   line-height: 2.625em;
 }
 
 .swal2-input {
   height: 2.625em;
   padding: 0 0.75em;
 }
 
 .swal2-input[type=number] {
   max-width: 10em;
 }
 
 .swal2-file {
   background: inherit;
   font-size: 1.125em;
 }
 
 .swal2-textarea {
   height: 6.75em;
   padding: 0.75em;
 }
 
 .swal2-select {
   min-width: 50%;
   max-width: 100%;
   padding: 0.375em 0.625em;
   background: inherit;
   color: inherit;
   font-size: 1.125em;
 }
 
 .swal2-radio,
 .swal2-checkbox {
   align-items: center;
   justify-content: center;
   background: #fff;
   color: inherit;
 }
 
 .swal2-radio label,
 .swal2-checkbox label {
   margin: 0 0.6em;
   font-size: 1.125em;
 }
 
 .swal2-radio input,
 .swal2-checkbox input {
   margin: 0 0.4em;
 }
 
 .swal2-validation-message {
   display: none;
   align-items: center;
   justify-content: center;
   padding: 0.625em;
   overflow: hidden;
   background: #f0f0f0;
   color: #666666;
   font-size: 1em;
   font-weight: 300;
 }
 
 .swal2-validation-message::before {
   content: "!";
   display: inline-block;
   width: 1.5em;
   min-width: 1.5em;
   height: 1.5em;
   margin: 0 0.625em;
   border-radius: 50%;
   background-color: #f27474;
   color: #fff;
   font-weight: 600;
   line-height: 1.5em;
   text-align: center;
 }
 
 .swal2-icon {
   position: relative;
   box-sizing: content-box;
   justify-content: center;
   width: 5em;
   height: 5em;
   margin: 1.25em auto 1.875em;
   border: 0.25em solid transparent;
   border-radius: 50%;
   font-family: inherit;
   line-height: 5em;
   cursor: default;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
 
 .swal2-icon .swal2-icon-content {
   display: flex;
   align-items: center;
   font-size: 3.75em;
 }
 
 .swal2-icon.swal2-error {
   border-color: @alert2;
   color: @alert2;
 }
 
 .swal2-icon.swal2-error .swal2-x-mark {
   position: relative;
   flex-grow: 1;
 }
 
 .swal2-icon.swal2-error [class^=swal2-x-mark-line] {
   display: block;
   position: absolute;
   top: 2.3125em;
   width: 2.9375em;
   height: 0.3125em;
   border-radius: 0.125em;
   background-color: @alert2;
 }
 
 .swal2-icon.swal2-error [class^=swal2-x-mark-line][class$=left] {
   left: 1.0625em;
   transform: rotate(45deg);
 }
 
 .swal2-icon.swal2-error [class^=swal2-x-mark-line][class$=right] {
   right: 1em;
   transform: rotate(-45deg);
 }
 
 .swal2-icon.swal2-error.swal2-icon-show {
   //-webkit-animation: swal2-animate-error-icon 0.5s;
   //        animation: swal2-animate-error-icon 0.5s;
 }
 
 .swal2-icon.swal2-error.swal2-icon-show .swal2-x-mark {
   //-webkit-animation: swal2-animate-error-x-mark 0.5s;
   //        animation: swal2-animate-error-x-mark 0.5s;
 }
 
 .swal2-icon.swal2-warning {
   border-color: @alert3;
   color: @alert3;
 }
 
 .swal2-icon.swal2-info {
   border-color: #9de0f6;
   color: #3fc3ee;
 }
 
 .swal2-icon.swal2-question {
   border-color: #c9dae1;
   color: #87adbd;
 }
 
 .swal2-icon.swal2-success {
   border-color: @alert1;
   color: @alert1;
 }
 
 .swal2-icon.swal2-success [class^=swal2-success-circular-line] {
   position: absolute;
   width: 3.75em;
   height: 7.5em;
   transform: rotate(45deg);
   border-radius: 50%;
 }
 
 .swal2-icon.swal2-success [class^=swal2-success-circular-line][class$=left] {
   top: -0.4375em;
   left: -2.0635em;
   transform: rotate(-45deg);
   transform-origin: 3.75em 3.75em;
   border-radius: 7.5em 0 0 7.5em;
 }
 
 .swal2-icon.swal2-success [class^=swal2-success-circular-line][class$=right] {
   top: -0.6875em;
   left: 1.875em;
   transform: rotate(-45deg);
   transform-origin: 0 3.75em;
   border-radius: 0 7.5em 7.5em 0;
 }
 
 .swal2-icon.swal2-success .swal2-success-ring {
   position: absolute;
   z-index: 2;
   top: -0.25em;
   left: -0.25em;
   box-sizing: content-box;
   width: 100%;
   height: 100%;
   border: 0.25em solid rgba(165, 220, 134, 0.3);
   border-radius: 50%;
 }
 
 .swal2-icon.swal2-success .swal2-success-fix {
   position: absolute;
   z-index: 1;
   top: 0.5em;
   left: 1.625em;
   width: 0.4375em;
   height: 5.625em;
   transform: rotate(-45deg);
 }
 
 .swal2-icon.swal2-success [class^=swal2-success-line] {
   display: block;
   position: absolute;
   z-index: 2;
   height: 0.3125em;
   border-radius: 0.125em;
   background-color: @alert1;
 }
 
 .swal2-icon.swal2-success [class^=swal2-success-line][class$=tip] {
   top: 2.875em;
   left: 0.8125em;
   width: 1.5625em;
   transform: rotate(45deg);
 }
 
 .swal2-icon.swal2-success [class^=swal2-success-line][class$=long] {
   top: 2.375em;
   right: 0.5em;
   width: 2.9375em;
   transform: rotate(-45deg);
 }
 
 .swal2-icon.swal2-success.swal2-icon-show .swal2-success-line-tip {
   -webkit-animation: swal2-animate-success-line-tip 0.75s;
   animation: swal2-animate-success-line-tip 0.75s;
 }
 
 .swal2-icon.swal2-success.swal2-icon-show .swal2-success-line-long {
   -webkit-animation: swal2-animate-success-line-long 0.75s;
   animation: swal2-animate-success-line-long 0.75s;
 }
 
 .swal2-icon.swal2-success.swal2-icon-show .swal2-success-circular-line-right {
   -webkit-animation: swal2-rotate-success-circular-line 4.25s ease-in;
   animation: swal2-rotate-success-circular-line 4.25s ease-in;
 }
 
 .swal2-progress-steps {
   align-items: center;
   margin: 0 0 1.25em;
   padding: 0;
   background: inherit;
   font-weight: 600;
 }
 
 .swal2-progress-steps li {
   display: inline-block;
   position: relative;
 }
 
 .swal2-progress-steps .swal2-progress-step {
   z-index: 20;
   width: 2em;
   height: 2em;
   border-radius: 2em;
   background: #3085d6;
   color: #fff;
   line-height: 2em;
   text-align: center;
 }
 
 .swal2-progress-steps .swal2-progress-step.swal2-active-progress-step {
   background: #3085d6;
 }
 
 .swal2-progress-steps .swal2-progress-step.swal2-active-progress-step ~ .swal2-progress-step {
   background: #add8e6;
   color: #fff;
 }
 
 .swal2-progress-steps .swal2-progress-step.swal2-active-progress-step ~ .swal2-progress-step-line {
   background: #add8e6;
 }
 
 .swal2-progress-steps .swal2-progress-step-line {
   z-index: 10;
   width: 2.5em;
   height: 0.4em;
   margin: 0 -1px;
   background: #3085d6;
 }
 
 [class^=swal2] {
   -webkit-tap-highlight-color: transparent;
 }
 
 .swal2-show {
   -webkit-animation: swal2-show 0.3s;
   animation: swal2-show 0.3s;
 }
 
 .swal2-hide {
   -webkit-animation: swal2-hide 0.15s forwards;
   animation: swal2-hide 0.15s forwards;
 }
 
 .swal2-noanimation {
   transition: none;
 }
 
 .swal2-scrollbar-measure {
   position: absolute;
   top: -9999px;
   width: 50px;
   height: 50px;
   overflow: scroll;
 }
 
 .swal2-rtl .swal2-close {
   right: auto;
   left: 0;
 }
 
 .swal2-rtl .swal2-timer-progress-bar {
   right: 0;
   left: auto;
 }
 
 @supports (-ms-accelerator: true) {
   .swal2-range input {
     width: 100% !important;
   }
 
   .swal2-range output {
     display: none;
   }
 }
 
 @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
   .swal2-range input {
     width: 100% !important;
   }
 
   .swal2-range output {
     display: none;
   }
 }
 
 @-moz-document url-prefix() {
   .swal2-close:focus {
     outline: 2px solid rgba(50, 100, 150, 0.4);
   }
 }
 
 @-webkit-keyframes swal2-toast-show {
   0% {
     transform: translateY(-0.625em) rotateZ(2deg);
   }
   33% {
     transform: translateY(0) rotateZ(-2deg);
   }
   66% {
     transform: translateY(0.3125em) rotateZ(2deg);
   }
   100% {
     transform: translateY(0) rotateZ(0deg);
   }
 }
 
 @keyframes swal2-toast-show {
   0% {
     transform: translateY(-0.625em) rotateZ(2deg);
   }
   33% {
     transform: translateY(0) rotateZ(-2deg);
   }
   66% {
     transform: translateY(0.3125em) rotateZ(2deg);
   }
   100% {
     transform: translateY(0) rotateZ(0deg);
   }
 }
 
 @-webkit-keyframes swal2-toast-hide {
   100% {
     transform: rotateZ(1deg);
     opacity: 0;
   }
 }
 
 @keyframes swal2-toast-hide {
   100% {
     transform: rotateZ(1deg);
     opacity: 0;
   }
 }
 
 @-webkit-keyframes swal2-toast-animate-success-line-tip {
   0% {
     top: 0.5625em;
     left: 0.0625em;
     width: 0;
   }
   54% {
     top: 0.125em;
     left: 0.125em;
     width: 0;
   }
   70% {
     top: 0.625em;
     left: -0.25em;
     width: 1.625em;
   }
   84% {
     top: 1.0625em;
     left: 0.75em;
     width: 0.5em;
   }
   100% {
     top: 1.125em;
     left: 0.1875em;
     width: 0.75em;
   }
 }
 
 @keyframes swal2-toast-animate-success-line-tip {
   0% {
     top: 0.5625em;
     left: 0.0625em;
     width: 0;
   }
   54% {
     top: 0.125em;
     left: 0.125em;
     width: 0;
   }
   70% {
     top: 0.625em;
     left: -0.25em;
     width: 1.625em;
   }
   84% {
     top: 1.0625em;
     left: 0.75em;
     width: 0.5em;
   }
   100% {
     top: 1.125em;
     left: 0.1875em;
     width: 0.75em;
   }
 }
 
 @-webkit-keyframes swal2-toast-animate-success-line-long {
   0% {
     top: 1.625em;
     right: 1.375em;
     width: 0;
   }
   65% {
     top: 1.25em;
     right: 0.9375em;
     width: 0;
   }
   84% {
     top: 0.9375em;
     right: 0;
     width: 1.125em;
   }
   100% {
     top: 0.9375em;
     right: 0.1875em;
     width: 1.375em;
   }
 }
 
 @keyframes swal2-toast-animate-success-line-long {
   0% {
     top: 1.625em;
     right: 1.375em;
     width: 0;
   }
   65% {
     top: 1.25em;
     right: 0.9375em;
     width: 0;
   }
   84% {
     top: 0.9375em;
     right: 0;
     width: 1.125em;
   }
   100% {
     top: 0.9375em;
     right: 0.1875em;
     width: 1.375em;
   }
 }
 
 @-webkit-keyframes swal2-show {
   0% {
     transform: scale(0.7);
   }
   45% {
     transform: scale(1.05);
   }
   80% {
     transform: scale(0.95);
   }
   100% {
     transform: scale(1);
   }
 }
 
 @keyframes swal2-show {
   0% {
     transform: scale(0.7);
   }
   45% {
     transform: scale(1.05);
   }
   80% {
     transform: scale(0.95);
   }
   100% {
     transform: scale(1);
   }
 }
 
 @-webkit-keyframes swal2-hide {
   0% {
     transform: scale(1);
     opacity: 1;
   }
   100% {
     transform: scale(0.5);
     opacity: 0;
   }
 }
 
 @keyframes swal2-hide {
   0% {
     transform: scale(1);
     opacity: 1;
   }
   100% {
     transform: scale(0.5);
     opacity: 0;
   }
 }
 
 @-webkit-keyframes swal2-animate-success-line-tip {
   0% {
     top: 1.1875em;
     left: 0.0625em;
     width: 0;
   }
   54% {
     top: 1.0625em;
     left: 0.125em;
     width: 0;
   }
   70% {
     top: 2.1875em;
     left: -0.375em;
     width: 3.125em;
   }
   84% {
     top: 3em;
     left: 1.3125em;
     width: 1.0625em;
   }
   100% {
     top: 2.8125em;
     left: 0.8125em;
     width: 1.5625em;
   }
 }
 
 @keyframes swal2-animate-success-line-tip {
   0% {
     top: 1.1875em;
     left: 0.0625em;
     width: 0;
   }
   54% {
     top: 1.0625em;
     left: 0.125em;
     width: 0;
   }
   70% {
     top: 2.1875em;
     left: -0.375em;
     width: 3.125em;
   }
   84% {
     top: 3em;
     left: 1.3125em;
     width: 1.0625em;
   }
   100% {
     top: 2.8125em;
     left: 0.8125em;
     width: 1.5625em;
   }
 }
 
 @-webkit-keyframes swal2-animate-success-line-long {
   0% {
     top: 3.375em;
     right: 2.875em;
     width: 0;
   }
   65% {
     top: 3.375em;
     right: 2.875em;
     width: 0;
   }
   84% {
     top: 2.1875em;
     right: 0;
     width: 3.4375em;
   }
   100% {
     top: 2.375em;
     right: 0.5em;
     width: 2.9375em;
   }
 }
 
 @keyframes swal2-animate-success-line-long {
   0% {
     top: 3.375em;
     right: 2.875em;
     width: 0;
   }
   65% {
     top: 3.375em;
     right: 2.875em;
     width: 0;
   }
   84% {
     top: 2.1875em;
     right: 0;
     width: 3.4375em;
   }
   100% {
     top: 2.375em;
     right: 0.5em;
     width: 2.9375em;
   }
 }
 
 @-webkit-keyframes swal2-rotate-success-circular-line {
   0% {
     transform: rotate(-45deg);
   }
   5% {
     transform: rotate(-45deg);
   }
   12% {
     transform: rotate(-405deg);
   }
   100% {
     transform: rotate(-405deg);
   }
 }
 
 @keyframes swal2-rotate-success-circular-line {
   0% {
     transform: rotate(-45deg);
   }
   5% {
     transform: rotate(-45deg);
   }
   12% {
     transform: rotate(-405deg);
   }
   100% {
     transform: rotate(-405deg);
   }
 }
 
 @-webkit-keyframes swal2-animate-error-x-mark {
   0% {
     margin-top: 1.625em;
     transform: scale(0.4);
     opacity: 0;
   }
   50% {
     margin-top: 1.625em;
     transform: scale(0.4);
     opacity: 0;
   }
   80% {
     margin-top: -0.375em;
     transform: scale(1.15);
   }
   100% {
     margin-top: 0;
     transform: scale(1);
     opacity: 1;
   }
 }
 
 @keyframes swal2-animate-error-x-mark {
   0% {
     margin-top: 1.625em;
     transform: scale(0.4);
     opacity: 0;
   }
   50% {
     margin-top: 1.625em;
     transform: scale(0.4);
     opacity: 0;
   }
   80% {
     margin-top: -0.375em;
     transform: scale(1.15);
   }
   100% {
     margin-top: 0;
     transform: scale(1);
     opacity: 1;
   }
 }
 
 @-webkit-keyframes swal2-animate-error-icon {
   0% {
     transform: rotateX(100deg);
     opacity: 0;
   }
   100% {
     transform: rotateX(0deg);
     opacity: 1;
   }
 }
 
 @keyframes swal2-animate-error-icon {
   0% {
     transform: rotateX(100deg);
     opacity: 0;
   }
   100% {
     transform: rotateX(0deg);
     opacity: 1;
   }
 }
 
 @-webkit-keyframes swal2-rotate-loading {
   0% {
     transform: rotate(0deg);
   }
   100% {
     transform: rotate(360deg);
   }
 }
 
 @keyframes swal2-rotate-loading {
   0% {
     transform: rotate(0deg);
   }
   100% {
     transform: rotate(360deg);
   }
 }
 
 body.swal2-shown:not(.swal2-no-backdrop):not(.swal2-toast-shown) {
   overflow: hidden;
 }
 
 body.swal2-height-auto {
   height: auto !important;
 }
 
 body.swal2-no-backdrop .swal2-container {
   top: auto;
   right: auto;
   bottom: auto;
   left: auto;
   max-width: calc(100% - 0.625em * 2);
   background-color: transparent !important;
 }
 
 body.swal2-no-backdrop .swal2-container > .swal2-modal {
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.4);
 }
 
 body.swal2-no-backdrop .swal2-container.swal2-top {
   top: 0;
   left: 50%;
   transform: translateX(-50%);
 }
 
 body.swal2-no-backdrop .swal2-container.swal2-top-start, body.swal2-no-backdrop .swal2-container.swal2-top-left {
   top: 0;
   left: 0;
 }
 
 body.swal2-no-backdrop .swal2-container.swal2-top-end, body.swal2-no-backdrop .swal2-container.swal2-top-right {
   top: 0;
   right: 0;
 }
 
 body.swal2-no-backdrop .swal2-container.swal2-center {
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
 }
 
 body.swal2-no-backdrop .swal2-container.swal2-center-start, body.swal2-no-backdrop .swal2-container.swal2-center-left {
   top: 50%;
   left: 0;
   transform: translateY(-50%);
 }
 
 body.swal2-no-backdrop .swal2-container.swal2-center-end, body.swal2-no-backdrop .swal2-container.swal2-center-right {
   top: 50%;
   right: 0;
   transform: translateY(-50%);
 }
 
 body.swal2-no-backdrop .swal2-container.swal2-bottom {
   bottom: 0;
   left: 50%;
   transform: translateX(-50%);
 }
 
 body.swal2-no-backdrop .swal2-container.swal2-bottom-start, body.swal2-no-backdrop .swal2-container.swal2-bottom-left {
   bottom: 0;
   left: 0;
 }
 
 body.swal2-no-backdrop .swal2-container.swal2-bottom-end, body.swal2-no-backdrop .swal2-container.swal2-bottom-right {
   right: 0;
   bottom: 0;
 }
 
 @media print {
   body.swal2-shown:not(.swal2-no-backdrop):not(.swal2-toast-shown) {
     overflow-y: scroll !important;
   }
 
   body.swal2-shown:not(.swal2-no-backdrop):not(.swal2-toast-shown) > [aria-hidden=true] {
     display: none;
   }
 
   body.swal2-shown:not(.swal2-no-backdrop):not(.swal2-toast-shown) .swal2-container {
     position: static !important;
   }
 }
 
 body.swal2-toast-shown .swal2-container {
   background-color: transparent;
 }
 
 body.swal2-toast-shown .swal2-container.swal2-top {
   top: 0;
   right: auto;
   bottom: auto;
   left: 50%;
   transform: translateX(-50%);
 }
 
 body.swal2-toast-shown .swal2-container.swal2-top-end, body.swal2-toast-shown .swal2-container.swal2-top-right {
   top: 0;
   right: 0;
   bottom: auto;
   left: auto;
 }
 
 body.swal2-toast-shown .swal2-container.swal2-top-start, body.swal2-toast-shown .swal2-container.swal2-top-left {
   top: 0;
   right: auto;
   bottom: auto;
   left: 0;
 }
 
 body.swal2-toast-shown .swal2-container.swal2-center-start, body.swal2-toast-shown .swal2-container.swal2-center-left {
   top: 50%;
   right: auto;
   bottom: auto;
   left: 0;
   transform: translateY(-50%);
 }
 
 body.swal2-toast-shown .swal2-container.swal2-center {
   top: 50%;
   right: auto;
   bottom: auto;
   left: 50%;
   transform: translate(-50%, -50%);
 }
 
 body.swal2-toast-shown .swal2-container.swal2-center-end, body.swal2-toast-shown .swal2-container.swal2-center-right {
   top: 50%;
   right: 0;
   bottom: auto;
   left: auto;
   transform: translateY(-50%);
 }
 
 body.swal2-toast-shown .swal2-container.swal2-bottom-start, body.swal2-toast-shown .swal2-container.swal2-bottom-left {
   top: auto;
   right: auto;
   bottom: 0;
   left: 0;
 }
 
 body.swal2-toast-shown .swal2-container.swal2-bottom {
   top: auto;
   right: auto;
   bottom: 0;
   left: 50%;
   transform: translateX(-50%);
 }
 
 body.swal2-toast-shown .swal2-container.swal2-bottom-end, body.swal2-toast-shown .swal2-container.swal2-bottom-right {
   top: auto;
   right: 0;
   bottom: 0;
   left: auto;
 }
 
 body.swal2-toast-column .swal2-toast {
   flex-direction: column;
   align-items: stretch;
 }
 
 body.swal2-toast-column .swal2-toast .swal2-actions {
   flex: 1;
   align-self: stretch;
   height: 2.2em;
   margin-top: 0.3125em;
 }
 
 body.swal2-toast-column .swal2-toast .swal2-loading {
   justify-content: center;
 }
 
 body.swal2-toast-column .swal2-toast .swal2-input {
   height: 2em;
   margin: 0.3125em auto;
   font-size: 1em;
 }
 
 body.swal2-toast-column .swal2-toast .swal2-validation-message {
   font-size: 1em;
 }
  No newline at end of file

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

@@ -1,153 +1,170 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
     '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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Not Reviewed',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Selection link',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Stop following this repository',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'files',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

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

@@ -1,153 +1,170 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
     '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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'Keine Treffer gefunden',
     'No matching files': 'No matching files',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Nicht Begutachtet',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Bitte {0} Zeichen löschen',
     '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...',
     'Selection link': 'Selection link',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Stop following this repository',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'files',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

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

@@ -1,153 +1,170 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
     '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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Not Reviewed',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Selection link',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Stop following this repository',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'files',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

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

@@ -1,153 +1,170 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
     '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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Not Reviewed',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Selection link',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Stop following this repository',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'files',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

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

@@ -1,153 +1,170 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
     '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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Pas encore relue',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Nouvelle requête de pull',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Lien vers la sélection',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Arrêter de suivre ce dépôt',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Envoi…',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'Désactivé',
     'enabled': 'Activé',
     'file': 'file',
     'files': 'Fichiers',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'Spécifier un commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} jours',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} heures',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} mois',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} années',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

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

@@ -1,153 +1,170 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
     '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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'Nessuna corrispondenza',
     'No matching files': 'Nessuna corrispondenza tra i file',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'Nessun risultato',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Non Revisionato',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Apri una richiesta PULL',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Collegamento selezione',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Smetti di seguire il repository',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Inoltro...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabilitato',
     'enabled': 'abilitato',
     'file': 'file',
     'files': 'i file',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

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

@@ -1,153 +1,170 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
     '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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'まだブックマークがありません。',
     'No branches available yet.': 'まだブランチがありません。',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'まだ Gist がありません。',
     'No matches found': '一致するものが見つかりません',
     'No matching files': 'マッチするファイルはありません',
     'No pull requests available yet.': 'まだプルリクエストがありません。',
     'No repositories available yet.': 'まだリポジトリがありません。',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'まだリポジトリグループがありません。',
     'No repository groups present.': 'No repository groups present.',
     'No results': '結果がありません',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'まだタグがありません。',
     'No user groups available yet.': 'まだユーザーグループがありません。',
     'No users available yet.': 'まだユーザーがいません。',
     'Not Reviewed': '未レビュー',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': '1 件の結果があります。 Enter で選択できます。',
     'Open new pull request': '新しいプルリクエストを作成',
     'Open new pull request for selected commit': '選択したコミットから新しいプルリクエストを作成',
     'Please delete {0} character': '{0} 文字削除してください',
     '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...': '検索中...',
     'Selection link': 'セレクション・リンク',
     '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': 'このリポジトリのフォローする',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'ステータスレビュー',
     'Stop following this repository': 'このリポジトリのフォローをやめる',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': '送信中...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': '無効',
     'enabled': '有効',
     'file': 'ファイル',
     'files': 'ファイル',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': '省略された結果',
     'truncated results': '省略された結果',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} 前',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} 日',
     '{0} days': '{0} days',
     '{0} hour': '{0} 時間',
     '{0} hours': '{0} hours',
     '{0} min': '{0} 分',
     '{0} month': '{0} ヶ月',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} 件の結果があります。矢印キーの上下で選択できます。',
     '{0} sec': '{0} 秒',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} 年',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

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

@@ -1,146 +1,163 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');
 _gettext('Collapse all files');
 _gettext('Collapse {0} commit');
 _gettext('Collapse {0} commits');
 _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');
 _gettext('Hide whitespace changes');
 _gettext('Invite reviewers to this discussion');
 _gettext('Leave a comment on line {0}.');
 _gettext('Leave a comment, or click resolve button to resolve TODO comment #{0}');
 _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...');
 _gettext('No bookmarks available yet.');
 _gettext('No branches available yet.');
 _gettext('No forks available yet.');
 _gettext('No gists available yet.');
 _gettext('No matches found');
 _gettext('No matching files');
 _gettext('No pull requests available yet.');
 _gettext('No repositories available yet.');
 _gettext('No repositories present.');
 _gettext('No repository groups available yet.');
 _gettext('No repository groups present.');
 _gettext('No results');
 _gettext('No ssh keys available yet.');
 _gettext('No tags available yet.');
 _gettext('No user groups available yet.');
 _gettext('No users available yet.');
 _gettext('Not Reviewed');
 _gettext('Note Comment');
 _gettext('One result is available, press enter to select it.');
 _gettext('Open new pull request');
 _gettext('Open new pull request for selected commit');
 _gettext('Please delete {0} character');
 _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...');
 _gettext('Selection link');
 _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');
 _gettext('Started watching this repository');
 _gettext('Status Review');
 _gettext('Stop following this repository');
 _gettext('Stopped watching this repository');
 _gettext('Submitting...');
 _gettext('Switch to chat');
 _gettext('Switch to comment');
 _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');
 _gettext('Updating...');
 _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');
 _gettext('added manually by "{0}"');
 _gettext('date not in future');
 _gettext('disabled');
 _gettext('enabled');
 _gettext('file');
 _gettext('files');
 _gettext('go to numeric commit');
 _gettext('in {0}');
 _gettext('in {0} and {1}');
 _gettext('in {0}, {1}');
 _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');
 _gettext('showing {0} out of {1} commits');
 _gettext('specify commit');
 _gettext('truncated result');
 _gettext('truncated results');
 _gettext('{0} ({1} inactive) of {2} user groups ({3} inactive)');
 _gettext('{0} ({1} inactive) of {2} users ({3} inactive)');
 _gettext('{0} active out of {1} users');
 _gettext('{0} ago');
 _gettext('{0} and {1}');
 _gettext('{0} and {1} ago');
 _gettext('{0} day');
 _gettext('{0} days');
 _gettext('{0} hour');
 _gettext('{0} hours');
 _gettext('{0} min');
 _gettext('{0} month');
 _gettext('{0} months');
 _gettext('{0} of {1} repositories');
 _gettext('{0} of {1} repository groups');
 _gettext('{0} out of {1} ssh keys');
 _gettext('{0} out of {1} users');
 _gettext('{0} repositories');
 _gettext('{0} repository groups');
 _gettext('{0} results are available, use up and down arrow keys to navigate.');
 _gettext('{0} sec');
 _gettext('{0} user groups ({1} inactive)');
 _gettext('{0} users ({1} inactive)');
 _gettext('{0} year');
 _gettext('{0} years');
 _gettext('{0}, {1} ago');

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

@@ -1,153 +1,170 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
     '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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'Nie ma plików pasujących',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Brak Korekty',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Otwórz nową prośbę o połączenie gałęzi',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Wybór linku',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Zakończyć obserwację tego repozytorium',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Przesyłanie...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'pliki',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} aktywnych z {1} użytkowników',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

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

@@ -1,153 +1,170 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
     '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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'Nenhum arquivo encontrado',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Não Revisado',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Crie novo pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Link da seleção',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Parar de seguir este repositório',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Enviando...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'desabilitado',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'arquivos',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

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

@@ -1,153 +1,170 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
     '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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'Нет совпадений',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Не просмотрено',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Создать новый pull запрос',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Ссылка выбора',
     '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': 'Наблюдать за репозиторием',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Отменить наблюдение за репозиторием',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Применение...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'отключено',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'файлы',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

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

@@ -1,153 +1,170 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
     '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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': '未检视',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': '新建拉取请求',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': '选择链接',
     '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': '开始关注该版本库',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': '停止关注该版本库',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': '提交中……',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': '禁用',
     'enabled': 'enabled',
     'file': 'file',
     'files': '文件',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/templates/base/base.mako

@@ -1,1201 +1,1210 b''
 ## -*- coding: utf-8 -*-
 
 <%!
     ## base64 filter e.g ${ example | base64 }
     def base64(text):
         import base64
         from rhodecode.lib.helpers import safe_str
         return base64.encodestring(safe_str(text))
 %>
 
 <%inherit file="root.mako"/>
 
 <%include file="/ejs_templates/templates.html"/>
 
 <div class="outerwrapper">
   <!-- HEADER -->
   <div class="header">
       <div id="header-inner" class="wrapper">
           <div id="logo">
               <div class="logo-wrapper">
                   <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
               </div>
               % if c.rhodecode_name:
                <div class="branding">
                    <a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
                </div>
               % endif
           </div>
           <!-- MENU BAR NAV -->
           ${self.menu_bar_nav()}
           <!-- END MENU BAR NAV -->
       </div>
   </div>
   ${self.menu_bar_subnav()}
   <!-- END HEADER -->
 
   <!-- CONTENT -->
   <div id="content" class="wrapper">
 
       <rhodecode-toast id="notifications"></rhodecode-toast>
 
       <div class="main">
           ${next.main()}
       </div>
   </div>
   <!-- END CONTENT -->
 
 </div>
 <!-- FOOTER -->
 <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
            </p>
        </div>
    </div>
 </div>
 
 <!-- END FOOTER -->
 
 ### MAKO DEFS ###
 
 <%def name="menu_bar_subnav()">
 </%def>
 
 <%def name="breadcrumbs(class_='breadcrumbs')">
     <div class="${class_}">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 
 <%def name="admin_menu(active=None)">
 
   <div id="context-bar">
     <div class="wrapper">
       <div class="title">
         <div class="title-content">
           <div class="title-main">
             % if c.is_super_admin:
                 ${_('Super-admin Panel')}
             % else:
                 ${_('Delegated Admin Panel')}
             % endif
           </div>
         </div>
       </div>
 
     <ul id="context-pages" class="navigation horizontal-list">
 
         ## super-admin case
         % if c.is_super_admin:
           <li class="${h.is_active('audit_logs', active)}"><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
           <li class="${h.is_active('repositories', active)}"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
           <li class="${h.is_active('repository_groups', active)}"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
           <li class="${h.is_active('users', active)}"><a href="${h.route_path('users')}">${_('Users')}</a></li>
           <li class="${h.is_active('user_groups', active)}"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
           <li class="${h.is_active('permissions', active)}"><a href="${h.route_path('admin_permissions_application')}">${_('Permissions')}</a></li>
           <li class="${h.is_active('authentication', active)}"><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
           <li class="${h.is_active('integrations', active)}"><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
           <li class="${h.is_active('defaults', active)}"><a href="${h.route_path('admin_defaults_repositories')}">${_('Defaults')}</a></li>
           <li class="${h.is_active('settings', active)}"><a href="${h.route_path('admin_settings')}">${_('Settings')}</a></li>
 
         ## delegated admin
         % elif c.is_delegated_admin:
            <%
            repositories=c.auth_user.repositories_admin or c.can_create_repo
            repository_groups=c.auth_user.repository_groups_admin or c.can_create_repo_group
            user_groups=c.auth_user.user_groups_admin or c.can_create_user_group
            %>
 
            %if repositories:
               <li class="${h.is_active('repositories', active)} local-admin-repos"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
            %endif
            %if repository_groups:
               <li class="${h.is_active('repository_groups', active)} local-admin-repo-groups"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
            %endif
            %if user_groups:
               <li class="${h.is_active('user_groups', active)} local-admin-user-groups"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
            %endif
         % endif
     </ul>
 
     </div>
     <div class="clear"></div>
   </div>
 </%def>
 
 <%def name="dt_info_panel(elements)">
     <dl class="dl-horizontal">
     %for dt, dd, title, show_items in elements:
       <dt>${dt}:</dt>
       <dd title="${h.tooltip(title)}">
       %if callable(dd):
           ## allow lazy evaluation of elements
           ${dd()}
       %else:
           ${dd}
       %endif
       %if show_items:
           <span class="btn-collapse" data-toggle="item-${h.md5_safe(dt)[:6]}-details">${_('Show More')} </span>
       %endif
       </dd>
 
       %if show_items:
           <div class="collapsable-content" data-toggle="item-${h.md5_safe(dt)[:6]}-details" style="display: none">
           %for item in show_items:
               <dt></dt>
               <dd>${item}</dd>
           %endfor
           </div>
       %endif
 
     %endfor
     </dl>
 </%def>
 
 <%def name="tr_info_entry(element)">
     <% key, val, title, show_items = element %>
 
     <tr>
         <td style="vertical-align: top">${key}</td>
         <td title="${h.tooltip(title)}">
           %if callable(val):
               ## allow lazy evaluation of elements
               ${val()}
           %else:
               ${val}
           %endif
           %if show_items:
               <div class="collapsable-content" data-toggle="item-${h.md5_safe(val)[:6]}-details" style="display: none">
               % for item in show_items:
                   <dt></dt>
                   <dd>${item}</dd>
               % endfor
               </div>
           %endif
         </td>
         <td style="vertical-align: top">
           %if show_items:
               <span class="btn-collapse" data-toggle="item-${h.md5_safe(val)[:6]}-details">${_('Show More')} </span>
           %endif
         </td>
     </tr>
 
 </%def>
 
 <%def name="gravatar(email, size=16, tooltip=False, tooltip_alt=None, user=None, extra_class=None)">
   <%
     if size > 16:
         gravatar_class = ['gravatar','gravatar-large']
     else:
         gravatar_class = ['gravatar']
 
     data_hovercard_url = ''
     data_hovercard_alt = tooltip_alt.replace('<', '&lt;').replace('>', '&gt;') if tooltip_alt else ''
 
     if tooltip:
         gravatar_class += ['tooltip-hovercard']
     if extra_class:
         gravatar_class += extra_class
     if tooltip and user:
         if user.username == h.DEFAULT_USER:
             gravatar_class.pop(-1)
         else:
             data_hovercard_url = request.route_path('hovercard_user', user_id=getattr(user, 'user_id', ''))
     gravatar_class = ' '.join(gravatar_class)
 
   %>
   <%doc>
     TODO: johbo: For now we serve double size images to make it smooth
     for retina. This is how it worked until now. Should be replaced
     with a better solution at some point.
   </%doc>
 
   <img class="${gravatar_class}" height="${size}" width="${size}" data-hovercard-url="${data_hovercard_url}" data-hovercard-alt="${data_hovercard_alt}" src="${h.gravatar_url(email, size * 2)}" />
 </%def>
 
 
 <%def name="gravatar_with_user(contact, size=16, show_disabled=False, tooltip=False, _class='rc-user')">
   <%
       email = h.email_or_none(contact)
       rc_user = h.discover_user(contact)
   %>
 
   <div class="${_class}">
     ${self.gravatar(email, size, tooltip=tooltip, tooltip_alt=contact, user=rc_user)}
     <span class="${('user user-disabled' if show_disabled else 'user')}"> ${h.link_to_user(rc_user or contact)}</span>
   </div>
 </%def>
 
 
 <%def name="user_group_icon(user_group=None, size=16, tooltip=False)">
   <%
     if (size > 16):
         gravatar_class = 'icon-user-group-alt'
     else:
         gravatar_class = 'icon-user-group-alt'
 
     if tooltip:
         gravatar_class += ' tooltip-hovercard'
 
     data_hovercard_url = request.route_path('hovercard_user_group', user_group_id=user_group.users_group_id)
   %>
   <%doc>
     TODO: johbo: For now we serve double size images to make it smooth
     for retina. This is how it worked until now. Should be replaced
     with a better solution at some point.
   </%doc>
 
   <i style="font-size: ${size}px" class="${gravatar_class} x-icon-size-${size}" data-hovercard-url="${data_hovercard_url}"></i>
 </%def>
 
 <%def name="repo_page_title(repo_instance)">
 <div class="title-content repo-title">
 
     <div class="title-main">
         ## SVN/HG/GIT icons
         %if h.is_hg(repo_instance):
             <i class="icon-hg"></i>
         %endif
         %if h.is_git(repo_instance):
             <i class="icon-git"></i>
         %endif
         %if h.is_svn(repo_instance):
             <i class="icon-svn"></i>
         %endif
 
         ## public/private
         %if repo_instance.private:
             <i class="icon-repo-private"></i>
         %else:
             <i class="icon-repo-public"></i>
         %endif
 
         ## repo name with group name
         ${h.breadcrumb_repo_link(repo_instance)}
 
         ## Context Actions
         <div class="pull-right">
             %if c.rhodecode_user.username != h.DEFAULT_USER:
                 <a href="${h.route_path('atom_feed_home', repo_name=c.rhodecode_db_repo.repo_uid, _query=dict(auth_token=c.rhodecode_user.feed_token))}" title="${_('RSS Feed')}" class="btn btn-sm"><i class="icon-rss-sign"></i>RSS</a>
 
                 <a href="#WatchRepo" onclick="toggleFollowingRepo(this, templateContext.repo_id); return false" title="${_('Watch this Repository and actions on it in your personalized journal')}" class="btn btn-sm ${('watching' if c.repository_is_user_following else '')}">
                     % if c.repository_is_user_following:
                         <i class="icon-eye-off"></i>${_('Unwatch')}
                     % else:
                         <i class="icon-eye"></i>${_('Watch')}
                     % endif
 
                 </a>
             %else:
                 <a href="${h.route_path('atom_feed_home', repo_name=c.rhodecode_db_repo.repo_uid)}" title="${_('RSS Feed')}" class="btn btn-sm"><i class="icon-rss-sign"></i>RSS</a>
             %endif
         </div>
 
     </div>
 
     ## FORKED
     %if repo_instance.fork:
     <p class="discreet">
         <i class="icon-code-fork"></i> ${_('Fork of')}
         ${h.link_to_if(c.has_origin_repo_read_perm,repo_instance.fork.repo_name, h.route_path('repo_summary', repo_name=repo_instance.fork.repo_name))}
     </p>
     %endif
 
     ## IMPORTED FROM REMOTE
     %if repo_instance.clone_uri:
     <p class="discreet">
        <i class="icon-code-fork"></i> ${_('Clone from')}
        <a href="${h.safe_str(h.hide_credentials(repo_instance.clone_uri))}">${h.hide_credentials(repo_instance.clone_uri)}</a>
     </p>
     %endif
 
     ## LOCKING STATUS
      %if repo_instance.locked[0]:
        <p class="locking_locked discreet">
            <i class="icon-repo-lock"></i>
            ${_('Repository locked by %(user)s') % {'user': h.person_by_id(repo_instance.locked[0])}}
        </p>
      %elif repo_instance.enable_locking:
          <p class="locking_unlocked discreet">
              <i class="icon-repo-unlock"></i>
              ${_('Repository not locked. Pull repository to lock it.')}
          </p>
      %endif
 
 </div>
 </%def>
 
 <%def name="repo_menu(active=None)">
     <%
     ## determine if we have "any" option available
     can_lock = h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking
     has_actions = can_lock
 
     %>
     % if c.rhodecode_db_repo.archived:
     <div class="alert alert-warning text-center">
         <strong>${_('This repository has been archived. It is now read-only.')}</strong>
     </div>
     % endif
 
   <!--- REPO CONTEXT BAR -->
   <div id="context-bar">
     <div class="wrapper">
 
       <div class="title">
           ${self.repo_page_title(c.rhodecode_db_repo)}
       </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()"
         %if c.rhodecode_db_repo.repo_type in ['git','hg']:
           <li class="${h.is_active('showpullrequest', active)}">
             <a class="menulink" href="${h.route_path('pullrequest_show_all', repo_name=c.repo_name)}" title="${h.tooltip(_('Show Pull Requests for %s') % c.repo_name)}">
               <div class="menulabel">
                   ${_('Pull Requests')} <span class="menulink-counter">${c.repository_pull_requests}</span>
               </div>
             </a>
           </li>
         %endif
 
         <li class="${h.is_active('artifacts', active)}">
             <a class="menulink" href="${h.route_path('repo_artifacts_list',repo_name=c.repo_name)}">
                 <div class="menulabel">
                     ${_('Artifacts')}  <span class="menulink-counter">${c.repository_artifacts}</span>
                 </div>
             </a>
         </li>
 
         %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
             <li class="${h.is_active('settings', active)}"><a class="menulink" href="${h.route_path('edit_repo',repo_name=c.repo_name)}"><div class="menulabel">${_('Repository Settings')}</div></a></li>
         %endif
 
         <li class="${h.is_active('options', active)}">
           % if has_actions:
             <a class="menulink dropdown">
               <div class="menulabel">${_('Options')}<div class="show_more"></div></div>
             </a>
             <ul class="submenu">
                 %if can_lock:
                     %if c.rhodecode_db_repo.locked[0]:
                       <li><a class="locking_del" href="${h.route_path('repo_edit_toggle_locking',repo_name=c.repo_name)}">${_('Unlock Repository')}</a></li>
                     %else:
                       <li><a class="locking_add" href="${h.route_path('repo_edit_toggle_locking',repo_name=c.repo_name)}">${_('Lock Repository')}</a></li>
                     %endif
                 %endif
             </ul>
           % endif
         </li>
 
       </ul>
     </div>
     <div class="clear"></div>
   </div>
 
   <!--- REPO END CONTEXT BAR -->
 
 </%def>
 
 <%def name="repo_group_page_title(repo_group_instance)">
 <div class="title-content">
     <div class="title-main">
         ## Repository Group icon
         <i class="icon-repo-group"></i>
 
         ## repo name with group name
         ${h.breadcrumb_repo_group_link(repo_group_instance)}
     </div>
 
     <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
     <div class="repo-group-desc discreet">
     ${dt.repo_group_desc(repo_group_instance.description_safe, repo_group_instance.personal, c.visual.stylify_metatags)}
     </div>
 
 </div>
 </%def>
 
 
 <%def name="repo_group_menu(active=None)">
     <%
     gr_name = c.repo_group.group_name if c.repo_group else None
     # create repositories with write permission on group is set to true
     group_admin = h.HasRepoGroupPermissionAny('group.admin')(gr_name, 'group admin index page')
 
     %>
 
 
   <!--- REPO GROUP CONTEXT BAR -->
   <div id="context-bar">
     <div class="wrapper">
       <div class="title">
           ${self.repo_group_page_title(c.repo_group)}
       </div>
 
       <ul id="context-pages" class="navigation horizontal-list">
         <li class="${h.is_active('home', active)}">
             <a class="menulink" href="${h.route_path('repo_group_home', repo_group_name=c.repo_group.group_name)}"><div class="menulabel">${_('Group Home')}</div></a>
         </li>
         % if c.is_super_admin or group_admin:
             <li class="${h.is_active('settings', active)}">
                 <a class="menulink" href="${h.route_path('edit_repo_group',repo_group_name=c.repo_group.group_name)}" title="${_('You have admin right to this group, and can edit it')}"><div class="menulabel">${_('Group Settings')}</div></a>
             </li>
         % endif
 
       </ul>
     </div>
     <div class="clear"></div>
   </div>
 
   <!--- REPO GROUP CONTEXT BAR -->
 
 </%def>
 
 
 <%def name="usermenu(active=False)">
     <%
     not_anonymous = c.rhodecode_user.username != h.DEFAULT_USER
 
     gr_name = c.repo_group.group_name if (hasattr(c, 'repo_group') and c.repo_group) else None
     # create repositories with write permission on group is set to true
 
     can_fork = c.is_super_admin or h.HasPermissionAny('hg.fork.repository')()
     create_on_write = h.HasPermissionAny('hg.create.write_on_repogroup.true')()
     group_write = h.HasRepoGroupPermissionAny('group.write')(gr_name, 'can write into group index page')
     group_admin = h.HasRepoGroupPermissionAny('group.admin')(gr_name, 'group admin index page')
 
     can_create_repos = c.is_super_admin or c.can_create_repo
     can_create_repo_groups = c.is_super_admin or c.can_create_repo_group
 
     can_create_repos_in_group = c.is_super_admin or group_admin or (group_write and create_on_write)
     can_create_repo_groups_in_group = c.is_super_admin or group_admin
     %>
 
     % if not_anonymous:
     <%
     default_target_group = dict()
     if c.rhodecode_user.personal_repo_group:
         default_target_group = dict(parent_group=c.rhodecode_user.personal_repo_group.group_id)
     %>
 
     ## create action
     <li>
        <a href="#create-actions" onclick="return false;" class="menulink childs">
         <i class="tooltip icon-plus-circled" title="${_('Create')}"></i>
        </a>
 
        <div class="action-menu submenu">
 
         <ol>
             ## scope of within a repository
             % if hasattr(c, 'rhodecode_db_repo') and c.rhodecode_db_repo:
                 <li class="submenu-title">${_('This Repository')}</li>
                 <li>
                     <a href="${h.route_path('pullrequest_new',repo_name=c.repo_name)}">${_('Create Pull Request')}</a>
                 </li>
                 % if can_fork:
                 <li>
                     <a href="${h.route_path('repo_fork_new',repo_name=c.repo_name,_query=default_target_group)}">${_('Fork this repository')}</a>
                 </li>
                 % endif
             % endif
 
             ## scope of within repository groups
             % if hasattr(c, 'repo_group') and c.repo_group and (can_create_repos_in_group or can_create_repo_groups_in_group):
                 <li class="submenu-title">${_('This Repository Group')}</li>
 
                 % if can_create_repos_in_group:
                     <li>
                     <a href="${h.route_path('repo_new',_query=dict(parent_group=c.repo_group.group_id))}">${_('New Repository')}</a>
                     </li>
                 % endif
 
                 % if can_create_repo_groups_in_group:
                     <li>
                         <a href="${h.route_path('repo_group_new',_query=dict(parent_group=c.repo_group.group_id))}">${_(u'New Repository Group')}</a>
                     </li>
                 % endif
             % endif
 
             ## personal group
             % if c.rhodecode_user.personal_repo_group:
                 <li class="submenu-title">Personal Group</li>
 
                 <li>
                 <a href="${h.route_path('repo_new',_query=dict(parent_group=c.rhodecode_user.personal_repo_group.group_id))}" >${_('New Repository')} </a>
                 </li>
 
                 <li>
                 <a href="${h.route_path('repo_group_new',_query=dict(parent_group=c.rhodecode_user.personal_repo_group.group_id))}">${_('New Repository Group')} </a>
                 </li>
             % endif
 
             ## Global actions
             <li class="submenu-title">RhodeCode</li>
             % if can_create_repos:
                 <li>
                 <a href="${h.route_path('repo_new')}" >${_('New Repository')}</a>
                 </li>
             % endif
 
             % if can_create_repo_groups:
                 <li>
                 <a href="${h.route_path('repo_group_new')}" >${_(u'New Repository Group')}</a>
                 </li>
             % endif
 
             <li>
                 <a href="${h.route_path('gists_new')}">${_(u'New Gist')}</a>
             </li>
 
         </ol>
 
        </div>
     </li>
 
     ## notifications
     <li>
        <a class="${('empty' if c.unread_notifications == 0 else '')}" href="${h.route_path('notifications_show_all')}">
            ${c.unread_notifications}
        </a>
     </li>
    % endif
 
     ## USER MENU
     <li id="quick_login_li" class="${'active' if active else ''}">
         % if c.rhodecode_user.username == h.DEFAULT_USER:
           <a id="quick_login_link" class="menulink childs" href="${h.route_path('login', _query={'came_from': h.current_route_path(request)})}">
             ${gravatar(c.rhodecode_user.email, 20)}
             <span class="user">
                 <span>${_('Sign in')}</span>
             </span>
           </a>
         % else:
           ## logged in user
           <a id="quick_login_link" class="menulink childs">
             ${gravatar(c.rhodecode_user.email, 20)}
             <span class="user">
                 <span class="menu_link_user">${c.rhodecode_user.username}</span>
                 <div class="show_more"></div>
             </span>
           </a>
           ## subnav with menu for logged in user
           <div class="user-menu submenu">
               <div id="quick_login">
                 %if c.rhodecode_user.username != h.DEFAULT_USER:
                     <div class="">
                         <div class="big_gravatar">${gravatar(c.rhodecode_user.email, 48)}</div>
                         <div class="full_name">${c.rhodecode_user.full_name_or_username}</div>
                         <div class="email">${c.rhodecode_user.email}</div>
                     </div>
                     <div class="">
                     <ol class="links">
                       <li>${h.link_to(_(u'My account'),h.route_path('my_account_profile'))}</li>
                       % if c.rhodecode_user.personal_repo_group:
                       <li>${h.link_to(_(u'My personal group'), h.route_path('repo_group_home', repo_group_name=c.rhodecode_user.personal_repo_group.group_name))}</li>
                       % endif
                       <li>${h.link_to(_(u'Pull Requests'), h.route_path('my_account_pullrequests'))}</li>
 
                       % if c.debug_style:
                       <li>
                           <a class="menulink" title="${_('Style')}" href="${h.route_path('debug_style_home')}">
                             <div class="menulabel">${_('[Style]')}</div>
                           </a>
                       </li>
                       % endif
 
                       ## bookmark-items
                       <li class="bookmark-items">
                           ${_('Bookmarks')}
                           <div class="pull-right">
                               <a href="${h.route_path('my_account_bookmarks')}">
 
                                   <i class="icon-cog"></i>
                               </a>
                           </div>
                       </li>
                       % if not c.bookmark_items:
                           <li>
                               <a href="${h.route_path('my_account_bookmarks')}">${_('No Bookmarks yet.')}</a>
                           </li>
                       % endif
                       % for item in c.bookmark_items:
                       <li>
                           % if item.repository:
                               <div>
                                 <a class="bookmark-item" href="${h.route_path('my_account_goto_bookmark', bookmark_id=item.position)}">
                                 <code>${item.position}</code>
                                 % if item.repository.repo_type == 'hg':
                                     <i class="icon-hg" title="${_('Repository')}" style="font-size: 16px"></i>
                                 % elif item.repository.repo_type == 'git':
                                     <i class="icon-git" title="${_('Repository')}" style="font-size: 16px"></i>
                                 % elif item.repository.repo_type == 'svn':
                                     <i class="icon-svn" title="${_('Repository')}" style="font-size: 16px"></i>
                                 % endif
                                 ${(item.title or h.shorter(item.repository.repo_name, 30))}
                               </a>
                               </div>
                           % elif item.repository_group:
                               <div>
                                 <a class="bookmark-item" href="${h.route_path('my_account_goto_bookmark', bookmark_id=item.position)}">
                                 <code>${item.position}</code>
                                 <i class="icon-repo-group" title="${_('Repository group')}" style="font-size: 14px"></i>
                                 ${(item.title or h.shorter(item.repository_group.group_name, 30))}
                               </a>
                               </div>
                           % else:
                               <a class="bookmark-item" href="${h.route_path('my_account_goto_bookmark', bookmark_id=item.position)}">
                                 <code>${item.position}</code>
                                 ${item.title}
                               </a>
                           % endif
                       </li>
                       % endfor
 
                       <li class="logout">
                       ${h.secure_form(h.route_path('logout'), request=request)}
                           ${h.submit('log_out', _(u'Sign Out'),class_="btn btn-primary")}
                       ${h.end_form()}
                       </li>
                     </ol>
                     </div>
                 %endif
               </div>
           </div>
 
         % endif
     </li>
 </%def>
 
 <%def name="menu_items(active=None)">
     <%
         notice_messages, notice_level = c.rhodecode_user.get_notice_messages()
         notice_display = 'none' if len(notice_messages) == 0 else ''
     %>
 <style>
 
 </style>
 
     <ul id="quick" class="main_nav navigation horizontal-list">
        ## notice box for important system messages
        <li style="display: ${notice_display}">
           <a class="notice-box" href="#openNotice" onclick="$('.notice-messages-container').toggle(); return false">
             <div class="menulabel-notice ${notice_level}" >
                 ${len(notice_messages)}
             </div>
           </a>
        </li>
         <div class="notice-messages-container" style="display: none">
         <div class="notice-messages">
             <table class="rctable">
             % for notice in notice_messages:
                 <tr id="notice-message-${notice['msg_id']}" class="notice-message-${notice['level']}">
                     <td style="vertical-align: text-top; width: 20px">
                         <i class="tooltip icon-info notice-color-${notice['level']}" title="${notice['level']}"></i>
                     </td>
                     <td>
                         <span><i class="icon-plus-squared cursor-pointer" onclick="$('#notice-${notice['msg_id']}').toggle()"></i> </span>
                         ${notice['subject']}
 
                         <div id="notice-${notice['msg_id']}" style="display: none">
                             ${h.render(notice['body'], renderer='markdown')}
                         </div>
                     </td>
                     <td style="vertical-align: text-top; width: 35px;">
                         <a class="tooltip" title="${_('dismiss')}" href="#dismiss" onclick="dismissNotice(${notice['msg_id']});return false">
                             <i class="icon-remove icon-filled-red"></i>
                         </a>
                     </td>
                 </tr>
 
             % endfor
             </table>
         </div>
         </div>
         ## Main filter
        <li>
         <div class="menulabel main_filter_box">
             <div class="main_filter_input_box">
                 <ul class="searchItems">
 
                     <li class="searchTag searchTagIcon">
                         <i class="icon-search"></i>
                     </li>
 
                     % if c.template_context['search_context']['repo_id']:
                         <li class="searchTag searchTagFilter searchTagHidable" >
                         ##<a href="${h.route_path('search_repo',repo_name=c.template_context['search_context']['repo_name'])}">
                             <span class="tag">
                                 This repo
                                 <a href="#removeGoToFilter" onclick="removeGoToFilter(); return false"><i class="icon-cancel-circled"></i></a>
                             </span>
                         ##</a>
                         </li>
                     % elif c.template_context['search_context']['repo_group_id']:
                         <li class="searchTag searchTagFilter searchTagHidable">
                         ##<a href="${h.route_path('search_repo_group',repo_group_name=c.template_context['search_context']['repo_group_name'])}">
                             <span class="tag">
                                 This group
                                 <a href="#removeGoToFilter" onclick="removeGoToFilter(); return false"><i class="icon-cancel-circled"></i></a>
                             </span>
                         ##</a>
                         </li>
                     % endif
 
                     <li class="searchTagInput">
                         <input class="main_filter_input" id="main_filter" size="25" type="text" name="main_filter" placeholder="${_('search / go to...')}" value="" />
                     </li>
                     <li class="searchTag searchTagHelp">
                         <a href="#showFilterHelp" onclick="showMainFilterBox(); return false">?</a>
                     </li>
                 </ul>
             </div>
         </div>
 
         <div id="main_filter_help" style="display: none">
 - Use '/' key to quickly access this field.
 
 - Enter a name of repository, or repository group for quick search.
 
 - Prefix query to allow special search:
 
    user:admin, to search for usernames, always global
 
    user_group:devops, to search for user groups, always global
 
    pr:303, to search for pull request number, title, or description, always global
 
    commit:efced4, to search for commits, scoped to repositories or groups
 
    file:models.py, to search for file paths, scoped to repositories or groups
 
 % if c.template_context['search_context']['repo_id']:
    For advanced full text search visit: <a href="${h.route_path('search_repo',repo_name=c.template_context['search_context']['repo_name'])}">repository search</a>
 % elif c.template_context['search_context']['repo_group_id']:
    For advanced full text search visit: <a href="${h.route_path('search_repo_group',repo_group_name=c.template_context['search_context']['repo_group_name'])}">repository group search</a>
 % else:
    For advanced full text search visit: <a href="${h.route_path('search')}">global search</a>
 % endif
         </div>
        </li>
 
       ## ROOT MENU
         <li class="${h.is_active('home', active)}">
           <a class="menulink" title="${_('Home')}" href="${h.route_path('home')}">
             <div class="menulabel">${_('Home')}</div>
           </a>
         </li>
 
       %if c.rhodecode_user.username != h.DEFAULT_USER:
         <li class="${h.is_active('journal', active)}">
           <a class="menulink" title="${_('Show activity journal')}" href="${h.route_path('journal')}">
             <div class="menulabel">${_('Journal')}</div>
           </a>
         </li>
       %else:
         <li class="${h.is_active('journal', active)}">
           <a class="menulink" title="${_('Show Public activity journal')}" href="${h.route_path('journal_public')}">
             <div class="menulabel">${_('Public journal')}</div>
           </a>
         </li>
       %endif
 
         <li class="${h.is_active('gists', active)}">
           <a class="menulink childs" title="${_('Show Gists')}" href="${h.route_path('gists_show')}">
             <div class="menulabel">${_('Gists')}</div>
           </a>
         </li>
 
         % if c.is_super_admin or c.is_delegated_admin:
         <li class="${h.is_active('admin', active)}">
           <a class="menulink childs" title="${_('Admin settings')}" href="${h.route_path('admin_home')}">
             <div class="menulabel">${_('Admin')} </div>
           </a>
         </li>
         % endif
 
       ## render extra user menu
       ${usermenu(active=(active=='my_account'))}
 
     </ul>
 
     <script type="text/javascript">
         var visualShowPublicIcon = "${c.visual.show_public_icon}" == "True";
 
         var formatRepoResult = function(result, container, query, escapeMarkup) {
             return function(data, escapeMarkup) {
                 if (!data.repo_id){
                   return data.text; // optgroup text Repositories
                 }
 
                 var tmpl = '';
                 var repoType = data['repo_type'];
                 var repoName = data['text'];
 
                 if(data && data.type == 'repo'){
                     if(repoType === 'hg'){
                         tmpl += '<i class="icon-hg"></i> ';
                     }
                     else if(repoType === 'git'){
                         tmpl += '<i class="icon-git"></i> ';
                     }
                     else if(repoType === 'svn'){
                         tmpl += '<i class="icon-svn"></i> ';
                     }
                     if(data['private']){
                         tmpl += '<i class="icon-lock" ></i> ';
                     }
                     else if(visualShowPublicIcon){
                         tmpl += '<i class="icon-unlock-alt"></i> ';
                     }
                 }
                 tmpl += escapeMarkup(repoName);
                 return tmpl;
 
             }(result, escapeMarkup);
         };
 
         var formatRepoGroupResult = function(result, container, query, escapeMarkup) {
             return function(data, escapeMarkup) {
                 if (!data.repo_group_id){
                   return data.text; // optgroup text Repositories
                 }
 
                 var tmpl = '';
                 var repoGroupName = data['text'];
 
                 if(data){
 
                     tmpl += '<i class="icon-repo-group"></i> ';
 
                 }
                 tmpl += escapeMarkup(repoGroupName);
                 return tmpl;
 
             }(result, escapeMarkup);
         };
 
         var escapeRegExChars = function (value) {
             return value.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
         };
 
         var getRepoIcon = function(repo_type) {
             if (repo_type === 'hg') {
                 return '<i class="icon-hg"></i> ';
             }
             else if (repo_type === 'git') {
                 return '<i class="icon-git"></i> ';
             }
             else if (repo_type === 'svn') {
                 return '<i class="icon-svn"></i> ';
             }
             return ''
         };
 
         var autocompleteMainFilterFormatResult = function (data, value, org_formatter) {
 
             if (value.split(':').length === 2) {
                 value = value.split(':')[1]
             }
 
             var searchType = data['type'];
             var searchSubType = data['subtype'];
             var valueDisplay = data['value_display'];
             var valueIcon = data['value_icon'];
 
             var pattern = '(' + escapeRegExChars(value) + ')';
 
             valueDisplay = Select2.util.escapeMarkup(valueDisplay);
 
             // highlight match
             if (searchType != 'text') {
                 valueDisplay = valueDisplay.replace(new RegExp(pattern, 'gi'), '<strong>$1<\/strong>');
             }
 
             var icon = '';
 
             if (searchType === 'hint') {
                 icon += '<i class="icon-repo-group"></i> ';
             }
             // full text search/hints
             else if (searchType === 'search') {
                 if (valueIcon === undefined) {
                     icon += '<i class="icon-more"></i> ';
                 } else {
                     icon += valueIcon + ' ';
                 }
 
                 if (searchSubType !== undefined && searchSubType == 'repo') {
                     valueDisplay += '<div class="pull-right tag">repository</div>';
                 }
                 else if (searchSubType !== undefined && searchSubType == 'repo_group') {
                     valueDisplay += '<div class="pull-right tag">repo group</div>';
                 }
             }
             // repository
             else if (searchType === 'repo') {
 
                 var repoIcon = getRepoIcon(data['repo_type']);
                 icon += repoIcon;
 
                 if (data['private']) {
                     icon += '<i class="icon-lock" ></i> ';
                 }
                 else if (visualShowPublicIcon) {
                     icon += '<i class="icon-unlock-alt"></i> ';
                 }
             }
             // repository groups
             else if (searchType === 'repo_group') {
                 icon += '<i class="icon-repo-group"></i> ';
             }
             // user group
             else if (searchType === 'user_group') {
                 icon += '<i class="icon-group"></i> ';
             }
             // user
             else if (searchType === 'user') {
                 icon += '<img class="gravatar" src="{0}"/>'.format(data['icon_link']);
             }
             // pull request
             else if (searchType === 'pull_request') {
                 icon += '<i class="icon-merge"></i> ';
             }
             // commit
             else if (searchType === 'commit') {
                 var repo_data = data['repo_data'];
                 var repoIcon = getRepoIcon(repo_data['repository_type']);
                 if (repoIcon) {
                     icon += repoIcon;
                 } else {
                     icon += '<i class="icon-tag"></i>';
                 }
             }
             // file
             else if (searchType === 'file') {
                 var repo_data = data['repo_data'];
                 var repoIcon = getRepoIcon(repo_data['repository_type']);
                 if (repoIcon) {
                     icon += repoIcon;
                 } else {
                     icon += '<i class="icon-tag"></i>';
                 }
             }
             // generic text
             else if (searchType === 'text') {
                 icon = '';
             }
 
             var tmpl = '<div class="ac-container-wrap">{0}{1}</div>';
             return tmpl.format(icon, valueDisplay);
         };
 
         var handleSelect = function(element, suggestion) {
             if (suggestion.type === "hint") {
                 // we skip action
                 $('#main_filter').focus();
             }
             else if (suggestion.type === "text") {
                 // we skip action
                 $('#main_filter').focus();
 
             } else {
               window.location = suggestion['url'];
             }
         };
 
         var autocompleteMainFilterResult = function (suggestion, originalQuery, queryLowerCase) {
             if (queryLowerCase.split(':').length === 2) {
                 queryLowerCase = queryLowerCase.split(':')[1]
             }
             if (suggestion.type === "text") {
                 // special case we don't want to "skip" display for
                 return true
             }
             return suggestion.value_display.toLowerCase().indexOf(queryLowerCase) !== -1;
         };
 
         var cleanContext = {
             repo_view_type: null,
 
             repo_id: null,
             repo_name: "",
 
             repo_group_id: null,
             repo_group_name: null
         };
         var removeGoToFilter = function () {
             $('.searchTagHidable').hide();
             $('#main_filter').autocomplete(
                 'setOptions', {params:{search_context: cleanContext}});
         };
 
         $('#main_filter').autocomplete({
             serviceUrl: pyroutes.url('goto_switcher_data'),
             params: {
                 "search_context": templateContext.search_context
             },
             minChars:2,
             maxHeight:400,
             deferRequestBy: 300, //miliseconds
             tabDisabled: true,
             autoSelectFirst: false,
             containerClass: 'autocomplete-qfilter-suggestions',
             formatResult: autocompleteMainFilterFormatResult,
             lookupFilter: autocompleteMainFilterResult,
             onSelect: function (element, suggestion) {
                 handleSelect(element, suggestion);
                 return false;
             },
             onSearchError: function (element, query, jqXHR, textStatus, errorThrown) {
                 if (jqXHR !== 'abort') {
                     var message = formatErrorMessage(jqXHR, textStatus, errorThrown);
                     SwalNoAnimation.fire({
                         icon: 'error',
                         title: _gettext('Error during search operation'),
                         html: '<span style="white-space: pre-line">{0}</span>'.format(message),
                     }).then(function(result) {
                         window.location.reload();
                     })
                 }
             },
             onSearchStart: function (params) {
                 $('.searchTag.searchTagIcon').html('<i class="icon-spin animate-spin"></i>')
             },
             onSearchComplete: function (query, suggestions) {
                 $('.searchTag.searchTagIcon').html('<i class="icon-search"></i>')
             },
         });
 
         showMainFilterBox = function () {
             $('#main_filter_help').toggle();
         };
 
         $('#main_filter').on('keydown.autocomplete', function (e) {
 
             var BACKSPACE = 8;
             var el = $(e.currentTarget);
             if(e.which === BACKSPACE){
                 var inputVal = el.val();
                 if (inputVal === ""){
                     removeGoToFilter()
                 }
             }
         });
 
         var dismissNotice = function(noticeId) {
 
             var url = pyroutes.url('user_notice_dismiss',
                     {"user_id": templateContext.rhodecode_user.user_id});
 
             var postData = {
                 'csrf_token': CSRF_TOKEN,
                 'notice_id': noticeId,
             };
 
             var success = function(response) {
                 $('#notice-message-' + noticeId).remove();
                 return false;
             };
             var failure = function(data, textStatus, xhr) {
                 alert("error processing request: " + textStatus);
                 return false;
             };
             ajaxPOST(url, postData, success, failure);
         }
     </script>
     <script src="${h.asset('js/rhodecode/base/keyboard-bindings.js', ver=c.rhodecode_version_hash)}"></script>
 </%def>
 
 <div class="modal" id="help_kb" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
           <h4 class="modal-title" id="myModalLabel">${_('Keyboard shortcuts')}</h4>
         </div>
         <div class="modal-body">
               <div class="block-left">
                 <table class="keyboard-mappings">
                     <tbody>
                   <tr>
                     <th></th>
                     <th>${_('Site-wide shortcuts')}</th>
                   </tr>
                   <%
                      elems = [
                          ('/', 'Use quick search box'),
                          ('g h', 'Goto home page'),
                          ('g g', 'Goto my private gists page'),
                          ('g G', 'Goto my public gists page'),
                          ('g 0-9', 'Goto bookmarked items from 0-9'),
                          ('n r', 'New repository page'),
                          ('n g', 'New gist page'),
                      ]
                   %>
                   %for key, desc in elems:
                   <tr>
                     <td class="keys">
                       <span class="key tag">${key}</span>
                     </td>
                     <td>${desc}</td>
                   </tr>
                 %endfor
                 </tbody>
                   </table>
               </div>
               <div class="block-left">
                 <table class="keyboard-mappings">
                 <tbody>
                   <tr>
                     <th></th>
                     <th>${_('Repositories')}</th>
                   </tr>
                   <%
                      elems = [
                          ('g s', 'Goto summary page'),
                          ('g c', 'Goto changelog page'),
                          ('g f', 'Goto files page'),
                          ('g F', 'Goto files page with file search activated'),
                          ('g p', 'Goto pull requests page'),
                          ('g o', 'Goto repository settings'),
                          ('g O', 'Goto repository access permissions settings'),
                      ]
                   %>
                   %for key, desc in elems:
                   <tr>
                     <td class="keys">
                       <span class="key tag">${key}</span>
                     </td>
                     <td>${desc}</td>
                   </tr>
                 %endfor
                 </tbody>
               </table>
             </div>
         </div>
         <div class="modal-footer">
         </div>
       </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->

rhodecode/templates/base/root.mako

@@ -1,166 +1,166 b''
 ## -*- coding: utf-8 -*-
 <!DOCTYPE html>
 
 <%
 c.template_context['repo_name'] = getattr(c, 'repo_name', '')
 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)
 
 if getattr(c, 'repo_group', None):
     c.template_context['repo_group_id'] = c.repo_group.group_id
     c.template_context['repo_group_name'] = c.repo_group.group_name
 
 if getattr(c, 'rhodecode_user', None) and c.rhodecode_user.user_id:
     c.template_context['rhodecode_user']['user_id'] = c.rhodecode_user.user_id
     c.template_context['rhodecode_user']['username'] = c.rhodecode_user.username
     c.template_context['rhodecode_user']['email'] = c.rhodecode_user.email
     c.template_context['rhodecode_user']['notification_status'] = c.rhodecode_user.get_instance().user_data.get('notification_status', True)
     c.template_context['rhodecode_user']['first_name'] = c.rhodecode_user.first_name
     c.template_context['rhodecode_user']['last_name'] = c.rhodecode_user.last_name
 
 c.template_context['visual']['default_renderer'] = h.get_visual_attr(c, 'default_renderer')
 c.template_context['default_user'] = {
     'username': h.DEFAULT_USER,
     'user_id': 1
 }
 c.template_context['search_context'] = {
     'repo_group_id': c.template_context.get('repo_group_id'),
     'repo_group_name': c.template_context.get('repo_group_name'),
     'repo_id': c.template_context.get('repo_id'),
     'repo_name': c.template_context.get('repo_name'),
     'repo_view_type': c.template_context.get('repo_view_type'),
 }
 
 c.template_context['attachment_store'] = {
     'max_file_size_mb': 10,
     'image_ext': ["png", "jpg", "gif", "jpeg"]
 }
 
 %>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>${self.title()}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 
         ${h.go_import_header(request, getattr(c, 'rhodecode_db_repo', None))}
 
         % if 'safari' in (request.user_agent or '').lower():
             <meta name="referrer" content="origin">
         % else:
             <meta name="referrer" content="origin-when-cross-origin">
         % endif
 
         <%def name="robots()">
             <meta name="robots" content="index, nofollow"/>
         </%def>
         ${self.robots()}
         <link rel="icon" href="${h.asset('images/favicon.ico', ver=c.rhodecode_version_hash)}" sizes="16x16 32x32" type="image/png" />
         <script src="${h.asset('js/vendors/webcomponentsjs/custom-elements-es5-adapter.js', ver=c.rhodecode_version_hash)}"></script>
         <script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-bundle.js', ver=c.rhodecode_version_hash)}"></script>
 
         ## CSS definitions
         <%def name="css()">
             <link rel="stylesheet" type="text/css" href="${h.asset('css/style.css', ver=c.rhodecode_version_hash)}" media="screen"/>
             ## EXTRA FOR CSS
             ${self.css_extra()}
         </%def>
         ## CSS EXTRA - optionally inject some extra CSS stuff needed for specific websites
         <%def name="css_extra()">
         </%def>
 
         ${self.css()}
 
         ## JAVASCRIPT
         <%def name="js()">
 
             <script src="${h.asset('js/rhodecode/i18n/%s.js' % c.language, ver=c.rhodecode_version_hash)}"></script>
             <script type="text/javascript">
             // register templateContext to pass template variables to JS
             var templateContext = ${h.json.dumps(c.template_context)|n};
 
             var APPLICATION_URL = "${h.route_path('home').rstrip('/')}";
             var APPLICATION_PLUGINS = [];
             var ASSET_URL = "${h.asset('')}";
             var DEFAULT_RENDERER = "${h.get_visual_attr(c, 'default_renderer')}";
             var CSRF_TOKEN = "${getattr(c, 'csrf_token', '')}";
 
             var APPENLIGHT = {
               enabled: ${'true' if getattr(c, 'appenlight_enabled', False) else 'false'},
               key: '${getattr(c, "appenlight_api_public_key", "")}',
               % if getattr(c, 'appenlight_server_url', None):
                   serverUrl: '${getattr(c, "appenlight_server_url", "")}',
               % endif
               requestInfo: {
               % if getattr(c, 'rhodecode_user', None):
                   ip: '${c.rhodecode_user.ip_addr}',
                   username: '${c.rhodecode_user.username}'
               % endif
               },
               tags: {
                   rhodecode_version: '${c.rhodecode_version}',
                   rhodecode_edition: '${c.rhodecode_edition}'
               }
             };
 
             </script>
             <%include file="/base/plugins_base.mako"/>
             <!--[if lt IE 9]>
             <script language="javascript" type="text/javascript" src="${h.asset('js/src/excanvas.min.js')}"></script>
             <![endif]-->
             <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode/routes.js', ver=c.rhodecode_version_hash)}"></script>
             <script> var alertMessagePayloads = ${h.flash.json_alerts(request=request)|n}; </script>
             ## avoide escaping the %N
             <script language="javascript" type="text/javascript" src="${h.asset('js/scripts.min.js', ver=c.rhodecode_version_hash)}"></script>
             <script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
 
 
             ## JAVASCRIPT EXTRA - optionally inject some extra JS for specificed templates
             ${self.js_extra()}
 
             <script type="text/javascript">
             Rhodecode = (function() {
                 function _Rhodecode() {
                   this.comments = new CommentsController();
                 }
                 return new _Rhodecode();
             })();
 
             $(document).ready(function(){
               show_more_event();
               timeagoActivate();
               tooltipActivate();
               clipboardActivate();
             })
             </script>
 
         </%def>
 
         ## JAVASCRIPT EXTRA - optionally inject some extra JS for specificed templates
         <%def name="js_extra()"></%def>
         ${self.js()}
 
         <%def name="head_extra()"></%def>
         ${self.head_extra()}
         ## extra stuff
         %if c.pre_code:
             ${c.pre_code|n}
         %endif
     </head>
     <body id="body">
         <noscript>
             <div class="noscript-error">
                 ${_('Please enable JavaScript to use RhodeCode Enterprise')}
             </div>
         </noscript>
 
       ${next.body()}
       %if c.post_code:
         ${c.post_code|n}
       %endif
     <rhodecode-app></rhodecode-app>
     </body>
 </html>

rhodecode/templates/codeblocks/diffs.mako

@@ -1,1193 +1,1215 b''
 <%namespace name="commentblock" file="/changeset/changeset_file_comment.mako"/>
 
 <%def name="diff_line_anchor(commit, filename, line, type)"><%
 return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
 %></%def>
 
 <%def name="action_class(action)">
 <%
     return {
         '-': 'cb-deletion',
         '+': 'cb-addition',
         ' ': 'cb-context',
         }.get(action, 'cb-empty')
 %>
 </%def>
 
 <%def name="op_class(op_id)">
 <%
     return {
         DEL_FILENODE: 'deletion', # file deleted
         BIN_FILENODE: 'warning' # binary diff hidden
     }.get(op_id, 'addition')
 %>
 </%def>
 
 
 
 <%def name="render_diffset(diffset, commit=None,
 
     # collapse all file diff entries when there are more than this amount of files in the diff
     collapse_when_files_over=20,
 
     # collapse lines in the diff when more than this amount of lines changed in the file diff
     lines_changed_limit=500,
 
     # add a ruler at to the output
     ruler_at_chars=0,
 
     # show inline comments
     use_comments=False,
 
     # disable new comments
     disable_new_comments=False,
 
     # special file-comments that were deleted in previous versions
     # it's used for showing outdated comments for deleted files in a PR
     deleted_files_comments=None,
 
     # for cache purpose
     inline_comments=None,
 
     # additional menu for PRs
     pull_request_menu=None,
 
     # show/hide todo next to comments
     show_todos=True,
 
 )">
 
 <%
     diffset_container_id = h.md5(diffset.target_ref)
     collapse_all = len(diffset.files) > collapse_when_files_over
     active_pattern_entries = h.get_active_pattern_entries(getattr(c, 'repo_name', None))
 %>
 
 %if use_comments:
 
 ## Template for injecting comments
 <div id="cb-comments-inline-container-template" class="js-template">
   ${inline_comments_container([])}
 </div>
 
 <div class="js-template" id="cb-comment-inline-form-template">
     <div class="comment-inline-form ac">
 
     %if c.rhodecode_user.username != h.DEFAULT_USER:
         ## render template for inline comments
         ${commentblock.comment_form(form_type='inline')}
     %else:
         ${h.form('', class_='inline-form comment-form-login', method='get')}
         <div class="pull-left">
             <div class="comment-help pull-right">
               ${_('You need to be logged in to leave comments.')} <a href="${h.route_path('login', _query={'came_from': h.current_route_path(request)})}">${_('Login now')}</a>
             </div>
         </div>
         <div class="comment-button pull-right">
          <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
           ${_('Cancel')}
          </button>
         </div>
         <div class="clearfix"></div>
         ${h.end_form()}
     %endif
     </div>
 </div>
 
 %endif
 
 %if c.user_session_attrs["diffmode"] == 'sideside':
 <style>
 .wrapper {
     max-width: 1600px !important;
 }
 </style>
 %endif
 
 %if ruler_at_chars:
 <style>
 .diff table.cb .cb-content:after {
     content: "";
     border-left: 1px solid blue;
     position: absolute;
     top: 0;
     height: 18px;
     opacity: .2;
     z-index: 10;
     //## +5 to account for diff action (+/-)
     left: ${ruler_at_chars + 5}ch;
 </style>
 %endif
 
 <div class="diffset ${disable_new_comments and 'diffset-comments-disabled'}">
 
     <div style="height: 20px; line-height: 20px">
         ## expand/collapse action
         <div class="pull-left">
             <a class="${'collapsed' if collapse_all else ''}" href="#expand-files" onclick="toggleExpand(this, '${diffset_container_id}'); return false">
             % if collapse_all:
                 <i class="icon-plus-squared-alt icon-no-margin"></i>${_('Expand all files')}
             % else:
                 <i class="icon-minus-squared-alt icon-no-margin"></i>${_('Collapse all files')}
             % endif
             </a>
 
         </div>
 
         ## todos
         % if show_todos and getattr(c, 'at_version', None):
         <div class="pull-right">
             <i class="icon-flag-filled" style="color: #949494">TODOs:</i>
              ${_('not available in this view')}
         </div>
         % elif show_todos:
         <div class="pull-right">
             <div class="comments-number" style="padding-left: 10px">
                 % if hasattr(c, 'unresolved_comments') and hasattr(c, 'resolved_comments'):
                     <i class="icon-flag-filled" style="color: #949494">TODOs:</i>
                     % if c.unresolved_comments:
                         <a href="#show-todos" onclick="$('#todo-box').toggle(); return false">
                             ${_('{} unresolved').format(len(c.unresolved_comments))}
                         </a>
                     % else:
                         ${_('0 unresolved')}
                     % endif
 
                     ${_('{} Resolved').format(len(c.resolved_comments))}
                 % endif
             </div>
         </div>
         % endif
 
         ## comments
         <div class="pull-right">
             <div class="comments-number" style="padding-left: 10px">
                 % if hasattr(c, 'comments') and hasattr(c, 'inline_cnt'):
                     <i class="icon-comment" style="color: #949494">COMMENTS:</i>
                     % if c.comments:
                         <a href="#comments">${_ungettext("{} General", "{} General", len(c.comments)).format(len(c.comments))}</a>,
                     % else:
                         ${_('0 General')}
                     % endif
 
                     % if c.inline_cnt:
                         <a href="#" onclick="return Rhodecode.comments.nextComment();"
                            id="inline-comments-counter">${_ungettext("{} Inline", "{} Inline", c.inline_cnt).format(c.inline_cnt)}
                         </a>
                     % else:
                         ${_('0 Inline')}
                     % endif
                 % endif
 
                 % if pull_request_menu:
                     <%
                     outdated_comm_count_ver = pull_request_menu['outdated_comm_count_ver']
                     %>
 
                     % if outdated_comm_count_ver:
                         <a href="#" onclick="showOutdated(); Rhodecode.comments.nextOutdatedComment(); return false;">
                             (${_("{} Outdated").format(outdated_comm_count_ver)})
                         </a>
                         <a href="#" class="showOutdatedComments" onclick="showOutdated(this); return false;"> | ${_('show outdated')}</a>
                         <a href="#" class="hideOutdatedComments" style="display: none" onclick="hideOutdated(this); return false;"> | ${_('hide outdated')}</a>
                     % else:
                         (${_("{} Outdated").format(outdated_comm_count_ver)})
                     % endif
 
                 % endif
 
             </div>
         </div>
 
     </div>
 
     % if diffset.limited_diff:
         <div class="diffset-heading ${(diffset.limited_diff and 'diffset-heading-warning' or '')}">
             <h2 class="clearinner">
                 ${_('The requested changes are too big and content was truncated.')}
                 <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
             </h2>
         </div>
     ## commit range header for each individual diff
     % elif commit and hasattr(c, 'commit_ranges') and len(c.commit_ranges) > 1:
         <div class="diffset-heading ${(diffset.limited_diff and 'diffset-heading-warning' or '')}">
             <div class="clearinner">
                 <a class="tooltip revision" title="${h.tooltip(commit.message)}" href="${h.route_path('repo_commit',repo_name=diffset.repo_name,commit_id=commit.raw_id)}">${('r%s:%s' % (commit.idx,h.short_id(commit.raw_id)))}</a>
             </div>
         </div>
     % endif
 
     <div id="todo-box">
         % if hasattr(c, 'unresolved_comments') and c.unresolved_comments:
             % for co in c.unresolved_comments:
                 <a class="permalink" href="#comment-${co.comment_id}"
                    onclick="Rhodecode.comments.scrollToComment($('#comment-${co.comment_id}'))">
                     <i class="icon-flag-filled-red"></i>
                     ${co.comment_id}</a>${('' if loop.last else ',')}
             % endfor
         % endif
     </div>
     %if diffset.has_hidden_changes:
         <p class="empty_data">${_('Some changes may be hidden')}</p>
     %elif not diffset.files:
         <p class="empty_data">${_('No files')}</p>
     %endif
 
     <div class="filediffs">
 
     ## initial value could be marked as False later on
     <% over_lines_changed_limit = False %>
     %for i, filediff in enumerate(diffset.files):
 
         <%
         lines_changed = filediff.patch['stats']['added'] + filediff.patch['stats']['deleted']
         over_lines_changed_limit = lines_changed > lines_changed_limit
         %>
         ## anchor with support of sticky header
         <div class="anchor" id="a_${h.FID(filediff.raw_id, filediff.patch['filename'])}"></div>
 
         <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state collapse-${diffset_container_id}" id="filediff-collapse-${id(filediff)}" type="checkbox" onchange="updateSticky();">
         <div
             class="filediff"
             data-f-path="${filediff.patch['filename']}"
             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)}
         <table data-f-path="${filediff.patch['filename']}" data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" class="code-visible-block cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
 
         ## new/deleted/empty content case
         % if not filediff.hunks:
             ## Comment container, on "fakes" hunk that contains all data to render comments
             ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
         % endif
 
         %if filediff.limited_diff:
                 <tr class="cb-warning cb-collapser">
                     <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}>
                         ${_('The requested commit or file is too big and content was truncated.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
                     </td>
                 </tr>
         %else:
             %if over_lines_changed_limit:
                 <tr class="cb-warning cb-collapser">
                     <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}>
                         ${_('This diff has been collapsed as it changes many lines, (%i lines changed)' % lines_changed)}
                         <a href="#" class="cb-expand"
                            onclick="$(this).closest('table').removeClass('cb-collapsed'); updateSticky(); return false;">${_('Show them')}
                         </a>
                         <a href="#" class="cb-collapse"
                            onclick="$(this).closest('table').addClass('cb-collapsed'); updateSticky(); return false;">${_('Hide them')}
                         </a>
                     </td>
                 </tr>
             %endif
         %endif
 
         % for hunk in filediff.hunks:
             <tr class="cb-hunk">
                 <td ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=3' or '')}>
                     ## TODO: dan: add ajax loading of more context here
                     ## <a href="#">
                         <i class="icon-more"></i>
                     ## </a>
                 </td>
                 <td ${(c.user_session_attrs["diffmode"] == 'sideside' and 'colspan=5' or '')}>
                     @@
                     -${hunk.source_start},${hunk.source_length}
                     +${hunk.target_start},${hunk.target_length}
                     ${hunk.section_header}
                 </td>
             </tr>
             ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
         % endfor
 
         <% unmatched_comments = (inline_comments or {}).get(filediff.patch['filename'], {}) %>
 
         ## outdated comments that do not fit into currently displayed lines
         % for lineno, comments in unmatched_comments.items():
 
             %if c.user_session_attrs["diffmode"] == 'unified':
                 % if loop.index == 0:
                 <tr class="cb-hunk">
                     <td colspan="3"></td>
                     <td>
                         <div>
                         ${_('Unmatched/outdated inline comments below')}
                         </div>
                     </td>
                 </tr>
                 % endif
                 <tr class="cb-line">
                     <td class="cb-data cb-context"></td>
                     <td class="cb-lineno cb-context"></td>
                     <td class="cb-lineno cb-context"></td>
                     <td class="cb-content cb-context">
                         ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
                     </td>
                 </tr>
             %elif c.user_session_attrs["diffmode"] == 'sideside':
                 % if loop.index == 0:
                 <tr class="cb-comment-info">
                     <td colspan="2"></td>
                     <td class="cb-line">
                         <div>
                         ${_('Unmatched/outdated inline comments below')}
                         </div>
                     </td>
                     <td colspan="2"></td>
                     <td class="cb-line">
                         <div>
                         ${_('Unmatched/outdated comments below')}
                         </div>
                     </td>
                 </tr>
                 % endif
                 <tr class="cb-line">
                     <td class="cb-data cb-context"></td>
                     <td class="cb-lineno cb-context"></td>
                     <td class="cb-content cb-context">
                         % if lineno.startswith('o'):
                             ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
                         % endif
                     </td>
 
                     <td class="cb-data cb-context"></td>
                     <td class="cb-lineno cb-context"></td>
                     <td class="cb-content cb-context">
                         % if lineno.startswith('n'):
                             ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
                         % endif
                     </td>
                 </tr>
             %endif
 
         % endfor
 
             </table>
         </div>
     %endfor
 
     ## outdated comments that are made for a file that has been deleted
     % for filename, comments_dict in (deleted_files_comments or {}).items():
 
         <%
             display_state = 'display: none'
             open_comments_in_file = [x for x in comments_dict['comments'] if x.outdated is False]
             if open_comments_in_file:
                 display_state = ''
             fid = str(id(filename))
         %>
         <div class="filediffs filediff-outdated" style="${display_state}">
             <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state collapse-${diffset_container_id}" id="filediff-collapse-${id(filename)}" type="checkbox" onchange="updateSticky();">
             <div class="filediff" data-f-path="${filename}"  id="a_${h.FID(fid, filename)}">
                 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
                     <div class="filediff-collapse-indicator icon-"></div>
 
                     <span class="pill">
                         ## file was deleted
                         ${filename}
                     </span>
                     <span class="pill-group pull-left" >
                         ## file op, doesn't need translation
                         <span class="pill" op="removed">unresolved comments</span>
                     </span>
                     <a class="pill filediff-anchor" href="#a_${h.FID(fid, filename)}">¶</a>
                     <span class="pill-group pull-right">
                         <span class="pill" op="deleted">
                             % if comments_dict['stats'] >0:
                                 -${comments_dict['stats']}
                             % else:
                                  ${comments_dict['stats']}
                             % endif
                         </span>
                     </span>
                 </label>
 
                 <table class="cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
                     <tr>
                         % if c.user_session_attrs["diffmode"] == 'unified':
                         <td></td>
                         %endif
 
                         <td></td>
                         <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=5')}>
                         <strong>${_('This file was removed from diff during updates to this pull-request.')}</strong><br/>
                         ${_('There are still outdated/unresolved comments attached to it.')}
                         </td>
                     </tr>
                     %if c.user_session_attrs["diffmode"] == 'unified':
                     <tr class="cb-line">
                         <td class="cb-data cb-context"></td>
                         <td class="cb-lineno cb-context"></td>
                         <td class="cb-lineno cb-context"></td>
                         <td class="cb-content cb-context">
                             ${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)}
                         </td>
                     </tr>
                     %elif c.user_session_attrs["diffmode"] == 'sideside':
                     <tr class="cb-line">
                         <td class="cb-data cb-context"></td>
                         <td class="cb-lineno cb-context"></td>
                         <td class="cb-content cb-context"></td>
 
                         <td class="cb-data cb-context"></td>
                         <td class="cb-lineno cb-context"></td>
                         <td class="cb-content cb-context">
                             ${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)}
                         </td>
                     </tr>
                     %endif
                 </table>
             </div>
         </div>
     % endfor
 
 </div>
 </div>
 </%def>
 
 <%def name="diff_ops(filediff)">
 <%
 from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
     MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE, COPIED_FILENODE
 %>
     <span class="pill">
         <i class="icon-file-text"></i>
         %if filediff.source_file_path and filediff.target_file_path:
             %if filediff.source_file_path != filediff.target_file_path:
                  ## file was renamed, or copied
                 %if RENAMED_FILENODE in filediff.patch['stats']['ops']:
                     ${filediff.target_file_path} ⬅ <del>${filediff.source_file_path}</del>
                     <% final_path = filediff.target_file_path %>
                 %elif COPIED_FILENODE in filediff.patch['stats']['ops']:
                     ${filediff.target_file_path} ⬅ ${filediff.source_file_path}
                     <% final_path = filediff.target_file_path %>
                 %endif
             %else:
                 ## file was modified
                 ${filediff.source_file_path}
                 <% final_path = filediff.source_file_path %>
             %endif
         %else:
             %if filediff.source_file_path:
                 ## file was deleted
                 ${filediff.source_file_path}
                 <% final_path = filediff.source_file_path %>
             %else:
                 ## file was added
                 ${filediff.target_file_path}
                 <% 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>
 
     <span class="pill-group pull-right">
 
         ## ops pills
         %if filediff.limited_diff:
         <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span>
         %endif
 
         %if NEW_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="created">created</span>
             %if filediff['target_mode'].startswith('120'):
         <span class="pill" op="symlink">symlink</span>
             %else:
         <span class="pill" op="mode">${nice_mode(filediff['target_mode'])}</span>
             %endif
         %endif
 
         %if RENAMED_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="renamed">renamed</span>
         %endif
 
         %if COPIED_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="copied">copied</span>
         %endif
 
         %if DEL_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="removed">removed</span>
         %endif
 
         %if CHMOD_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="mode">
             ${nice_mode(filediff['source_mode'])} ➡ ${nice_mode(filediff['target_mode'])}
         </span>
         %endif
 
         %if BIN_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="binary">binary</span>
             %if MOD_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="modified">modified</span>
             %endif
         %endif
 
         <span class="pill" op="added">${('+' if filediff.patch['stats']['added'] else '')}${filediff.patch['stats']['added']}</span>
         <span class="pill" op="deleted">${((h.safe_int(filediff.patch['stats']['deleted']) or 0) * -1)}</span>
 
     </span>
 
 </%def>
 
 <%def name="nice_mode(filemode)">
     ${(filemode.startswith('100') and filemode[3:] or filemode)}
 </%def>
 
 <%def name="diff_menu(filediff, use_comments=False)">
     <div class="filediff-menu">
 
     %if filediff.diffset.source_ref:
 
     ## FILE BEFORE CHANGES
     %if filediff.operation in ['D', 'M']:
         <a
             class="tooltip"
             href="${h.route_path('repo_files',repo_name=filediff.diffset.target_repo_name,commit_id=filediff.diffset.source_ref,f_path=filediff.source_file_path)}"
             title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
         >
             ${_('Show file before')}
         </a> |
     %else:
         <span
             class="tooltip"
             title="${h.tooltip(_('File not present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
         >
             ${_('Show file before')}
         </span> |
     %endif
 
     ## FILE AFTER CHANGES
     %if filediff.operation in ['A', 'M']:
         <a
             class="tooltip"
             href="${h.route_path('repo_files',repo_name=filediff.diffset.source_repo_name,commit_id=filediff.diffset.target_ref,f_path=filediff.target_file_path)}"
             title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
         >
             ${_('Show file after')}
         </a>
     %else:
         <span
             class="tooltip"
             title="${h.tooltip(_('File not present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
             >
             ${_('Show file after')}
         </span>
     %endif
 
     % if use_comments:
     |
     <a href="#" onclick="return Rhodecode.comments.toggleComments(this);">
         <span class="show-comment-button">${_('Show comments')}</span><span class="hide-comment-button">${_('Hide comments')}</span>
     </a>
     % endif
 
     %endif
 
     </div>
 </%def>
 
 
 <%def name="inline_comments_container(comments, active_pattern_entries=None)">
 
 <div class="inline-comments">
     %for comment in comments:
         ${commentblock.comment_block(comment, inline=True, active_pattern_entries=active_pattern_entries)}
     %endfor
     % if comments and comments[-1].outdated:
     <span class="btn btn-secondary cb-comment-add-button comment-outdated}" style="display: none;}">
         ${_('Add another comment')}
     </span>
     % else:
     <span onclick="return Rhodecode.comments.createComment(this)" class="btn btn-secondary cb-comment-add-button">
         ${_('Add another comment')}
     </span>
     % endif
 
 </div>
 </%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
 
     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)">
     %for i, line in enumerate(hunk.sideside):
     <%
     old_line_anchor, new_line_anchor = None, None
 
     if line.original.lineno:
         old_line_anchor = diff_line_anchor(filediff.raw_id, hunk.source_file_path, line.original.lineno, 'o')
     if line.modified.lineno:
         new_line_anchor = diff_line_anchor(filediff.raw_id, hunk.target_file_path, line.modified.lineno, 'n')
     %>
 
     <tr class="cb-line">
         <td class="cb-data ${action_class(line.original.action)}"
             data-line-no="${line.original.lineno}"
             >
             <div>
 
             <% line_old_comments = None %>
             %if line.original.get_comment_args:
                 <% line_old_comments = get_comments_for('side-by-side', inline_comments, *line.original.get_comment_args) %>
             %endif
             %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>
         </td>
         <td class="cb-lineno ${action_class(line.original.action)}"
             data-line-no="${line.original.lineno}"
             %if old_line_anchor:
             id="${old_line_anchor}"
             %endif
         >
             %if line.original.lineno:
             <a name="${old_line_anchor}" href="#${old_line_anchor}">${line.original.lineno}</a>
             %endif
         </td>
         <td class="cb-content ${action_class(line.original.action)}"
             data-line-no="o${line.original.lineno}"
             >
             %if use_comments and line.original.lineno:
             ${render_add_comment_button()}
             %endif
             <span class="cb-code"><span class="cb-action ${action_class(line.original.action)}"></span>${line.original.content or '' | n}</span>
 
             %if use_comments and line.original.lineno and line_old_comments:
                 ${inline_comments_container(line_old_comments, active_pattern_entries=active_pattern_entries)}
             %endif
 
         </td>
         <td class="cb-data ${action_class(line.modified.action)}"
             data-line-no="${line.modified.lineno}"
             >
             <div>
 
             %if line.modified.get_comment_args:
                 <% line_new_comments = get_comments_for('side-by-side', inline_comments, *line.modified.get_comment_args) %>
             %else:
                 <% line_new_comments = None%>
             %endif
             %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>
         </td>
         <td class="cb-lineno ${action_class(line.modified.action)}"
             data-line-no="${line.modified.lineno}"
             %if new_line_anchor:
             id="${new_line_anchor}"
             %endif
             >
             %if line.modified.lineno:
                 <a name="${new_line_anchor}" href="#${new_line_anchor}">${line.modified.lineno}</a>
             %endif
         </td>
         <td class="cb-content ${action_class(line.modified.action)}"
             data-line-no="n${line.modified.lineno}"
             >
             %if use_comments and line.modified.lineno:
             ${render_add_comment_button()}
             %endif
             <span class="cb-code"><span class="cb-action ${action_class(line.modified.action)}"></span>${line.modified.content or '' | n}</span>
             %if use_comments and line.modified.lineno and line_new_comments:
             ${inline_comments_container(line_new_comments, active_pattern_entries=active_pattern_entries)}
             %endif
         </td>
     </tr>
     %endfor
 </%def>
 
 
 <%def name="render_hunk_lines_unified(filediff, hunk, use_comments=False,  inline_comments=None, active_pattern_entries=None)">
     %for old_line_no, new_line_no, action, content, comments_args in hunk.unified:
 
     <%
     old_line_anchor, new_line_anchor = None, None
     if old_line_no:
         old_line_anchor = diff_line_anchor(filediff.raw_id, hunk.source_file_path, old_line_no, 'o')
     if new_line_no:
         new_line_anchor = diff_line_anchor(filediff.raw_id, hunk.target_file_path, new_line_no, 'n')
     %>
     <tr class="cb-line">
         <td class="cb-data ${action_class(action)}">
             <div>
 
             %if comments_args:
                 <% comments = get_comments_for('unified', inline_comments, *comments_args) %>
             %else:
                 <% comments = None %>
             %endif
 
             % 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>
         </td>
         <td class="cb-lineno ${action_class(action)}"
             data-line-no="${old_line_no}"
             %if old_line_anchor:
             id="${old_line_anchor}"
             %endif
         >
             %if old_line_anchor:
             <a name="${old_line_anchor}" href="#${old_line_anchor}">${old_line_no}</a>
             %endif
         </td>
         <td class="cb-lineno ${action_class(action)}"
             data-line-no="${new_line_no}"
             %if new_line_anchor:
             id="${new_line_anchor}"
             %endif
         >
             %if new_line_anchor:
             <a name="${new_line_anchor}" href="#${new_line_anchor}">${new_line_no}</a>
             %endif
         </td>
         <td class="cb-content ${action_class(action)}"
             data-line-no="${(new_line_no and 'n' or 'o')}${(new_line_no or old_line_no)}"
             >
             %if use_comments:
             ${render_add_comment_button()}
             %endif
             <span class="cb-code"><span class="cb-action ${action_class(action)}"></span> ${content or '' | n}</span>
             %if use_comments and comments:
             ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
             %endif
         </td>
     </tr>
     %endfor
 </%def>
 
 
 <%def name="render_hunk_lines(filediff, diff_mode, hunk, use_comments, inline_comments, active_pattern_entries)">
     % if diff_mode == 'unified':
         ${render_hunk_lines_unified(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
     % elif diff_mode == 'sideside':
         ${render_hunk_lines_sideside(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
     % else:
         <tr class="cb-line">
             <td>unknown diff mode</td>
         </tr>
     % endif
 </%def>file changes
 
 
 <%def name="render_add_comment_button()">
 <button class="btn btn-small btn-primary cb-comment-box-opener" onclick="return Rhodecode.comments.createComment(this)">
     <span><i class="icon-comment"></i></span>
 </button>
 </%def>
 
 <%def name="render_diffset_menu(diffset, range_diff_on=None)">
     <% diffset_container_id = h.md5(diffset.target_ref) %>
 
     <div id="diff-file-sticky" class="diffset-menu clearinner">
         ## auto adjustable
         <div class="sidebar__inner">
             <div class="sidebar__bar">
             <div class="pull-right">
                 <div class="btn-group">
                     <a class="btn tooltip toggle-wide-diff" href="#toggle-wide-diff" onclick="toggleWideDiff(this); return false" title="${h.tooltip(_('Toggle wide diff'))}">
                     <i class="icon-wide-mode"></i>
                     </a>
                 </div>
                 <div class="btn-group">
 
                 <a
                   class="btn ${(c.user_session_attrs["diffmode"] == 'sideside' and 'btn-active')} tooltip"
                   title="${h.tooltip(_('View diff as side by side'))}"
                   href="${h.current_route_path(request, diffmode='sideside')}">
                     <span>${_('Side by Side')}</span>
                 </a>
 
                 <a
                   class="btn ${(c.user_session_attrs["diffmode"] == 'unified' and 'btn-active')} tooltip"
                   title="${h.tooltip(_('View diff as unified'))}" href="${h.current_route_path(request, diffmode='unified')}">
                     <span>${_('Unified')}</span>
                 </a>
 
                 % if range_diff_on is True:
                     <a
                       title="${_('Turn off: Show the diff as commit range')}"
                       class="btn btn-primary"
                       href="${h.current_route_path(request, **{"range-diff":"0"})}">
                         <span>${_('Range Diff')}</span>
                    </a>
                 % elif range_diff_on is False:
                     <a
                       title="${_('Show the diff as commit range')}"
                       class="btn"
                       href="${h.current_route_path(request, **{"range-diff":"1"})}">
                         <span>${_('Range Diff')}</span>
                    </a>
                 % endif
             </div>
                 <div class="btn-group">
 
                 <div class="pull-left">
                     ${h.hidden('diff_menu_{}'.format(diffset_container_id))}
                 </div>
 
                 </div>
         </div>
             <div class="pull-left">
             <div class="btn-group">
               <div class="pull-left">
                 ${h.hidden('file_filter_{}'.format(diffset_container_id))}
               </div>
 
             </div>
             </div>
         </div>
         <div class="fpath-placeholder">
             <i class="icon-file-text"></i>
             <strong class="fpath-placeholder-text">
             Context file:
             </strong>
         </div>
         <div class="sidebar_inner_shadow"></div>
         </div>
     </div>
 
     % if diffset:
         %if diffset.limited_diff:
             <% file_placeholder = _ungettext('%(num)s file changed', '%(num)s files changed', diffset.changed_files) % {'num': diffset.changed_files} %>
         %else:
             <% file_placeholder = h.literal(_ungettext('%(num)s file changed: <span class="op-added">%(linesadd)s inserted</span>, <span class="op-deleted">%(linesdel)s deleted</span>', '%(num)s files changed: <span class="op-added">%(linesadd)s inserted</span>, <span class="op-deleted">%(linesdel)s deleted</span>',
             diffset.changed_files) % {'num': diffset.changed_files, 'linesadd': diffset.lines_added, 'linesdel': diffset.lines_deleted}) %>
 
         %endif
         ## case on range-diff placeholder needs to be updated
         % if range_diff_on is True:
             <% file_placeholder = _('Disabled on range diff') %>
         % endif
 
         <script type="text/javascript">
         var feedFilesOptions = function (query, initialData) {
             var data = {results: []};
             var isQuery = typeof query.term !== 'undefined';
 
             var section = _gettext('Changed files');
             var filteredData = [];
 
             //filter results
             $.each(initialData.results, function (idx, value) {
 
                 if (!isQuery || query.term.length === 0 || value.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) {
                     filteredData.push({
                         'id': this.id,
                         'text': this.text,
                         "ops": this.ops,
                     })
                 }
 
             });
 
             data.results = filteredData;
 
             query.callback(data);
         };
 
         var selectionFormatter = function(data, escapeMarkup) {
             var container = '<div class="filelist" style="padding-right:100px">{0}</div>';
             var tmpl = '<div><strong>{0}</strong></div>'.format(escapeMarkup(data['text']));
             var pill = '<div class="pill-group" style="position: absolute; top:7px; right: 0">' +
                         '<span class="pill" op="added">{0}</span>' +
                         '<span class="pill" op="deleted">{1}</span>' +
                        '</div>'
                     ;
             var added = data['ops']['added'];
             if (added === 0) {
                 // don't show +0
                 added = 0;
             } else {
                 added = '+' + added;
             }
 
             var deleted = -1*data['ops']['deleted'];
 
             tmpl += pill.format(added, deleted);
             return container.format(tmpl);
         };
         var formatFileResult = function(result, container, query, escapeMarkup) {
             return selectionFormatter(result, escapeMarkup);
         };
 
         var formatSelection = function (data, container) {
             return '${file_placeholder}'
         };
 
         if (window.preloadFileFilterData === undefined) {
             window.preloadFileFilterData = {}
         }
 
         preloadFileFilterData["${diffset_container_id}"] = {
             results: [
                 % for filediff in diffset.files:
                     {id:"a_${h.FID(filediff.raw_id, filediff.patch['filename'])}",
                      text:"${filediff.patch['filename']}",
                      ops:${h.json.dumps(filediff.patch['stats'])|n}}${('' if loop.last else ',')}
                 % endfor
             ]
         };
 
         var diffFileFilterId = "#file_filter_" + "${diffset_container_id}";
         var diffFileFilter = $(diffFileFilterId).select2({
             'dropdownAutoWidth': true,
             'width': 'auto',
 
             containerCssClass: "drop-menu",
             dropdownCssClass: "drop-menu-dropdown",
             data: preloadFileFilterData["${diffset_container_id}"],
             query: function(query) {
                 feedFilesOptions(query, preloadFileFilterData["${diffset_container_id}"]);
             },
             initSelection: function(element, callback) {
               callback({'init': true});
             },
             formatResult: formatFileResult,
             formatSelection: formatSelection
         });
 
         % if range_diff_on is True:
             diffFileFilter.select2("enable", false);
         % endif
 
         $(diffFileFilterId).on('select2-selecting', function (e) {
             var idSelector = e.choice.id;
 
             // expand the container if we quick-select the field
             $('#'+idSelector).next().prop('checked', false);
             // hide the mast as we later do preventDefault()
             $("#select2-drop-mask").click();
 
             window.location.hash = '#'+idSelector;
             updateSticky();
 
             e.preventDefault();
         });
 
         </script>
     % endif
 
     <script type="text/javascript">
         $(document).ready(function () {
 
             var contextPrefix = _gettext('Context file: ');
             ## sticky sidebar
             var sidebarElement = document.getElementById('diff-file-sticky');
             sidebar = new StickySidebar(sidebarElement, {
                   topSpacing: 0,
                   bottomSpacing: 0,
                   innerWrapperSelector: '.sidebar__inner'
             });
             sidebarElement.addEventListener('affixed.static.stickySidebar', function () {
                 // reset our file so it's not holding new value
                 $('.fpath-placeholder-text').html(contextPrefix + ' - ')
             });
 
             updateSticky = function () {
                 sidebar.updateSticky();
                 Waypoint.refreshAll();
             };
 
             var animateText = function (fPath, anchorId) {
                 fPath = Select2.util.escapeMarkup(fPath);
                 $('.fpath-placeholder-text').html(contextPrefix + '<a href="#a_' + anchorId + '">' + fPath + '</a>')
             };
 
             ## dynamic file waypoints
             var setFPathInfo = function(fPath, anchorId){
                 animateText(fPath, anchorId)
             };
 
             var codeBlock = $('.filediff');
 
             // forward waypoint
             codeBlock.waypoint(
                 function(direction) {
                     if (direction === "down"){
                         setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId'))
                     }
                 }, {
                     offset: function () {
                         return 70;
                     },
                     context: '.fpath-placeholder'
                 }
             );
 
             // backward waypoint
             codeBlock.waypoint(
                 function(direction) {
                     if (direction === "up"){
                         setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId'))
                     }
                 }, {
                     offset: function () {
                         return -this.element.clientHeight + 90;
                     },
                     context: '.fpath-placeholder'
                 }
             );
 
             toggleWideDiff = function (el) {
                 updateSticky();
                 var wide = Rhodecode.comments.toggleWideMode(this);
                 storeUserSessionAttr('rc_user_session_attr.wide_diff_mode', wide);
                 if (wide === true) {
                     $(el).addClass('btn-active');
                 } else {
                     $(el).removeClass('btn-active');
                 }
                 return null;
             };
 
             var preloadDiffMenuData = {
                 results: [
 
                     ## Whitespace change
                     % if request.GET.get('ignorews', '') == '1':
                     {
                         id: 2,
                         text: _gettext('Show whitespace changes'),
                         action: function () {},
                         url: "${h.current_route_path(request, ignorews=0)|n}"
                     },
                     % else:
                     {
                         id: 2,
                         text: _gettext('Hide whitespace changes'),
                         action: function () {},
                         url: "${h.current_route_path(request, ignorews=1)|n}"
                     },
                     % endif
 
                     ## FULL CONTEXT
                     % if request.GET.get('fullcontext', '') == '1':
                     {
                         id: 3,
                         text: _gettext('Hide full context diff'),
                         action: function () {},
                         url: "${h.current_route_path(request, fullcontext=0)|n}"
                     },
                     % else:
                     {
                         id: 3,
                         text: _gettext('Show full context diff'),
                         action: function () {},
                         url: "${h.current_route_path(request, fullcontext=1)|n}"
                     },
                     % endif
 
                 ]
             };
 
             var diffMenuId = "#diff_menu_" + "${diffset_container_id}";
             $(diffMenuId).select2({
                 minimumResultsForSearch: -1,
                 containerCssClass: "drop-menu-no-width",
                 dropdownCssClass: "drop-menu-dropdown",
                 dropdownAutoWidth: true,
                 data: preloadDiffMenuData,
                 placeholder: "${_('...')}",
             });
             $(diffMenuId).on('select2-selecting', function (e) {
                 e.choice.action();
                 if (e.choice.url !== null) {
                     window.location = e.choice.url
                 }
             });
             toggleExpand = function (el, diffsetEl) {
                 var el = $(el);
                 if (el.hasClass('collapsed')) {
                     $('.filediff-collapse-state.collapse-{0}'.format(diffsetEl)).prop('checked', false);
                     el.removeClass('collapsed');
                     el.html(
                         '<i class="icon-minus-squared-alt icon-no-margin"></i>' +
                         _gettext('Collapse all files'));
                 }
                 else {
                     $('.filediff-collapse-state.collapse-{0}'.format(diffsetEl)).prop('checked', true);
                     el.addClass('collapsed');
                     el.html(
                         '<i class="icon-plus-squared-alt icon-no-margin"></i>' +
                         _gettext('Expand all files'));
                 }
                 updateSticky()
             };
 
             toggleCommitExpand = function (el) {
                 var $el = $(el);
                 var commits = $el.data('toggleCommitsCnt');
                 var collapseMsg = _ngettext('Collapse {0} commit', 'Collapse {0} commits', commits).format(commits);
                 var expandMsg = _ngettext('Expand {0} commit', 'Expand {0} commits', commits).format(commits);
 
                 if ($el.hasClass('collapsed')) {
                     $('.compare_select').show();
                     $('.compare_select_hidden').hide();
 
                     $el.removeClass('collapsed');
                     $el.html(
                         '<i class="icon-minus-squared-alt icon-no-margin"></i>' +
                        collapseMsg);
                 }
                 else {
                     $('.compare_select').hide();
                     $('.compare_select_hidden').show();
                     $el.addClass('collapsed');
                     $el.html(
                         '<i class="icon-plus-squared-alt icon-no-margin"></i>' +
                         expandMsg);
                 }
                 updateSticky();
             };
 
             // get stored diff mode and pre-enable it
             if (templateContext.session_attrs.wide_diff_mode === "true") {
                 Rhodecode.comments.toggleWideMode(null);
                 $('.toggle-wide-diff').addClass('btn-active');
                 updateSticky();
             }
         });
     </script>
 
 </%def>

rhodecode/templates/commits/changelog.mako

@@ -1,326 +1,326 b''
 ## -*- coding: utf-8 -*-
 
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('%s Changelog') % c.repo_name}
     %if c.changelog_for_path:
       /${c.changelog_for_path}
     %endif
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     %if c.changelog_for_path:
      /${c.changelog_for_path}
     %endif
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='commits')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
 
     <div class="title">
         <div id="filter_changelog">
             ${h.hidden('branch_filter')}
              %if c.selected_name:
              <div class="btn btn-default" id="clear_filter" >
                  ${_('Clear filter')}
              </div>
             %endif
         </div>
         <div class="pull-left obsolete-toggle">
             % if h.is_hg(c.rhodecode_repo):
                 % if c.show_hidden:
                     <a class="action-link" href="${h.current_route_path(request, evolve=0)}">${_('Hide obsolete/hidden')}</a>
                 % else:
                     <a class="action-link" href="${h.current_route_path(request, evolve=1)}">${_('Show obsolete/hidden')}</a>
                 % endif
             % else:
                     <span class="action-link disabled">${_('Show hidden')}</span>
             % endif
         </div>
         <ul class="links">
             <li>
 
                 %if c.rhodecode_db_repo.fork:
                     <span>
                         <a  id="compare_fork_button"
                             title="${h.tooltip(_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name))}"
                             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)}
                         </a>
                     </span>
                 %endif
 
                 ## pr open link
                 %if h.is_hg(c.rhodecode_repo) or h.is_git(c.rhodecode_repo):
                     <span>
                         <a id="open_new_pull_request" class="btn btn-small btn-success" href="${h.route_path('pullrequest_new',repo_name=c.repo_name)}">
                             ${_('Open new pull request')}
                         </a>
                     </span>
                 %endif
 
             </li>
         </ul>
     </div>
 
     % if c.pagination:
         <script type="text/javascript" src="${h.asset('js/src/plugins/jquery.commits-graph.js')}"></script>
 
         <div class="graph-header">
             ${self.breadcrumbs('breadcrumbs_light')}
         </div>
 
         <div id="graph">
             <div class="graph-col-wrapper">
               <div id="graph_nodes">
                 <div id="graph_canvas"></div>
             </div>
             <div id="graph_content" class="graph_full_width">
 
               <div class="table">
                 <table id="changesets" class="rctable">
                     <tr>
                       ## checkbox
                       <th colspan="4">
                         ## clear selection
                         <div title="${_('Clear selection')}" class="btn btn-sm" id="rev_range_clear" style="display:none">
                             <i class="icon-cancel-circled2"></i>
                         </div>
                         <div class="btn btn-sm disabled" disabled="disabled" id="rev_range_more" style="display:none;">${_('Select second commit')}</div>
                         <a href="#" class="btn btn-success btn-sm" id="rev_range_container" style="display:none;"></a>
                       </th>
 
                       ## commit message expand arrow
                       <th></th>
                       <th>${_('Commit Message')}</th>
 
                       <th>${_('Age')}</th>
                       <th>${_('Author')}</th>
 
                       <th>${_('Refs')}</th>
                       ## comments
                       <th></th>
                     </tr>
 
                     <tbody class="commits-range">
                         <%include file='changelog_elements.mako'/>
                     </tbody>
                 </table>
               </div>
             </div>
             <div class="pagination-wh pagination-left">
             ${c.pagination.render()}
             </div>
             <div id="commit-counter" data-total=${c.total_cs} class="pull-right">
                 ${_ungettext('showing %d out of %d commit', 'showing %d out of %d commits', c.showing_commits) % (c.showing_commits, c.total_cs)}
             </div>
         </div>
 
         <script type="text/javascript">
         var cache = {};
         $(function(){
 
             // Create links to commit ranges when range checkboxes are selected
             var $commitCheckboxes = $('.commit-range');
             // cache elements
             var $commitRangeMore = $('#rev_range_more');
             var $commitRangeContainer = $('#rev_range_container');
             var $commitRangeClear = $('#rev_range_clear');
 
             var checkboxRangeSelector = function(e){
                 var selectedCheckboxes = [];
                 for (pos in $commitCheckboxes){
                     if($commitCheckboxes[pos].checked){
                         selectedCheckboxes.push($commitCheckboxes[pos]);
                     }
                 }
                 var open_new_pull_request = $('#open_new_pull_request');
 
                 if (open_new_pull_request) {
                     var selected_changes = selectedCheckboxes.length;
                     open_new_pull_request.hide();
                     if (selected_changes == 1) {
                         open_new_pull_request.html(_gettext('Open new pull request for selected commit'));
                     } else {
                         open_new_pull_request.html(_gettext('Open new pull request'));
                     }
                     open_new_pull_request.show();
                 }
 
                 if (selectedCheckboxes.length > 0) {
                     $('#compare_fork_button').hide();
                     var commitStart = $(selectedCheckboxes[selectedCheckboxes.length-1]).data();
 
                     var revStart = commitStart.commitId;
 
                     var commitEnd = $(selectedCheckboxes[0]).data();
                     var revEnd = commitEnd.commitId;
 
                     var lbl_start = '{0}'.format(commitStart.commitIdx, commitStart.shortId);
                     var lbl_end = '{0}'.format(commitEnd.commitIdx, commitEnd.shortId);
 
                     var url = pyroutes.url('repo_commit', {'repo_name': '${c.repo_name}', 'commit_id': revStart+'...'+revEnd});
                     var link = _gettext('Show commit range {0} ... {1}').format(lbl_start, lbl_end);
 
                     if (selectedCheckboxes.length > 1) {
                         $commitRangeClear.show();
                         $commitRangeMore.hide();
 
                         $commitRangeContainer
                             .attr('href',url)
                             .html(link)
                             .show();
 
 
                     } else {
                         $commitRangeContainer.hide();
                         $commitRangeClear.show();
                         $commitRangeMore.show();
                     }
 
                     // pull-request link
                     if (selectedCheckboxes.length == 1){
                         var _url = pyroutes.url('pullrequest_new', {'repo_name': '${c.repo_name}', 'commit': revEnd});
                         open_new_pull_request.attr('href', _url);
                     } else {
                         var _url = pyroutes.url('pullrequest_new', {'repo_name': '${c.repo_name}'});
                         open_new_pull_request.attr('href', _url);
                     }
 
                 } else {
                     $commitRangeContainer.hide();
                     $commitRangeClear.hide();
                     $commitRangeMore.hide();
 
                     %if c.branch_name:
                         var _url = pyroutes.url('pullrequest_new', {'repo_name': '${c.repo_name}', 'branch':'${c.branch_name}'});
                         open_new_pull_request.attr('href', _url);
                     %else:
                         var _url = pyroutes.url('pullrequest_new', {'repo_name': '${c.repo_name}'});
                         open_new_pull_request.attr('href', _url);
                     %endif
                     $('#compare_fork_button').show();
                 }
             };
 
             $commitCheckboxes.on('click', checkboxRangeSelector);
 
             $commitRangeClear.on('click',function(e) {
                 $commitCheckboxes.attr('checked', false);
                 checkboxRangeSelector();
                 e.preventDefault();
             });
 
             // make sure the buttons are consistent when navigate back and forth
             checkboxRangeSelector();
 
             var msgs = $('.message');
             // get first element height
             var el = $('#graph_content .container')[0];
             var row_h = el.clientHeight;
             for (var i=0; i < msgs.length; i++) {
                 var m = msgs[i];
 
                 var h = m.clientHeight;
                 var pad = $(m).css('padding');
                 if (h > row_h) {
                     var offset = row_h - (h+12);
                     $(m.nextElementSibling).css('display','block');
                     $(m.nextElementSibling).css('margin-top',offset+'px');
                 }
             }
 
             $("#clear_filter").on("click", function() {
                 var filter = {'repo_name': '${c.repo_name}'};
                 window.location = pyroutes.url('repo_commits', filter);
             });
 
             $("#branch_filter").select2({
                 'dropdownAutoWidth': true,
                 'width': 'resolve',
                 'placeholder': "${c.selected_name or _('Branch filter')}",
                 containerCssClass: "drop-menu",
                 dropdownCssClass: "drop-menu-dropdown",
                 query: function(query){
                   var key = 'cache';
                   var cached = cache[key] ;
                   if(cached) {
                     var data = {results: []};
                     //filter results
                     $.each(cached.results, function(){
                         var section = this.text;
                         var children = [];
                         $.each(this.children, function(){
                             if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                                 children.push({'id': this.id, 'text': this.text, 'type': this.type})
                             }
                         });
                         data.results.push({'text': section, 'children': children});
                         query.callback({results: data.results});
                     });
                   }else{
                       $.ajax({
                         url: pyroutes.url('repo_refs_changelog_data', {'repo_name': '${c.repo_name}'}),
                         data: {},
                         dataType: 'json',
                         type: 'GET',
                         success: function(data) {
                           cache[key] = data;
                           query.callback({results: data.results});
                         }
                       })
                   }
                 }
             });
             $('#branch_filter').on('change', function(e){
                 var data = $('#branch_filter').select2('data');
                 //type: branch_closed
                 var selected = data.text;
                 var filter = {'repo_name': '${c.repo_name}'};
                 if(data.type == 'branch' || data.type == 'branch_closed'){
                     filter["branch"] = selected;
                     if (data.type == 'branch_closed') {
                         filter["evolve"] = '1';
                     }
                 }
                 else if (data.type == 'book'){
                     filter["bookmark"] = selected;
                 }
                 window.location = pyroutes.url('repo_commits', filter);
             });
 
             commitsController = new CommitsController();
             % if not c.changelog_for_path:
                 commitsController.reloadGraph();
             % endif
 
         });
 
     </script>
         </div>
     % else:
         ${_('There are no changes yet')}
     % endif
 </div>
 </%def>

rhodecode/templates/compare/compare_diff.mako

@@ -1,308 +1,308 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
 
 <%def name="title()">
     %if c.compare_home:
         ${_('%s Compare') % c.repo_name}
     %else:
         ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.source_repo.repo_name, c.source_ref)} &gt; ${'%s@%s' % (c.target_repo.repo_name, c.target_ref)}
     %endif
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='compare')}
 </%def>
 
 <%def name="main()">
     <script type="text/javascript">
         // set fake commitId on this commit-range page
         templateContext.commit_data.commit_id = "${h.EmptyCommit().raw_id}";
     </script>
 
     <div class="box">
         <div class="summary changeset">
             <div class="summary-detail">
               <div class="summary-detail-header">
                   <span class="breadcrumbs files_location">
                     <h4>
                         ${_('Compare Commits')}
                         % if c.file_path:
                         ${_('for file')} <a href="#${('a_' + h.FID('',c.file_path))}">${c.file_path}</a>
                         % endif
 
                         % if c.commit_ranges:
                         <code>
                         r${c.commit_ranges[0].idx}:${h.short_id(c.commit_ranges[0].raw_id)}...r${c.commit_ranges[-1].idx}:${h.short_id(c.commit_ranges[-1].raw_id)}
                         </code>
                         % endif
                     </h4>
                   </span>
 
                   <div class="clear-fix"></div>
               </div>
 
               <div class="fieldset">
                 <div class="left-label-summary">
                     <p class="spacing">${_('Target')}:</p>
                     <div class="right-label-summary">
                         <div class="code-header" >
                             <div class="compare_header">
                                 ## The hidden elements are replaced with a select2 widget
                                 ${h.hidden('compare_source')}
                             </div>
                         </div>
                     </div>
                 </div>
               </div>
 
               <div class="fieldset">
                 <div class="left-label-summary">
                     <p class="spacing">${_('Source')}:</p>
                     <div class="right-label-summary">
                         <div class="code-header" >
                             <div class="compare_header">
                                 ## The hidden elements are replaced with a select2 widget
                                 ${h.hidden('compare_target')}
                             </div>
                         </div>
                     </div>
                 </div>
               </div>
 
               <div class="fieldset">
                 <div class="left-label-summary">
                     <p class="spacing">${_('Actions')}:</p>
                     <div class="right-label-summary">
                         <div class="code-header" >
                             <div class="compare_header">
                                 <div class="compare-buttons">
                                 % if c.compare_home:
                                   <a id="compare_revs" class="btn btn-primary"> ${_('Compare Commits')}</a>
                                   %if c.rhodecode_db_repo.fork:
 
                                        <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')}
                                        </a>
 
                                   %endif
 
                                   <a class="btn disabled tooltip" disabled="disabled" title="${_('Action unavailable in current view')}">${_('Swap')}</a>
                                   <a class="btn disabled tooltip" disabled="disabled" title="${_('Action unavailable in current view')}">${_('Comment')}</a>
                                   <div id="changeset_compare_view_content">
                                      <div class="help-block">${_('Compare commits, branches, bookmarks or tags.')}</div>
                                   </div>
 
                                 % elif c.preview_mode:
                                   <a class="btn disabled tooltip" disabled="disabled" title="${_('Action unavailable in current view')}">${_('Compare Commits')}</a>
                                   <a class="btn disabled tooltip" disabled="disabled" title="${_('Action unavailable in current view')}">${_('Swap')}</a>
                                   <a class="btn disabled tooltip" disabled="disabled" title="${_('Action unavailable in current view')}">${_('Comment')}</a>
 
                                 % else:
                                   <a id="compare_revs" class="btn btn-primary"> ${_('Compare Commits')}</a>
                                   <a id="btn-swap" class="btn btn-primary" href="${c.swap_url}">${_('Swap')}</a>
 
                                   ## allow comment only if there are commits to comment on
                                   % if c.diffset and c.diffset.files and c.commit_ranges:
                                     <a id="compare_changeset_status_toggle" class="btn btn-primary">${_('Comment')}</a>
                                   % else:
                                     <a class="btn disabled tooltip" disabled="disabled" title="${_('Action unavailable in current view')}">${_('Comment')}</a>
                                   % endif
                                 % endif
                                 </div>
                             </div>
                         </div>
                     </div>
                     </div>
               </div>
 
               ## commit status form
               <div class="fieldset" id="compare_changeset_status" style="display: none; margin-bottom: -80px;">
                 <div class="left-label-summary">
                     <p class="spacing">${_('Commit status')}:</p>
                     <div class="right-label-summary">
                         <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
                         ## main comment form and it status
                         <%
                         def revs(_revs):
                             form_inputs = []
                             for cs in _revs:
                                 tmpl = '<input type="hidden" data-commit-id="%(cid)s" name="commit_ids" value="%(cid)s">' % {'cid': cs.raw_id}
                                 form_inputs.append(tmpl)
                             return form_inputs
                         %>
                         <div>
                             ${comment.comments(h.route_path('repo_commit_comment_create', repo_name=c.repo_name, commit_id='0'*16), None, is_compare=True, form_extras=revs(c.commit_ranges))}
                         </div>
                     </div>
                 </div>
               </div>
               <div class="clear-fix"></div>
             </div> <!-- end summary-detail -->
         </div> <!-- end summary -->
 
         ## use JS script to load it quickly before potentially large diffs render long time
         ## this prevents from situation when large diffs block rendering of select2 fields
         <script type="text/javascript">
 
                 var cache = {};
 
                 var formatSelection = function(repoName){
                     return function(data, container, escapeMarkup) {
                         var selection = data ? this.text(data) : "";
                         return escapeMarkup('{0}@{1}'.format(repoName, selection));
                     }
                 };
 
                 var feedCompareData = function(query, cachedValue){
                     var data = {results: []};
                     //filter results
                     $.each(cachedValue.results, function() {
                         var section = this.text;
                         var children = [];
                         $.each(this.children, function() {
                             if (query.term.length === 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) {
                                 children.push({
                                     'id': this.id,
                                     'text': this.text,
                                     'type': this.type
                                 })
                             }
                         });
                         data.results.push({
                             'text': section,
                             'children': children
                         })
                     });
                     //push the typed in changeset
                     data.results.push({
                         'text': _gettext('specify commit'),
                         'children': [{
                             'id': query.term,
                             'text': query.term,
                             'type': 'rev'
                         }]
                     });
                     query.callback(data);
                 };
 
                 var loadCompareData = function(repoName, query, cache){
                     $.ajax({
                         url: pyroutes.url('repo_refs_data', {'repo_name': repoName}),
                         data: {},
                         dataType: 'json',
                         type: 'GET',
                         success: function(data) {
                             cache[repoName] = data;
                             query.callback({results: data.results});
                         }
                     })
                 };
 
                 var enable_fields = ${"false" if c.preview_mode else "true"};
                 $("#compare_source").select2({
                     placeholder: "${'%s@%s' % (c.source_repo.repo_name, c.source_ref)}",
                     containerCssClass: "drop-menu",
                     dropdownCssClass: "drop-menu-dropdown",
                     formatSelection: formatSelection("${c.source_repo.repo_name}"),
                     dropdownAutoWidth: true,
                     query: function(query) {
                         var repoName = '${c.source_repo.repo_name}';
                         var cachedValue = cache[repoName];
 
                         if (cachedValue){
                             feedCompareData(query, cachedValue);
                         }
                         else {
                             loadCompareData(repoName, query, cache);
                         }
                     }
                 }).select2("enable", enable_fields);
 
                 $("#compare_target").select2({
                     placeholder: "${'%s@%s' % (c.target_repo.repo_name, c.target_ref)}",
                     dropdownAutoWidth: true,
                     containerCssClass: "drop-menu",
                     dropdownCssClass: "drop-menu-dropdown",
                     formatSelection: formatSelection("${c.target_repo.repo_name}"),
                     query: function(query) {
                         var repoName = '${c.target_repo.repo_name}';
                         var cachedValue = cache[repoName];
 
                         if (cachedValue){
                             feedCompareData(query, cachedValue);
                         }
                         else {
                             loadCompareData(repoName, query, cache);
                         }
                     }
                 }).select2("enable", enable_fields);
                 var initial_compare_source = {id: "${c.source_ref}", type:"${c.source_ref_type}"};
                 var initial_compare_target = {id: "${c.target_ref}", type:"${c.target_ref_type}"};
 
                 $('#compare_revs').on('click', function(e) {
                     var source = $('#compare_source').select2('data') || initial_compare_source;
                     var target = $('#compare_target').select2('data')  || initial_compare_target;
                     if (source && target) {
                         var url_data = {
                             repo_name: "${c.repo_name}",
                             source_ref: source.id,
                             source_ref_type: source.type,
                             target_ref: target.id,
                             target_ref_type: target.type
                         };
                         window.location = pyroutes.url('repo_compare', url_data);
                     }
                 });
                 $('#compare_changeset_status_toggle').on('click', function(e) {
                     $('#compare_changeset_status').toggle();
                 });
 
         </script>
 
         ## table diff data
         <div class="table">
             % if not c.compare_home:
                 <div id="changeset_compare_view_content">
                     <div class="pull-left">
                       <div class="btn-group">
                           <a class="${('collapsed' if c.collapse_all_commits else '')}" href="#expand-commits" onclick="toggleCommitExpand(this); return false" data-toggle-commits-cnt=${len(c.commit_ranges)} >
                               % if c.collapse_all_commits:
                                 <i class="icon-plus-squared-alt icon-no-margin"></i>
                                 ${_ungettext('Expand {} commit', 'Expand {} commits', len(c.commit_ranges)).format(len(c.commit_ranges))}
                               % else:
                                 <i class="icon-minus-squared-alt icon-no-margin"></i>
                                 ${_ungettext('Collapse {} commit', 'Collapse {} commits', len(c.commit_ranges)).format(len(c.commit_ranges))}
                               % endif
                           </a>
                       </div>
                     </div>
                     <div style="padding:0 10px 10px 0px" class="pull-left"></div>
                     ## commit compare generated below
                     <%include file="compare_commits.mako"/>
                     ${cbdiffs.render_diffset_menu(c.diffset)}
                     ${cbdiffs.render_diffset(c.diffset)}
                  </div>
             % endif
 
         </div>
     </div>
 
 </%def>

rhodecode/templates/email_templates/base.mako

@@ -1,603 +1,642 b''
 ## -*- coding: utf-8 -*-
 
 ## helpers
 <%def name="tag_button(text, tag_type=None)">
 <%
 color_scheme = {
     'default': 'border:1px solid #979797;color:#666666;background-color:#f9f9f9',
     'approved': 'border:1px solid #0ac878;color:#0ac878;background-color:#f9f9f9',
     'rejected': 'border:1px solid #e85e4d;color:#e85e4d;background-color:#f9f9f9',
     'under_review': 'border:1px solid #ffc854;color:#ffc854;background-color:#f9f9f9',
 }
 
 css_style = ';'.join([
     'display:inline',
     'border-radius:2px',
     'font-size:12px',
     'padding:.2em',
 ])
 
 %>
     <pre style="${css_style}; ${color_scheme.get(tag_type, color_scheme['default'])}">${text}</pre>
 </%def>
 
 <%def name="status_text(text, tag_type=None)">
     <%
     color_scheme = {
         'default': 'color:#666666',
         'approved': 'color:#0ac878',
         'rejected': 'color:#e85e4d',
         'under_review': 'color:#ffc854',
     }
     %>
     <span style="font-weight:bold;font-size:12px;padding:.2em;${color_scheme.get(tag_type, color_scheme['default'])}">${text}</span>
 </%def>
 
 <%def name="gravatar_img(email, size=16)">
 <%
 css_style = ';'.join([
     'padding: 0',
     'margin: -4px 0',
     'border-radius: 50%',
     'box-sizing: content-box',
     'display: inline',
     'line-height: 1em',
     'min-width: 16px',
     'min-height: 16px',
 ])
 %>
 
 <img alt="gravatar" style="${css_style}" src="${h.gravatar_url(email, size)}" height="${size}" width="${size}">
 </%def>
 
 <%def name="link_css()">\
 <%
 css_style = ';'.join([
     'color:#427cc9',
     'text-decoration:none',
     'cursor:pointer'
 ])
 %>\
 ${css_style}\
 </%def>
 
 ## Constants
 <%
 text_regular = "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Helvetica, sans-serif"
 text_monospace = "'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace"
 
 %>
 
 ## headers we additionally can set for email
 <%def name="headers()" filter="n,trim"></%def>
 
 <%def name="plaintext_footer()" filter="trim">
 ${_('This is a notification from RhodeCode.')} ${instance_url}
 </%def>
 
 <%def name="body_plaintext()" filter="n,trim">
 ## this example is not called itself but overridden in each template
 ## the plaintext_footer should be at the bottom of both html and text emails
 ${self.plaintext_footer()}
 </%def>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title>${self.subject()}</title>
     <style type="text/css">
         /* Based on The MailChimp Reset INLINE: Yes. */
         #outlook a {
             padding: 0;
         }
 
         /* Force Outlook to provide a "view in browser" menu link. */
         body {
             width: 100% !important;
             -webkit-text-size-adjust: 100%;
             -ms-text-size-adjust: 100%;
             margin: 0;
             padding: 0;
             font-family: ${text_regular|n};
+            color: #000000;
         }
 
         /* Prevent Webkit and Windows Mobile platforms from changing default font sizes.*/
         .ExternalClass {
             width: 100%;
         }
 
         /* Force Hotmail to display emails at full width */
         .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {
             line-height: 100%;
         }
 
         /* Forces Hotmail to display normal line spacing.  More on that: http://www.emailonacid.com/forum/viewthread/43/ */
         #backgroundTable {
             margin: 0;
             padding: 0;
             line-height: 100% !important;
         }
 
         /* End reset */
 
         /* defaults for images*/
         img {
             outline: none;
             text-decoration: none;
             -ms-interpolation-mode: bicubic;
         }
 
         a img {
             border: none;
         }
 
         .image_fix {
             display: block;
         }
 
         body {
             line-height: 1.2em;
         }
 
         p {
             margin: 0 0 20px;
         }
 
         h1, h2, h3, h4, h5, h6 {
             color: #323232 !important;
         }
 
         a {
             color: #427cc9;
             text-decoration: none;
             outline: none;
             cursor: pointer;
         }
 
         a:focus {
             outline: none;
         }
 
         a:hover {
             color: #305b91;
         }
 
         h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
             color: #427cc9 !important;
             text-decoration: none !important;
         }
 
         h1 a:active, h2 a:active, h3 a:active, h4 a:active, h5 a:active, h6 a:active {
             color: #305b91 !important;
         }
 
         h1 a:visited, h2 a:visited, h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited {
             color: #305b91 !important;
         }
 
         table {
             font-size: 13px;
             border-collapse: collapse;
             mso-table-lspace: 0pt;
             mso-table-rspace: 0pt;
         }
 
         table tr {
             display: table-row;
             vertical-align: inherit;
             border-color: inherit;
             border-spacing: 0 3px;
         }
 
         table td {
             padding: .65em 1em .65em 0;
             border-collapse: collapse;
             vertical-align: top;
             text-align: left;
         }
 
         input {
             display: inline;
             border-radius: 2px;
             border: 1px solid #dbd9da;
             padding: .5em;
         }
 
         input:focus {
             outline: 1px solid #979797
         }
 
         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) {
             /* Put your iPhone 4g styles in here */
         }
 
         /* Android targeting */
         @media only screen and (-webkit-device-pixel-ratio:.75){
         /* Put CSS for low density (ldpi) Android layouts in here */
         }
         @media only screen and (-webkit-device-pixel-ratio:1){
         /* Put CSS for medium density (mdpi) Android layouts in here */
         }
         @media only screen and (-webkit-device-pixel-ratio:1.5){
         /* Put CSS for high density (hdpi) Android layouts in here */
         }
         /* end Android targeting */
 
         /** MARKDOWN styling **/
         div.markdown-block {
             clear: both;
             overflow: hidden;
             margin: 0;
             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
         }
 
         div.markdown-block h1 {
             font-size: 32px;
             margin: 15px 0 15px 0 !important;
             padding-bottom: 5px !important
         }
 
         div.markdown-block h2 {
             font-size: 24px !important;
             margin: 34px 0 10px 0 !important;
             padding-top: 15px !important;
             padding-bottom: 8px !important
         }
 
         div.markdown-block h3 {
             font-size: 18px !important;
             margin: 30px 0 8px 0 !important;
             padding-bottom: 2px !important
         }
 
         div.markdown-block h4 {
             font-size: 13px !important;
             margin: 18px 0 3px 0 !important
         }
 
         div.markdown-block h5 {
             font-size: 12px !important;
             margin: 15px 0 3px 0 !important
         }
 
         div.markdown-block h6 {
             font-size: 12px;
             color: #777777;
             margin: 15px 0 3px 0 !important
         }
 
         div.markdown-block hr {
             border: 0;
             color: #e6e5e5;
             background-color: #e6e5e5;
             height: 3px;
             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;
             font-family: ${text_regular|n};
             font-weight: normal !important;
             overflow: visible !important;
             line-height: 140% !important
         }
 
         div.markdown-block pre {
             margin: 3px 0 13px 0 !important;
             padding: .5em;
             color: #424242 !important;
             font-size: 13px !important;
             overflow: visible !important;
             line-height: 140% !important;
             background-color: #F5F5F5
         }
 
         div.markdown-block img {
             border-style: none;
             background-color: #fff;
             padding-right: 20px;
             max-width: 100%
         }
 
         div.markdown-block strong {
             font-weight: 600;
             margin: 0
         }
 
         div.markdown-block ul.checkbox, div.markdown-block ol.checkbox {
             padding-left: 20px !important;
             margin-top: 0 !important;
             margin-bottom: 18px !important
         }
 
         div.markdown-block ul, div.markdown-block ol {
             padding-left: 30px !important;
             margin-top: 0 !important;
             margin-bottom: 18px !important
         }
 
         div.markdown-block ul.checkbox li, div.markdown-block ol.checkbox li {
             list-style: none !important;
             margin: 6px !important;
             padding: 0 !important
         }
 
         div.markdown-block ul li, div.markdown-block ol li {
             list-style: disc !important;
             margin: 6px !important;
             padding: 0 !important
         }
 
         div.markdown-block ol li {
             list-style: decimal !important
         }
 
         div.markdown-block #message {
             -webkit-border-radius: 2px;
             -moz-border-radius: 2px;
             border-radius: 2px;
             border: 1px solid #dbd9da;
             display: block;
             width: 100%;
             height: 60px;
             margin: 6px 0
         }
 
         div.markdown-block button, div.markdown-block #ws {
             font-size: 13px;
             padding: 4px 6px;
             -webkit-border-radius: 2px;
             -moz-border-radius: 2px;
             border-radius: 2px;
             border: 1px solid #dbd9da;
             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 {
             border: 0;
             margin: 0;
             padding: 0
         }
 
         div.rst-block {
             clear: both;
             overflow: hidden;
             margin: 0;
             padding: 3px 5px 3px
         }
 
         div.rst-block h2 {
             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;
             line-height: 1.5em !important
         }
 
         div.rst-block h1:first-child {
             padding-top: .25em !important
         }
 
         div.rst-block h2, div.rst-block h3 {
             margin: 1em 0 !important
         }
 
         div.rst-block h1, div.rst-block h2 {
             border-bottom: 1px #e6e5e5 solid !important
         }
 
         div.rst-block h2 {
             margin-top: 1.5em !important;
             padding-top: .5em !important
         }
 
         div.rst-block p {
             color: black !important;
             margin: 1em 0 !important;
             line-height: 1.5em !important
         }
 
         div.rst-block ul {
             list-style: disc !important;
             margin: 1em 0 1em 2em !important;
             clear: both
         }
 
         div.rst-block ol {
             list-style: decimal;
             margin: 1em 0 1em 2em !important
         }
 
         div.rst-block pre, div.rst-block code {
             font: 12px "Bitstream Vera Sans Mono", "Courier", monospace
         }
 
         div.rst-block code {
             font-size: 12px !important;
             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 {
             padding: 0 !important;
             font-size: 12px !important;
             background-color: #eee !important;
             border: none !important
         }
 
         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;}
         .codehilite .hll { background-color: #ffffcc }
         .codehilite .c { color: #408080; font-style: italic } /* Comment */
         .codehilite .err { border: none } /* Error */
         .codehilite .k { color: #008000; font-weight: bold } /* Keyword */
         .codehilite .o { color: #666666 } /* Operator */
         .codehilite .ch { color: #408080; font-style: italic } /* Comment.Hashbang */
         .codehilite .cm { color: #408080; font-style: italic } /* Comment.Multiline */
         .codehilite .cp { color: #BC7A00 } /* Comment.Preproc */
         .codehilite .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */
         .codehilite .c1 { color: #408080; font-style: italic } /* Comment.Single */
         .codehilite .cs { color: #408080; font-style: italic } /* Comment.Special */
         .codehilite .gd { color: #A00000 } /* Generic.Deleted */
         .codehilite .ge { font-style: italic } /* Generic.Emph */
         .codehilite .gr { color: #FF0000 } /* Generic.Error */
         .codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */
         .codehilite .gi { color: #00A000 } /* Generic.Inserted */
         .codehilite .go { color: #888888 } /* Generic.Output */
         .codehilite .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
         .codehilite .gs { font-weight: bold } /* Generic.Strong */
         .codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
         .codehilite .gt { color: #0044DD } /* Generic.Traceback */
         .codehilite .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
         .codehilite .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
         .codehilite .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
         .codehilite .kp { color: #008000 } /* Keyword.Pseudo */
         .codehilite .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
         .codehilite .kt { color: #B00040 } /* Keyword.Type */
         .codehilite .m { color: #666666 } /* Literal.Number */
         .codehilite .s { color: #BA2121 } /* Literal.String */
         .codehilite .na { color: #7D9029 } /* Name.Attribute */
         .codehilite .nb { color: #008000 } /* Name.Builtin */
         .codehilite .nc { color: #0000FF; font-weight: bold } /* Name.Class */
         .codehilite .no { color: #880000 } /* Name.Constant */
         .codehilite .nd { color: #AA22FF } /* Name.Decorator */
         .codehilite .ni { color: #999999; font-weight: bold } /* Name.Entity */
         .codehilite .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
         .codehilite .nf { color: #0000FF } /* Name.Function */
         .codehilite .nl { color: #A0A000 } /* Name.Label */
         .codehilite .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
         .codehilite .nt { color: #008000; font-weight: bold } /* Name.Tag */
         .codehilite .nv { color: #19177C } /* Name.Variable */
         .codehilite .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
         .codehilite .w { color: #bbbbbb } /* Text.Whitespace */
         .codehilite .mb { color: #666666 } /* Literal.Number.Bin */
         .codehilite .mf { color: #666666 } /* Literal.Number.Float */
         .codehilite .mh { color: #666666 } /* Literal.Number.Hex */
         .codehilite .mi { color: #666666 } /* Literal.Number.Integer */
         .codehilite .mo { color: #666666 } /* Literal.Number.Oct */
         .codehilite .sa { color: #BA2121 } /* Literal.String.Affix */
         .codehilite .sb { color: #BA2121 } /* Literal.String.Backtick */
         .codehilite .sc { color: #BA2121 } /* Literal.String.Char */
         .codehilite .dl { color: #BA2121 } /* Literal.String.Delimiter */
         .codehilite .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
         .codehilite .s2 { color: #BA2121 } /* Literal.String.Double */
         .codehilite .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
         .codehilite .sh { color: #BA2121 } /* Literal.String.Heredoc */
         .codehilite .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
         .codehilite .sx { color: #008000 } /* Literal.String.Other */
         .codehilite .sr { color: #BB6688 } /* Literal.String.Regex */
         .codehilite .s1 { color: #BA2121 } /* Literal.String.Single */
         .codehilite .ss { color: #19177C } /* Literal.String.Symbol */
         .codehilite .bp { color: #008000 } /* Name.Builtin.Pseudo */
         .codehilite .fm { color: #0000FF } /* Name.Function.Magic */
         .codehilite .vc { color: #19177C } /* Name.Variable.Class */
         .codehilite .vg { color: #19177C } /* Name.Variable.Global */
         .codehilite .vi { color: #19177C } /* Name.Variable.Instance */
         .codehilite .vm { color: #19177C } /* Name.Variable.Magic */
         .codehilite .il { color: #666666 } /* Literal.Number.Integer.Long */
 
     </style>
 
 </head>
 <body>
 
 <div>
 <!-- Wrapper/Container Table: Use a wrapper table to control the width and the background color consistently of your email. Use this approach instead of setting attributes on the body tag. -->
 <table cellpadding="0" cellspacing="0" border="0" id="backgroundTable" align="left" style="margin:1%;width:97%;padding:0;font-family:${text_regular|n};font-weight:100;border:1px solid #dbd9da">
     <tr>
         <td valign="top" style="padding:0;">
             <table cellpadding="0" cellspacing="0" border="0" align="left" width="100%">
                 <tr>
                     <td style="width:100%;padding:10px 15px;background-color:#202020" valign="top">
                         <a style="color:#eeeeee;text-decoration:none;" href="${instance_url}">
                             ${_('RhodeCode')}
                             % if rhodecode_instance_name:
                                 - ${rhodecode_instance_name}
                             % endif
                         </a>
                     </td>
                 </tr>
-                <tr>
+                <tr style="background-color: #fff">
                     <td style="padding:15px;" valign="top">${self.body()}</td>
                 </tr>
             </table>
         </td>
     </tr>
 </table>  
 <!-- End of wrapper table -->
 </div>
 
 <div style="width:100%; clear: both; height: 1px">&nbsp;</div>
 
 <div style="margin-left:1%;font-weight:100;font-size:11px;color:#666666;text-decoration:none;font-family:${text_monospace};">
     ${_('This is a notification from RhodeCode.')}
     <a style="font-weight:100;font-size:11px;color:#666666;text-decoration:none;font-family:${text_monospace};" href="${instance_url}">
         ${instance_url}
     </a>
 </div>
 </body>
 </html>

rhodecode/templates/email_templates/commit_comment.mako

@@ -1,170 +1,172 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
 ## EMAIL SUBJECT
 <%def name="subject()" filter="n,trim,whitespace_filter">
 <%
 data = {
     'user': '@'+h.person(user),
     'repo_name': repo_name,
     'status': status_change,
     'comment_file': comment_file,
     'comment_line': comment_line,
     'comment_type': comment_type,
     'comment_id': comment_id,
 
     'commit_id': h.show_id(commit),
 }
 %>
 
 
 % if comment_file:
     ${(_('[mention]') if mention else '')} ${_('{user} left a {comment_type} on file `{comment_file}` in commit `{commit_id}`').format(**data)} ${_('in the `{repo_name}` repository').format(**data) |n}
 % else:
     % if status_change:
     ${(_('[mention]') if mention else '')} ${_('[status: {status}] {user} left a {comment_type} on commit `{commit_id}`').format(**data) |n} ${_('in the `{repo_name}` repository').format(**data) |n}
     % else:
     ${(_('[mention]') if mention else '')} ${_('{user} left a {comment_type} on commit `{commit_id}`').format(**data) |n} ${_('in the `{repo_name}` repository').format(**data) |n}
     % endif
 % endif
 
 </%def>
 
 ## PLAINTEXT VERSION OF BODY
 <%def name="body_plaintext()" filter="n,trim">
 <%
 data = {
     'user': h.person(user),
     'repo_name': repo_name,
     'status': status_change,
     'comment_file': comment_file,
     'comment_line': comment_line,
     'comment_type': comment_type,
     'comment_id': comment_id,
 
     'commit_id': h.show_id(commit),
 }
 %>
 
 * ${_('Comment link')}: ${commit_comment_url}
 
 %if status_change:
 * ${_('Commit status')}: ${_('Status was changed to')}: *${status_change}*
 
 %endif
 * ${_('Commit')}: ${h.show_id(commit)}
 
 * ${_('Commit message')}: ${commit.message}
 
 %if comment_file:
 * ${_('File: {comment_file} on line {comment_line}').format(**data)}
 
 %endif
 % if comment_type == 'todo':
 ${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}:
 % else:
 ${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}:
 % endif
 
 ${comment_body |n, trim}
 
 ---
 ${self.plaintext_footer()}
 </%def>
 
 
 <%
 data = {
     'user': h.person(user),
     'comment_file': comment_file,
     'comment_line': comment_line,
     'comment_type': comment_type,
     'comment_id': comment_id,
     'renderer_type': renderer_type or 'plain',
 
     'repo': commit_target_repo_url,
     'repo_name': repo_name,
     'commit_id': h.show_id(commit),
 }
 %>
 
+## 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()}">
                     % if comment_file:
                         ${_('{comment_type} on file `{comment_file}` in commit.').format(**data)}
                     % else:
                         ${_('{comment_type} on commit.').format(**data) |n}
                     % endif
                 </a>
             </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
     <tr>
         <td style="width: 130px"></td>
         <td></td>
     </tr>
 
     % if status_change:
         <tr>
             <td style="padding-right:20px;">${_('Commit Status')}:</td>
             <td>
                 ${_('Status was changed to')}: ${base.status_text(status_change, tag_type=status_change_type)}
             </td>
         </tr>
     % endif
 
     <tr>
         <td style="padding-right:20px;">${_('Commit')}:</td>
         <td>
             <a href="${commit_comment_url}" style="${base.link_css()}">${h.show_id(commit)}</a>
         </td>
     </tr>
     <tr>
         <td style="padding-right:20px;">${_('Commit message')}:</td>
         <td style="white-space:pre-wrap">${h.urlify_commit_message(commit.message, repo_name)}</td>
     </tr>
 
     % if comment_file:
         <tr>
             <td style="padding-right:20px;">${_('File')}:</td>
             <td><a href="${commit_comment_url}" style="${base.link_css()}">${_('`{comment_file}` on line {comment_line}').format(**data)}</a></td>
         </tr>
     % endif
 
     <tr style="border-bottom:1px solid #dbd9da;">
         <td colspan="2" style="padding-right:20px;">
             % if comment_type == 'todo':
                 ${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}:
             % else:
                 ${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}:
             % endif
         </td>
     </tr>
 
     <tr>
         <td colspan="2" style="background: #F7F7F7">${h.render(comment_body, renderer=data['renderer_type'], mentions=True)}</td>
     </tr>
 
     <tr>
         <td><a href="${commit_comment_reply_url}">${_('Reply')}</a></td>
         <td></td>
     </tr>
 </table>

rhodecode/templates/email_templates/pull_request_comment.mako

@@ -1,201 +1,203 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
 ## EMAIL SUBJECT
 <%def name="subject()" filter="n,trim,whitespace_filter">
 <%
 data = {
     'user': '@'+h.person(user),
     'repo_name': repo_name,
     'status': status_change,
     'comment_file': comment_file,
     'comment_line': comment_line,
     'comment_type': comment_type,
     'comment_id': comment_id,
 
     'pr_title': pull_request.title,
     'pr_id': pull_request.pull_request_id,
 }
 %>
 
 
 % if comment_file:
     ${(_('[mention]') if mention else '')} ${_('{user} left a {comment_type} on file `{comment_file}` in pull request !{pr_id}: "{pr_title}"').format(**data) |n}
 % else:
     % if status_change:
     ${(_('[mention]') if mention else '')} ${_('[status: {status}] {user} left a {comment_type} on pull request !{pr_id}: "{pr_title}"').format(**data) |n}
     % else:
     ${(_('[mention]') if mention else '')} ${_('{user} left a {comment_type} on pull request !{pr_id}: "{pr_title}"').format(**data) |n}
     % endif
 % endif
 
 </%def>
 
 ## PLAINTEXT VERSION OF BODY
 <%def name="body_plaintext()" filter="n,trim">
 <%
 data = {
     'user': h.person(user),
     'repo_name': repo_name,
     'status': status_change,
     'comment_file': comment_file,
     'comment_line': comment_line,
     'comment_type': comment_type,
     'comment_id': comment_id,
 
     'pr_title': pull_request.title,
     'pr_id': pull_request.pull_request_id,
     'source_ref_type': pull_request.source_ref_parts.type,
     'source_ref_name': pull_request.source_ref_parts.name,
     'target_ref_type': pull_request.target_ref_parts.type,
     'target_ref_name': pull_request.target_ref_parts.name,
     'source_repo': pull_request_source_repo.repo_name,
     'target_repo': pull_request_target_repo.repo_name,
     'source_repo_url': pull_request_source_repo_url,
     'target_repo_url': pull_request_target_repo_url,
 }
 %>
 
 * ${_('Comment link')}: ${pr_comment_url}
 
 * ${_('Pull Request')}: !${pull_request.pull_request_id}
 
 * ${h.literal(_('Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}').format(**data))}
 
 %if status_change and not closing_pr:
 * ${_('{user} submitted pull request !{pr_id} status: *{status}*').format(**data)}
 
 %elif status_change and closing_pr:
 * ${_('{user} submitted pull request !{pr_id} status: *{status} and closed*').format(**data)}
 
 %endif
 %if comment_file:
 * ${_('File: {comment_file} on line {comment_line}').format(**data)}
 
 %endif
 % if comment_type == 'todo':
 ${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}:
 % else:
 ${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}:
 % endif
 
 ${comment_body |n, trim}
 
 ---
 ${self.plaintext_footer()}
 </%def>
 
 
 <%
 data = {
     'user': h.person(user),
     'comment_file': comment_file,
     'comment_line': comment_line,
     'comment_type': comment_type,
     'comment_id': comment_id,
     'renderer_type': renderer_type or 'plain',
 
     'pr_title': pull_request.title,
     'pr_id': pull_request.pull_request_id,
     'status': status_change,
     'source_ref_type': pull_request.source_ref_parts.type,
     'source_ref_name': pull_request.source_ref_parts.name,
     'target_ref_type': pull_request.target_ref_parts.type,
     'target_ref_name': pull_request.target_ref_parts.name,
     'source_repo': pull_request_source_repo.repo_name,
     'target_repo': pull_request_target_repo.repo_name,
     'source_repo_url': h.link_to(pull_request_source_repo.repo_name, pull_request_source_repo_url),
     '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" style="margin-bottom: 4px">
                 <span style="color:#7E7F7F">@${h.person(user.username)}</span>
                 ${_('left a')}
                 <a href="${pr_comment_url}" style="${base.link_css()}">
                     % if comment_file:
                         ${_('{comment_type} on file `{comment_file}` in pull request.').format(**data)}
                     % else:
                         ${_('{comment_type} on pull request.').format(**data) |n}
                     % endif
                 </a>
             </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>
         <td style="width: 130px"></td>
         <td></td>
     </tr>
 
     % if status_change:
     <tr>
         <td style="padding-right:20px;">${_('Review Status')}:</td>
         <td>
             % if closing_pr:
                ${_('Closed pull request with status')}: ${base.status_text(status_change, tag_type=status_change_type)}
             % else:
                ${_('Submitted review status')}: ${base.status_text(status_change, tag_type=status_change_type)}
             % endif
         </td>
     </tr>
     % endif
     <tr>
         <td style="padding-right:20px;">${_('Pull request')}:</td>
         <td>
             <a href="${pull_request_url}" style="${base.link_css()}">
             !${pull_request.pull_request_id}
             </a>
         </td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;line-height:20px;">${_('Commit Flow')}:</td>
         <td style="line-height:20px;">
             <code>${'{}:{}'.format(data['source_ref_type'], pull_request.source_ref_parts.name)}</code> ${_('of')} ${data['source_repo_url']}
             &rarr;
             <code>${'{}:{}'.format(data['target_ref_type'], pull_request.target_ref_parts.name)}</code> ${_('of')}  ${data['target_repo_url']}
         </td>
     </tr>
 
     % if comment_file:
         <tr>
             <td style="padding-right:20px;">${_('File')}:</td>
             <td><a href="${pr_comment_url}" style="${base.link_css()}">${_('`{comment_file}` on line {comment_line}').format(**data)}</a></td>
         </tr>
     % endif
 
     <tr style="border-bottom:1px solid #dbd9da;">
         <td colspan="2" style="padding-right:20px;">
             % if comment_type == 'todo':
                 ${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}:
             % else:
                 ${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}:
             % endif
         </td>
     </tr>
 
     <tr>
         <td colspan="2" style="background: #F7F7F7">${h.render(comment_body, renderer=data['renderer_type'], mentions=True)}</td>
     </tr>
 
     <tr>
         <td><a href="${pr_comment_reply_url}">${_('Reply')}</a></td>
         <td></td>
     </tr>
 </table>

rhodecode/templates/email_templates/pull_request_review.mako

@@ -1,143 +1,144 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
 ## EMAIL SUBJECT
 <%def name="subject()" filter="n,trim,whitespace_filter">
 <%
 data = {
     'user': '@'+h.person(user),
     'pr_id': pull_request.pull_request_id,
     'pr_title': pull_request.title,
 }
 %>
 
 ${_('{user} requested a pull request review. !{pr_id}: "{pr_title}"').format(**data) |n}
 </%def>
 
 ## PLAINTEXT VERSION OF BODY
 <%def name="body_plaintext()" filter="n,trim">
 <%
 data = {
     'user': h.person(user),
     'pr_id': pull_request.pull_request_id,
     'pr_title': pull_request.title,
     'source_ref_type': pull_request.source_ref_parts.type,
     'source_ref_name': pull_request.source_ref_parts.name,
     'target_ref_type': pull_request.target_ref_parts.type,
     'target_ref_name': pull_request.target_ref_parts.name,
     'repo_url': pull_request_source_repo_url,
     'source_repo': pull_request_source_repo.repo_name,
     'target_repo': pull_request_target_repo.repo_name,
     'source_repo_url': pull_request_source_repo_url,
     'target_repo_url': pull_request_target_repo_url,
 }
 %>
 
 * ${_('Pull Request link')}: ${pull_request_url}
 
 * ${h.literal(_('Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}').format(**data))}
 
 * ${_('Title')}: ${pull_request.title}
 
 * ${_('Description')}:
 
 ${pull_request.description | trim}
 
 
 * ${_ungettext('Commit (%(num)s)', 'Commits (%(num)s)', len(pull_request_commits) ) % {'num': len(pull_request_commits)}}:
 
 % for commit_id, message in pull_request_commits:
     - ${h.short_id(commit_id)}
       ${h.chop_at_smart(message, '\n', suffix_if_chopped='...')}
 
 % endfor
 
 ---
 ${self.plaintext_footer()}
 </%def>
 <%
 data = {
     'user': h.person(user),
     'pr_id': pull_request.pull_request_id,
     'pr_title': pull_request.title,
     'source_ref_type': pull_request.source_ref_parts.type,
     'source_ref_name': pull_request.source_ref_parts.name,
     'target_ref_type': pull_request.target_ref_parts.type,
     'target_ref_name': pull_request.target_ref_parts.name,
     'repo_url': pull_request_source_repo_url,
     'source_repo': pull_request_source_repo.repo_name,
     'target_repo': pull_request_target_repo.repo_name,
     'source_repo_url': h.link_to(pull_request_source_repo.repo_name, pull_request_source_repo_url),
     '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()}">
                 ${_('pull request review.').format(**data) }
                 </a>
             </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>
         <td style="width: 130px"></td>
         <td></td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;">${_('Pull request')}:</td>
         <td>
             <a href="${pull_request_url}" style="${base.link_css()}">
             !${pull_request.pull_request_id}
             </a>
         </td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;line-height:20px;">${_('Commit Flow')}:</td>
         <td style="line-height:20px;">
             <code>${'{}:{}'.format(data['source_ref_type'], pull_request.source_ref_parts.name)}</code> ${_('of')} ${data['source_repo_url']}
             &rarr;
             <code>${'{}:{}'.format(data['target_ref_type'], pull_request.target_ref_parts.name)}</code> ${_('of')}  ${data['target_repo_url']}
         </td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;">${_('Description')}:</td>
         <td style="white-space:pre-wrap"><code>${pull_request.description | trim}</code></td>
     </tr>
     <tr>
         <td style="padding-right:20px;">${_ungettext('Commit (%(num)s)', 'Commits (%(num)s)', len(pull_request_commits)) % {'num': len(pull_request_commits)}}:</td>
         <td></td>
     </tr>
 
     <tr>
         <td colspan="2">
             <ol style="margin:0 0 0 1em;padding:0;text-align:left;">
                 % for commit_id, message in pull_request_commits:
                     <li style="margin:0 0 1em;">
                         <pre style="margin:0 0 .5em"><a href="${h.route_path('repo_commit', repo_name=pull_request_source_repo.repo_name, commit_id=commit_id)}" style="${base.link_css()}">${h.short_id(commit_id)}</a></pre>
                         ${h.chop_at_smart(message, '\n', suffix_if_chopped='...')}
                     </li>
                 % endfor
             </ol>
         </td>
     </tr>
 </table>

rhodecode/templates/email_templates/pull_request_update.mako

@@ -1,164 +1,170 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
 ## EMAIL SUBJECT
 <%def name="subject()" filter="n,trim,whitespace_filter">
 <%
 data = {
     'updating_user': '@'+h.person(updating_user),
     'pr_id': pull_request.pull_request_id,
     'pr_title': pull_request.title,
 }
 %>
 
 ${_('{updating_user} updated pull request. !{pr_id}: "{pr_title}"').format(**data) |n}
 </%def>
 
 ## PLAINTEXT VERSION OF BODY
 <%def name="body_plaintext()" filter="n,trim">
 <%
 data = {
     'updating_user': h.person(updating_user),
     'pr_id': pull_request.pull_request_id,
     'pr_title': pull_request.title,
     'source_ref_type': pull_request.source_ref_parts.type,
     'source_ref_name': pull_request.source_ref_parts.name,
     'target_ref_type': pull_request.target_ref_parts.type,
     'target_ref_name': pull_request.target_ref_parts.name,
     'repo_url': pull_request_source_repo_url,
     'source_repo': pull_request_source_repo.repo_name,
     'target_repo': pull_request_target_repo.repo_name,
     'source_repo_url': pull_request_source_repo_url,
     'target_repo_url': pull_request_target_repo_url,
 }
 %>
 
 * ${_('Pull Request link')}: ${pull_request_url}
 
 * ${h.literal(_('Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}').format(**data))}
 
 * ${_('Title')}: ${pull_request.title}
 
 * ${_('Description')}:
 
 ${pull_request.description | trim}
 
 * Changed commits:
 
  - Added: ${len(added_commits)}
  - Removed: ${len(removed_commits)}
 
 * Changed files:
 
 %if not changed_files:
  No file changes found
 %else:
 %for file_name in added_files:
  - A `${file_name}`
 %endfor
 %for file_name in modified_files:
  - M `${file_name}`
 %endfor
 %for file_name in removed_files:
  - R `${file_name}`
 %endfor
 %endif
 
 ---
 ${self.plaintext_footer()}
 </%def>
 <%
 data = {
     'updating_user': h.person(updating_user),
     'pr_id': pull_request.pull_request_id,
     'pr_title': pull_request.title,
     'source_ref_type': pull_request.source_ref_parts.type,
     'source_ref_name': pull_request.source_ref_parts.name,
     'target_ref_type': pull_request.target_ref_parts.type,
     'target_ref_name': pull_request.target_ref_parts.name,
     'repo_url': pull_request_source_repo_url,
     'source_repo': pull_request_source_repo.repo_name,
     'target_repo': pull_request_target_repo.repo_name,
     'source_repo_url': h.link_to(pull_request_source_repo.repo_name, pull_request_source_repo_url),
     '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" style="margin-bottom: 4px">
                 <span style="color:#7E7F7F">@${h.person(updating_user.username)}</span>
                 ${_('updated')}
                 <a href="${pull_request_url}" style="${base.link_css()}">
                 ${_('pull request.').format(**data) }
                 </a>
             </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>
         <td style="width: 130px"></td>
         <td></td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;">${_('Pull request')}:</td>
         <td>
             <a href="${pull_request_url}" style="${base.link_css()}">
             !${pull_request.pull_request_id}
             </a>
         </td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;line-height:20px;">${_('Commit Flow')}:</td>
         <td style="line-height:20px;">
             <code>${'{}:{}'.format(data['source_ref_type'], pull_request.source_ref_parts.name)}</code> ${_('of')} ${data['source_repo_url']}
             &rarr;
             <code>${'{}:{}'.format(data['target_ref_type'], pull_request.target_ref_parts.name)}</code> ${_('of')}  ${data['target_repo_url']}
         </td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;">${_('Description')}:</td>
         <td style="white-space:pre-wrap"><code>${pull_request.description | trim}</code></td>
     </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>
 
 </table>

rhodecode/templates/email_templates/user_registration.mako

@@ -1,59 +1,60 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
 <%def name="subject()" filter="n,trim,whitespace_filter">
 RhodeCode new user registration: ${user.username}
 </%def>
 
 <%def name="body_plaintext()" filter="n,trim">
 
 A new user `${user.username}` has registered on ${h.format_date(date)}
 
 - Username: ${user.username}
 - Full Name: ${user.first_name} ${user.last_name}
 - Email: ${user.email}
 - Profile link: ${h.route_url('user_profile', username=user.username)}
 
 ---
 ${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;">
         <h4 style="margin: 0">
             <a href="${h.route_url('user_profile', username=user.username)}" style="${base.link_css()}">
                 ${_('New user {user} has registered on {date}').format(user=user.username, date=h.format_date(date))}
             </a>
         </h4>
     </td>
     </tr>
 </table>
-
+<div class="clear-both"></div>
+## main body
 <table style="text-align:left;vertical-align:middle;width: 100%">
     ## spacing def
     <tr>
         <td style="width: 130px"></td>
         <td></td>
     </tr>
     <tr>
         <td style="padding-right:20px;padding-top:20px;">${_('Username')}:</td>
         <td style="line-height:1;padding-top:20px;">${user.username}</td>
     </tr>
     <tr>
         <td style="padding-right:20px;">${_('Full Name')}:</td>
         <td>${user.first_name} ${user.last_name}</td>
     </tr>
     <tr>
         <td style="padding-right:20px;">${_('Email')}:</td>
         <td>${user.email}</td>
     </tr>
     <tr>
         <td style="padding-right:20px;">${_('Profile')}:</td>
         <td>
             <a href="${h.route_url('user_profile', username=user.username)}">${h.route_url('user_profile', username=user.username)}</a>
         </td>
     </tr>
 </table>

rhodecode/templates/files/files_add.mako

@@ -1,117 +1,116 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('{} Files Add').format(c.repo_name)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
 
     <div class="edit-file-title">
         <span class="title-heading">${_('Add new file')} @ <code>${h.show_id(c.commit)}</code></span>
         % if c.commit.branch:
         <span class="tag branchtag">
             <i class="icon-branch"></i> ${c.commit.branch}
         </span>
         % endif
     </div>
 
     ${h.secure_form(h.route_path('repo_files_create_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
     <div class="edit-file-fieldset">
         <div class="path-items">
             <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">
                 <input  class="file-name-input input-small" type="text" value="${request.GET.get('filename')}" name="filename" id="filename" placeholder="${_('Filename e.g example.py, or docs/readme.md')}">
             </li>
             </ul>
         </div>
 
     </div>
 
     <div class="table">
         <div>
             <div id="codeblock" class="codeblock">
                 <div class="editor-items">
                     <div class="editor-action active show-editor pull-left" onclick="fileEditor.showEditor(); return false">
                         ${_('Edit')}
                     </div>
 
                     <div class="editor-action show-preview pull-left"  onclick="fileEditor.showPreview(); return false">
                         ${_('Preview')}
                     </div>
 
                     <div class="pull-right">
                         ${h.dropdownmenu('line_wrap', 'off', [('on', _('Line wraps on')), ('off', _('line wraps off'))], extra_classes=['last-item'])}
                     </div>
                     <div class="pull-right">
                         ${h.dropdownmenu('set_mode','plain',[('plain', _('plain'))], enable_filter=True)}
                     </div>
                 </div>
 
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
                     <textarea id="editor" name="content" ></textarea>
                     <div id="editor_preview"></div>
                 </div>
             </div>
         </div>
     </div>
 
     <div class="edit-file-fieldset">
         <div class="fieldset">
             <div class="message">
                 <textarea id="commit" name="message"  placeholder="${c.default_message}"></textarea>
             </div>
         </div>
         <div class="pull-left">
             ${h.submit('commit_btn',_('Commit changes'), class_="btn btn-small btn-success")}
         </div>
     </div>
     ${h.end_form()}
 </div>
 
 <script type="text/javascript">
 
     $(document).ready(function () {
         var modes_select = $('#set_mode');
         var filename_selector = '#filename';
         fillCodeMirrorOptions(modes_select);
 
         fileEditor = new FileEditor('#editor');
 
         // on change of select field set mode
         setCodeMirrorModeFromSelect(modes_select, filename_selector, fileEditor.cm, null);
 
         // on entering the new filename set mode, from given extension
         setCodeMirrorModeFromInput(modes_select, filename_selector, fileEditor.cm, null);
 
         $('#filename').focus();
 
         var commit_id =  "${c.commit.raw_id}";
         var f_path = "${c.f_path}";
 
         checkFileHead($('#eform'), commit_id, f_path, 'create')
     });
 
 </script>
 </%def>

rhodecode/templates/files/files_browser.mako

@@ -1,84 +1,84 b''
 
 <div id="codeblock" class="browserblock">
     <div class="browser-header">
         <div class="browser-nav">
 
             <div class="info_box">
 
               <div class="info_box_elem previous">
                   <a id="prev_commit_link" data-commit-id="${c.prev_commit.raw_id}" class=" ${('disabled' if c.url_prev == '#' else '')}" href="${c.url_prev}" title="${_('Previous commit')}"><i class="icon-left"></i></a>
               </div>
 
               ${h.hidden('refs_filter')}
 
               <div class="info_box_elem next">
                   <a id="next_commit_link" data-commit-id="${c.next_commit.raw_id}" class=" ${('disabled' if c.url_next == '#' else '')}" href="${c.url_next}" title="${_('Next commit')}"><i class="icon-right"></i></a>
               </div>
             </div>
 
             % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
               <div>
                 <a class="btn btn-primary new-file" href="${h.route_path('repo_files_upload_file',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
                     ${_('Upload File')}
                 </a>
                 <a class="btn btn-primary new-file" href="${h.route_path('repo_files_add_file',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
                     ${_('Add File')}
                 </a>
               </div>
             % endif
 
             % if c.enable_downloads:
               <% at_path = '{}'.format(request.GET.get('at') or c.commit.raw_id[:6]) %>
               <div class="btn btn-default new-file">
                   % if c.f_path == '/':
                     <a href="${h.route_path('repo_archivefile',repo_name=c.repo_name, fname='{}.zip'.format(c.commit.raw_id))}">
                         ${_('Download full tree ZIP')}
                     </a>
                   % else:
                     <a href="${h.route_path('repo_archivefile',repo_name=c.repo_name, fname='{}.zip'.format(c.commit.raw_id), _query={'at_path':c.f_path})}">
                         ${_('Download this tree ZIP')}
                     </a>
                   % endif
               </div>
             % endif
 
             <div class="files-quick-filter">
                 <ul class="files-filter-box">
                     <li class="files-filter-box-path">
                         <i class="icon-search"></i>
                     </li>
                     <li class="files-filter-box-input">
                         <input onkeydown="NodeFilter.initFilter(event)" class="init" type="text" placeholder="Quick filter" name="filter" size="25" id="node_filter" autocomplete="off">
                     </li>
                 </ul>
             </div>
         </div>
 
     </div>
 
     ## file tree is computed from caches, and filled in
     <div id="file-tree">
     ${c.file_tree |n}
     </div>
 
     %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>
         </div>
         <div class="readme codeblock">
           <div class="readme_box">
             ${c.readme_data|n}
           </div>
         </div>
     </div>
     </div>
     %endif
 
 </div>

rhodecode/templates/files/files_browser_tree.mako

@@ -1,95 +1,98 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">
         <thead>
             <tr>
                 <th>${_('Name')}</th>
                 <th>${_('Size')}</th>
                 <th>${_('Modified')}</th>
                 <th>${_('Last Commit')}</th>
                 <th>${_('Author')}</th>
             </tr>
         </thead>
 
         <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>
 
         <% has_files = False %>
         % for cnt,node in enumerate(c.file):
         <% has_files = True %>
         <tr class="parity${(cnt % 2)}">
             <td class="td-componentname">
             % if node.is_submodule():
               <span class="submodule-dir">
                 % if node.url.startswith('http://') or node.url.startswith('https://'):
                   <a href="${node.url}">
                       <i class="icon-directory browser-dir"></i>${node.name}
                   </a>
                 % else:
                   <i class="icon-directory browser-dir"></i>${node.name}
                 % 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
             </td>
             %if node.is_file():
               <td class="td-size" data-attr-name="size">
                   % if c.full_load:
                     <span data-size="${node.size}">${h.format_byte_size_binary(node.size)}</span>
                   % else:
                     ${_('Loading ...')}
                   % endif
               </td>
               <td class="td-time" data-attr-name="modified_at">
                   % if c.full_load:
                     <span data-date="${node.last_commit.date}">${h.age_component(node.last_commit.date)}</span>
                   % endif
               </td>
               <td class="td-hash" data-attr-name="commit_id">
                   % if c.full_load:
                   <div class="tooltip-hovercard" data-hovercard-alt="${node.last_commit.message}" data-hovercard-url="${h.route_path('hovercard_repo_commit', repo_name=c.repo_name, commit_id=node.last_commit.raw_id)}">
                       <pre data-commit-id="${node.last_commit.raw_id}">r${node.last_commit.idx}:${node.last_commit.short_id}</pre>
                   </div>
                   % endif
               </td>
               <td class="td-user" data-attr-name="author">
                   % if c.full_load:
                   <span data-author="${node.last_commit.author}">${h.gravatar_with_user(request, node.last_commit.author, tooltip=True)|n}</span>
                   % endif
               </td>
             %else:
               <td></td>
               <td></td>
               <td></td>
               <td></td>
             %endif
           </tr>
         % endfor
 
         % if not has_files:
         <tr>
             <td colspan="5">
                 ##empty-dir mostly SVN
                 &nbsp;
             </td>
         </tr>
         % endif
 
         </tbody>
         <tbody id="tbody_filtered"></tbody>
     </table>
 </div>

rhodecode/templates/files/files_delete.mako

@@ -1,93 +1,92 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('{} Files Delete').format(c.repo_name)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
 
     <div class="edit-file-title">
         <span class="title-heading">${_('Delete file')} @ <code>${h.show_id(c.commit)}</code></span>
         % if c.commit.branch:
         <span class="tag branchtag">
             <i class="icon-branch"></i> ${c.commit.branch}
         </span>
         % endif
     </div>
 
     ${h.secure_form(h.route_path('repo_files_delete_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
     <div class="edit-file-fieldset">
         <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">
                 <input type="hidden" value="${c.f_path}" name="root_path">
                 <input  class="file-name-input input-small" type="text" value="${c.file.name}" name="filename" id="filename" disabled="disabled">
             </li>
         </div>
 
     </div>
 
     <div id="codeblock" class="codeblock delete-file-preview">
         <div class="code-body">
             %if c.file.is_binary:
                 ${_('Binary file (%s)') % c.file.mimetype}
             %else:
                 %if c.file.size < c.visual.cut_off_limit_file:
                     ${h.pygmentize(c.file,linenos=True,anchorlinenos=False,cssclass="code-highlight")}
                 %else:
                     ${_('File size {} is bigger then allowed limit {}. ').format(h.format_byte_size_binary(c.file.size), h.format_byte_size_binary(c.visual.cut_off_limit_file))} ${h.link_to(_('Show as raw'),
                     h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
                 %endif
             %endif
         </div>
     </div>
 
     <div class="edit-file-fieldset">
         <div class="fieldset">
             <div class="message">
                 <textarea id="commit" name="message"  placeholder="${c.default_message}"></textarea>
             </div>
         </div>
         <div class="pull-left">
             ${h.submit('commit_btn',_('Commit changes'),class_="btn btn-small btn-danger-action")}
         </div>
     </div>
     ${h.end_form()}
 </div>
 
 
 <script type="text/javascript">
 
     $(document).ready(function () {
 
         fileEditor = new FileEditor('#editor');
 
         var commit_id =  "${c.commit.raw_id}";
         var f_path = "${c.f_path}";
 
         checkFileHead($('#eform'), commit_id, f_path, 'delete');
     });
 
 </script>
 
 </%def>

rhodecode/templates/files/files_edit.mako

@@ -1,129 +1,128 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('{} Files Edit').format(c.repo_name)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
 
     <div class="edit-file-title">
         <span class="title-heading">${_('Edit file')} @ <code>${h.show_id(c.commit)}</code></span>
         % if c.commit.branch:
         <span class="tag branchtag">
             <i class="icon-branch"></i> ${c.commit.branch}
         </span>
         % endif
     </div>
 
     ${h.secure_form(h.route_path('repo_files_update_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
     <div class="edit-file-fieldset">
         <div class="path-items">
             <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">
                 <input type="hidden" value="${c.f_path}" name="root_path">
                 <input  class="file-name-input input-small" type="text" value="${c.file.name}" name="filename" id="filename" placeholder="${_('Filename e.g example.py, or docs/readme.md')}">
             </li>
             </ul>
         </div>
 
     </div>
 
     <div class="table">
         <div>
 
             <div id="codeblock" class="codeblock">
                 <div class="editor-items">
                     <div class="editor-action active show-editor pull-left" onclick="fileEditor.showEditor(); return false">
                         ${_('Edit')}
                     </div>
 
                     <div class="editor-action show-preview pull-left"  onclick="fileEditor.showPreview(); return false">
                         ${_('Preview')}
                     </div>
 
                     <div class="pull-right">
                         ${h.dropdownmenu('line_wrap', 'off', [('on', _('Line wraps on')), ('off', _('line wraps off')),])}
                     </div>
                     <div class="pull-right">
                         ${h.dropdownmenu('set_mode','plain',[('plain', _('plain'))],enable_filter=True)}
                     </div>
                 </div>
 
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
                     <textarea id="editor" name="content" >${h.escape(c.file.content)|n}</textarea>
                     <div id="editor_preview" ></div>
                 </div>
             </div>
         </div>
     </div>
 
     <div class="edit-file-fieldset">
         <div class="fieldset">
             <div class="message">
                 <textarea id="commit" name="message"  placeholder="${c.default_message}"></textarea>
             </div>
         </div>
         <div class="pull-left">
             ${h.submit('commit_btn',_('Commit changes'), class_="btn btn-small btn-success")}
         </div>
     </div>
     ${h.end_form()}
 </div>
 
 <script type="text/javascript">
 
 $(document).ready(function() {
     var modes_select = $('#set_mode');
     var filename_selector = '#filename';
     fillCodeMirrorOptions(modes_select);
 
     fileEditor = new FileEditor('#editor');
 
     // try to detect the mode based on the file we edit
     var detected_mode = detectCodeMirrorMode("${c.file.name}", "${c.file.mimetype}");
 
     if (detected_mode) {
         setCodeMirrorMode(fileEditor.cm, detected_mode);
 
         var mimetype = $(modes_select).find("option[mode={0}]".format(detected_mode)).val();
         $(modes_select).select2("val", mimetype).trigger('change');
     }
 
     // on change of select field set mode
     setCodeMirrorModeFromSelect(modes_select, filename_selector, fileEditor.cm, null);
 
     // on entering the new filename set mode, from given extension
     setCodeMirrorModeFromInput(modes_select, filename_selector, fileEditor.cm, null);
 
     var commit_id =  "${c.commit.raw_id}";
     var f_path = "${c.f_path}";
 
     checkFileHead($('#eform'), commit_id, f_path, 'edit')
 
 });
 
 
 </script>
 </%def>

rhodecode/templates/files/files_source.mako

@@ -1,179 +1,189 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">
             <div class="pull-left">
                 ## loads the history for a file
                 ${h.hidden('file_refs_filter')}
             </div>
 
             <div class="pull-right">
 
             ## Download
             % if c.lf_node:
               <a class="btn btn-default" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path, _query=dict(lf=1))}">
               ${_('Download largefile')}
               </a>
             % else:
               <a  class="btn btn-default" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
               ${_('Download file')}
               </a>
             % endif
 
             %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
               ## on branch head, can edit files
               %if c.on_branch_head and c.branch_or_raw_id:
                   ## 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
               ## not on head, forbid all
               % else:
                ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing files allowed only when on branch head commit'))}
                ${h.link_to(_('Delete'), '#Delete', class_="btn btn-default btn-danger disabled tooltip", title=_('Deleting files allowed only when on branch head commit'))}
               % endif
             %endif
 
           </div>
         </div>
         <div id="file_history_container"></div>
 
         </div>
     </div>
 
     <div class="codeblock">
       <div class=" codeblock-header">
         <div class="file-filename">
             <i class="icon-file"></i> ${c.file}
         </div>
 
         <div class="file-stats">
 
           <div class="stats-info">
             <span class="stats-first-item">
                 % if c.file_size_too_big:
                     0 ${(_('lines'))}
                 % else:
                     ${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])}
                 % endif
             </span>
 
             <span> | ${h.format_byte_size_binary(c.file.size)}</span>
             % if c.lf_node:
             <span title="${_('This file is a pointer to large binary file')}"> | ${_('LargeFile')} ${h.format_byte_size_binary(c.lf_node.size)} </span>
             % endif
             <span>
                 | ${c.file.mimetype}
             </span>
 
             % if not c.file_size_too_big:
             <span> |
                 ${h.get_lexer_for_filenode(c.file).__class__.__name__}
             </span>
             % endif
 
           </div>
         </div>
       </div>
 
       <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">
                 <a id="file_history_overview" href="#loadHistory">
                     ${_('History')}
                 </a>
                  |
                 %if c.annotate:
                   ${h.link_to(_('Source'), h.route_path('repo_files', repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
                 %else:
                   ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
                 %endif
                  | ${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>
           <div class="clear-fix"></div>
       </div>
 
       <div class="code-body clear-fix ">
         %if c.file.is_binary:
              <% rendered_binary = h.render_binary(c.repo_name, c.file)%>
              % if rendered_binary:
                  <div class="text-center">
                  ${rendered_binary}
                  </div>
              % else:
                  <div>
                   ${_('Binary file ({})').format(c.file.mimetype)}
                  </div>
              % endif
         %else:
             % if c.file_size_too_big:
                 ${_('File size {} is bigger then allowed limit {}. ').format(h.format_byte_size_binary(c.file.size), h.format_byte_size_binary(c.visual.cut_off_limit_file))} ${h.link_to(_('Show as raw'),
                 h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
             % else:
                 %if c.renderer and not c.annotate:
                     ## pick relative url based on renderer
                     <%
                         relative_urls = {
                             'raw': h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),
                             'standard': h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),
                         }
                     %>
                     ${h.render(c.file.content, renderer=c.renderer, relative_urls=relative_urls)}
                 %else:
                     <table class="cb codehilite">
                     %if c.annotate:
                       <% color_hasher = h.color_hasher() %>
                       %for annotation, lines in c.annotated_lines:
                         ${sourceblock.render_annotation_lines(annotation, lines, color_hasher)}
                       %endfor
                     %else:
                       %for line_num, tokens in enumerate(c.lines, 1):
                         ${sourceblock.render_line(line_num, tokens)}
                       %endfor
                     %endif
                     </table>
                 %endif
             % endif
         %endif
     </div>
 
     </div>
 
 <script type="text/javascript">
 % if request.GET.get('mark'):
 
 $(function(){
   $(".codehilite").mark(
       "${request.GET.get('mark')}",
           {
               "className": 'match',
               "accuracy": "complementary",
               "ignorePunctuation": ":._(){}[]!'+=".split(""),
               "each": function(el) {
                   // and also highlight lines !
                   $($(el).closest('tr')).find('td.cb-lineno').addClass('cb-line-selected');
               }
           }
   );
 
 });
 % endif
 </script>

rhodecode/templates/pullrequests/pullrequest_show.mako

@@ -1,922 +1,922 b''
 <%inherit file="/base/base.mako"/>
 <%namespace name="base" file="/base/base.mako"/>
 <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
 
 <%def name="title()">
     ${_('{} Pull Request !{}').format(c.repo_name, c.pull_request.pull_request_id)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
 
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='showpullrequest')}
 </%def>
 
 <%def name="main()">
 
 <script type="text/javascript">
     // TODO: marcink switch this to pyroutes
     AJAX_COMMENT_DELETE_URL = "${h.route_path('pullrequest_comment_delete',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id,comment_id='__COMMENT_ID__')}";
     templateContext.pull_request_data.pull_request_id = ${c.pull_request.pull_request_id};
 </script>
 
 <div class="box">
 
   <div class="box pr-summary">
 
     <div class="summary-details block-left">
         <div id="pr-title">
             % if c.pull_request.is_closed():
                 <span class="pr-title-closed-tag tag">${_('Closed')}</span>
             % endif
             <input class="pr-title-input large disabled" disabled="disabled" name="pullrequest_title" type="text" value="${c.pull_request.title}">
         </div>
         <div id="pr-title-edit" class="input" style="display: none;">
             <input class="pr-title-input large" id="pr-title-input" name="pullrequest_title" type="text" value="${c.pull_request.title}">
         </div>
 
     <% summary = lambda n:{False:'summary-short'}.get(n) %>
     <div class="pr-details-title">
         <div class="pull-left">
             <a href="${h.route_path('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request !{}').format(c.pull_request.pull_request_id)}</a>
             ${_('Created on')}
             <span class="tooltip" title="${_('Last updated on')} ${h.format_date(c.pull_request.updated_on)}">${h.format_date(c.pull_request.created_on)},</span>
             <span class="pr-details-title-author-pref">${_('by')}</span>
         </div>
 
         <div class="pull-left">
             ${self.gravatar_with_user(c.pull_request.author.email, 16, tooltip=True)}
         </div>
 
         %if c.allowed_to_update:
           <div class="pull-right">
               <div id="edit_pull_request" class="action_button pr-save" style="display: none;">${_('Update title & description')}</div>
               <div id="delete_pullrequest" class="action_button pr-save ${('' if c.allowed_to_delete else 'disabled' )}" style="display: none;">
                   % if c.allowed_to_delete:
                       ${h.secure_form(h.route_path('pullrequest_delete', repo_name=c.pull_request.target_repo.repo_name, pull_request_id=c.pull_request.pull_request_id), request=request)}
                           <input class="btn btn-link btn-danger no-margin" id="remove_${c.pull_request.pull_request_id}" name="remove_${c.pull_request.pull_request_id}"
                                  onclick="submitConfirm(event, this, _gettext('Confirm to delete this pull request'), _gettext('Delete'), '${'!{}'.format(c.pull_request.pull_request_id)}')"
                                  type="submit" value="${_('Delete pull request')}">
                       ${h.end_form()}
                   % else:
                     <span class="tooltip" title="${_('Not allowed to delete this pull request')}">${_('Delete pull request')}</span>
                   % endif
               </div>
               <div id="open_edit_pullrequest" class="action_button">${_('Edit')}</div>
               <div id="close_edit_pullrequest" class="action_button" style="display: none;">${_('Cancel')}</div>
           </div>
 
         %endif
     </div>
 
     <div id="pr-desc" class="input" title="${_('Rendered using {} renderer').format(c.renderer)}">
         ${h.render(c.pull_request.description, renderer=c.renderer, repo_name=c.repo_name)}
     </div>
 
     <div id="pr-desc-edit" class="input textarea" style="display: none;">
         <input id="pr-renderer-input" type="hidden" name="description_renderer" value="${c.visual.default_renderer}">
         ${dt.markup_form('pr-description-input', form_text=c.pull_request.description)}
     </div>
 
     <div id="summary" class="fields pr-details-content">
 
        ## review
        <div class="field">
         <div class="label-pr-detail">
             <label>${_('Review status')}:</label>
         </div>
         <div class="input">
           %if c.pull_request_review_status:
           <div class="tag status-tag-${c.pull_request_review_status}">
             <i class="icon-circle review-status-${c.pull_request_review_status}"></i>
             <span class="changeset-status-lbl">
               %if c.pull_request.is_closed():
                   ${_('Closed')},
               %endif
 
               ${h.commit_status_lbl(c.pull_request_review_status)}
 
             </span>
           </div>
             - ${_ungettext('calculated based on {} reviewer vote', 'calculated based on {} reviewers votes', len(c.pull_request_reviewers)).format(len(c.pull_request_reviewers))}
           %endif
         </div>
        </div>
 
        ## source
        <div class="field">
         <div class="label-pr-detail">
             <label>${_('Commit flow')}:</label>
         </div>
         <div class="input">
             <div class="pr-commit-flow">
                 ## Source
                 %if c.pull_request.source_ref_parts.type == 'branch':
                     <a href="${h.route_path('repo_commits', repo_name=c.pull_request.source_repo.repo_name, _query=dict(branch=c.pull_request.source_ref_parts.name))}"><code class="pr-source-info">${c.pull_request.source_ref_parts.type}:${c.pull_request.source_ref_parts.name}</code></a>
                 %else:
                     <code class="pr-source-info">${'{}:{}'.format(c.pull_request.source_ref_parts.type, c.pull_request.source_ref_parts.name)}</code>
                 %endif
                 ${_('of')} <a href="${h.route_path('repo_summary', repo_name=c.pull_request.source_repo.repo_name)}">${c.pull_request.source_repo.repo_name}</a>
                 &rarr;
                 ## Target
                 %if c.pull_request.target_ref_parts.type == 'branch':
                     <a href="${h.route_path('repo_commits', repo_name=c.pull_request.target_repo.repo_name, _query=dict(branch=c.pull_request.target_ref_parts.name))}"><code class="pr-target-info">${c.pull_request.target_ref_parts.type}:${c.pull_request.target_ref_parts.name}</code></a>
                 %else:
                     <code class="pr-target-info">${'{}:{}'.format(c.pull_request.target_ref_parts.type, c.pull_request.target_ref_parts.name)}</code>
                 %endif
 
                 ${_('of')} <a href="${h.route_path('repo_summary', repo_name=c.pull_request.target_repo.repo_name)}">${c.pull_request.target_repo.repo_name}</a>
 
                 <a class="source-details-action" href="#expand-source-details" onclick="return versionController.toggleElement(this, '.source-details')" data-toggle-on='<i class="icon-angle-down">more details</i>' data-toggle-off='<i class="icon-angle-up">less details</i>'>
                     <i class="icon-angle-down">more details</i>
                 </a>
 
             </div>
 
             <div class="source-details" style="display: none">
 
                 <ul>
 
                     ## common ancestor
                     <li>
                         ${_('Common ancestor')}:
                         % if c.ancestor_commit:
                             <a href="${h.route_path('repo_commit', repo_name=c.target_repo.repo_name, commit_id=c.ancestor_commit.raw_id)}">${h.show_id(c.ancestor_commit)}</a>
                         % else:
                             ${_('not available')}
                         % endif
                     </li>
 
                     ## pull url
                     <li>
                         %if h.is_hg(c.pull_request.source_repo):
                             <% clone_url = 'hg pull -r {} {}'.format(h.short_id(c.source_ref), c.pull_request.source_repo.clone_url()) %>
                         %elif h.is_git(c.pull_request.source_repo):
                             <% clone_url = 'git pull {} {}'.format(c.pull_request.source_repo.clone_url(), c.pull_request.source_ref_parts.name) %>
                         %endif
 
                         <span>${_('Pull changes from source')}</span>: <input type="text" class="input-monospace pr-pullinfo" value="${clone_url}" readonly="readonly">
                         <i class="tooltip icon-clipboard clipboard-action pull-right pr-pullinfo-copy" data-clipboard-text="${clone_url}" title="${_('Copy the pull url')}"></i>
                     </li>
 
                     ## Shadow repo
                     <li>
                         % if not c.pull_request.is_closed() and c.pull_request.shadow_merge_ref:
                             %if h.is_hg(c.pull_request.target_repo):
                                 <% clone_url = 'hg clone --update {} {} pull-request-{}'.format(c.pull_request.shadow_merge_ref.name, c.shadow_clone_url, c.pull_request.pull_request_id) %>
                             %elif h.is_git(c.pull_request.target_repo):
                                 <% clone_url = 'git clone --branch {} {} pull-request-{}'.format(c.pull_request.shadow_merge_ref.name, c.shadow_clone_url, c.pull_request.pull_request_id) %>
                             %endif
 
                             <span class="tooltip" title="${_('Clone repository in its merged state using shadow repository')}">${_('Clone from shadow repository')}</span>: <input type="text" class="input-monospace pr-mergeinfo" value="${clone_url}" readonly="readonly">
                             <i class="tooltip icon-clipboard clipboard-action pull-right pr-mergeinfo-copy" data-clipboard-text="${clone_url}" title="${_('Copy the clone url')}"></i>
 
                         % else:
                             <div class="">
                                 ${_('Shadow repository data not available')}.
                             </div>
                         % endif
                     </li>
 
                 </ul>
 
             </div>
 
         </div>
 
        </div>
 
        ## versions
        <div class="field">
            <div class="label-pr-detail">
                <label>${_('Versions')}:</label>
            </div>
 
            <% outdated_comm_count_ver = len(c.inline_versions[None]['outdated']) %>
            <% general_outdated_comm_count_ver = len(c.comment_versions[None]['outdated']) %>
 
            <div class="pr-versions">
            % if c.show_version_changes:
                <% outdated_comm_count_ver = len(c.inline_versions[c.at_version_num]['outdated']) %>
                <% general_outdated_comm_count_ver = len(c.comment_versions[c.at_version_num]['outdated']) %>
                ${_ungettext('{} version available for this pull request, ', '{} versions available for this pull request, ', len(c.versions)).format(len(c.versions))}
                <a id="show-pr-versions" onclick="return versionController.toggleVersionView(this)" href="#show-pr-versions"
                     data-toggle-on="${_('show versions')}."
                     data-toggle-off="${_('hide versions')}.">
                     ${_('show versions')}.
                </a>
                <table>
                    ## SHOW ALL VERSIONS OF PR
                    <% ver_pr = None %>
 
                    % for data in reversed(list(enumerate(c.versions, 1))):
                        <% ver_pos = data[0] %>
                        <% ver = data[1] %>
                        <% ver_pr = ver.pull_request_version_id %>
                        <% display_row = '' if c.at_version and (c.at_version_num == ver_pr or c.from_version_num == ver_pr) else 'none' %>
 
                        <tr class="version-pr" style="display: ${display_row}">
                            <td>
                                 <code>
                                     <a href="${request.current_route_path(_query=dict(version=ver_pr or 'latest'))}">v${ver_pos}</a>
                                 </code>
                            </td>
                            <td>
                                <input ${('checked="checked"' if c.from_version_num == ver_pr else '')} class="compare-radio-button" type="radio" name="ver_source" value="${ver_pr or 'latest'}" data-ver-pos="${ver_pos}"/>
                                <input ${('checked="checked"' if c.at_version_num == ver_pr else '')} class="compare-radio-button" type="radio" name="ver_target" value="${ver_pr or 'latest'}" data-ver-pos="${ver_pos}"/>
                            </td>
                            <td>
                             <% review_status = c.review_versions[ver_pr].status if ver_pr in c.review_versions else 'not_reviewed' %>
                             <i class="tooltip icon-circle review-status-${review_status}" title="${_('Your review status at this version')}"></i>
 
                            </td>
                            <td>
                                % if c.at_version_num != ver_pr:
                                 <i class="tooltip icon-comment" title="${_('Comments from pull request version v{0}').format(ver_pos)}"></i>
                                 <code>
                                    General:${len(c.comment_versions[ver_pr]['at'])} / Inline:${len(c.inline_versions[ver_pr]['at'])}
                                 </code>
                                % endif
                            </td>
                            <td>
                                ##<code>${ver.source_ref_parts.commit_id[:6]}</code>
                            </td>
                            <td>
                                <code>${h.age_component(ver.updated_on, time_is_local=True, tooltip=False)}</code>
                            </td>
                        </tr>
                    % endfor
 
                    <tr>
                        <td colspan="6">
                            <button id="show-version-diff" onclick="return versionController.showVersionDiff()" class="btn btn-sm" style="display: none"
                                    data-label-text-locked="${_('select versions to show changes')}"
                                    data-label-text-diff="${_('show changes between versions')}"
                                    data-label-text-show="${_('show pull request for this version')}"
                            >
                                ${_('select versions to show changes')}
                            </button>
                        </td>
                    </tr>
                </table>
            % else:
                <div>
                ${_('Pull request versions not available')}.
                </div>
            % endif
            </div>
        </div>
 
     </div>
 
   </div>
 
     ## REVIEW RULES
     <div id="review_rules" style="display: none" class="reviewers-title block-right">
         <div class="pr-details-title">
             ${_('Reviewer rules')}
           %if c.allowed_to_update:
             <span id="close_edit_reviewers" class="block-right action_button last-item" style="display: none;">${_('Close')}</span>
           %endif
         </div>
         <div class="pr-reviewer-rules">
             ## review rules will be appended here, by default reviewers logic
         </div>
         <input id="review_data" type="hidden" name="review_data" value="">
     </div>
 
     ## REVIEWERS
     <div class="reviewers-title first-panel block-right">
       <div class="pr-details-title">
           ${_('Pull request reviewers')}
           %if c.allowed_to_update:
             <span id="open_edit_reviewers" class="block-right action_button last-item">${_('Edit')}</span>
           %endif
       </div>
     </div>
     <div id="reviewers" class="block-right pr-details-content reviewers">
 
         ## members redering block
         <input type="hidden" name="__start__" value="review_members:sequence">
         <ul id="review_members" class="group_members">
 
         % for review_obj, member, reasons, mandatory, status in c.pull_request_reviewers:
             <script>
                 var member = ${h.json.dumps(h.reviewer_as_json(member, reasons=reasons, mandatory=mandatory, user_group=review_obj.rule_user_group_data()))|n};
                 var status = "${(status[0][1].status if status else 'not_reviewed')}";
                 var status_lbl = "${h.commit_status_lbl(status[0][1].status if status else 'not_reviewed')}";
                 var allowed_to_update = ${h.json.dumps(c.allowed_to_update)};
 
                 var entry = renderTemplate('reviewMemberEntry', {
                     'member': member,
                     'mandatory': member.mandatory,
                     'reasons': member.reasons,
                     'allowed_to_update': allowed_to_update,
                     'review_status': status,
                     'review_status_label': status_lbl,
                     'user_group': member.user_group,
                     'create': false
                 });
                 $('#review_members').append(entry)
             </script>
 
         % endfor
 
         </ul>
 
         <input type="hidden" name="__end__" value="review_members:sequence">
         ## end members redering block
 
         %if not c.pull_request.is_closed():
             <div id="add_reviewer" class="ac" style="display: none;">
             %if c.allowed_to_update:
                 % if not c.forbid_adding_reviewers:
                     <div id="add_reviewer_input" class="reviewer_ac">
                        ${h.text('user', class_='ac-input', placeholder=_('Add reviewer or reviewer group'))}
                        <div id="reviewers_container"></div>
                     </div>
                 % endif
                 <div class="pull-right">
                     <button id="update_pull_request" class="btn btn-small no-margin">${_('Save Changes')}</button>
                 </div>
             %endif
             </div>
         %endif
     </div>
 
     ## TODOs will be listed here
     <div class="reviewers-title block-right">
       <div class="pr-details-title">
           ## Only show unresolved, that is only what matters
           TODO Comments - ${len(c.unresolved_comments)} / ${(len(c.unresolved_comments) + len(c.resolved_comments))}
 
           % if not c.at_version:
               % if c.resolved_comments:
                   <span class="block-right action_button last-item noselect" onclick="$('.unresolved-todo-text').toggle(); return versionController.toggleElement(this, '.unresolved-todo');" data-toggle-on="Show resolved" data-toggle-off="Hide resolved">Show resolved</span>
               % else:
                   <span class="block-right last-item noselect">Show resolved</span>
               % endif
           % endif
       </div>
     </div>
     <div class="block-right pr-details-content reviewers">
 
         <table class="todo-table">
               <%
                 def sorter(entry):
                     user_id = entry.author.user_id
                     resolved = '1' if entry.resolved else '0'
                     if user_id == c.rhodecode_user.user_id:
                         # own comments first
                         user_id = 0
                     return '{}_{}_{}'.format(resolved, user_id, str(entry.comment_id).zfill(100))
               %>
 
           % if c.at_version:
               <tr>
                 <td class="unresolved-todo-text">${_('unresolved TODOs unavailable in this view')}.</td>
               </tr>
           % else:
               % for todo_comment in sorted(c.unresolved_comments + c.resolved_comments, key=sorter):
                   <% resolved = todo_comment.resolved %>
                   % if inline:
                       <% outdated_at_ver = todo_comment.outdated_at_version(getattr(c, 'at_version_num', None)) %>
                   % else:
                       <% outdated_at_ver = todo_comment.older_than_version(getattr(c, 'at_version_num', None)) %>
                   % endif
 
                   <tr ${('class="unresolved-todo" style="display: none"' if resolved else '') |n}>
 
                       <td class="td-todo-number">
                           % if resolved:
                               <a class="permalink todo-resolved tooltip" title="${_('Resolved by comment #{}').format(todo_comment.resolved.comment_id)}" href="#comment-${todo_comment.comment_id}" onclick="return Rhodecode.comments.scrollToComment($('#comment-${todo_comment.comment_id}'), 0, ${h.json.dumps(outdated_at_ver)})">
                               <i class="icon-flag-filled"></i> ${todo_comment.comment_id}</a>
                           % else:
                               <a class="permalink" href="#comment-${todo_comment.comment_id}" onclick="return Rhodecode.comments.scrollToComment($('#comment-${todo_comment.comment_id}'), 0, ${h.json.dumps(outdated_at_ver)})">
                               <i class="icon-flag-filled"></i> ${todo_comment.comment_id}</a>
                           % endif
                       </td>
                       <td class="td-todo-gravatar">
                           ${base.gravatar(todo_comment.author.email, 16, user=todo_comment.author, tooltip=True, extra_class=['no-margin'])}
                       </td>
                       <td class="todo-comment-text-wrapper">
                           <div class="todo-comment-text">
                             <code>${h.chop_at_smart(todo_comment.text, '\n', suffix_if_chopped='...')}</code>
                           </div>
                       </td>
 
                   </tr>
               % endfor
 
               % if len(c.unresolved_comments) == 0:
                   <tr>
                     <td class="unresolved-todo-text">${_('No unresolved TODOs')}.</td>
                   </tr>
               % endif
 
           % endif
 
         </table>
 
     </div>
   </div>
 
   </div>
 
   <div class="box">
 
   % if c.state_progressing:
 
     <h2 style="text-align: center">
         ${_('Cannot show diff when pull request state is changing. Current progress state')}: <span class="tag tag-merge-state-${c.pull_request.state}">${c.pull_request.state}</span>
 
         % if c.is_super_admin:
         <br/>
         If you think this is an error try <a href="${h.current_route_path(request, force_state='created')}">forced state reset</a> to <span class="tag tag-merge-state-created">created</span> state.
         % endif
     </h2>
 
   % else:
 
       ## Diffs rendered here
       <div class="table" >
           <div id="changeset_compare_view_content">
               ##CS
               % if c.missing_requirements:
                 <div class="box">
                   <div class="alert alert-warning">
                     <div>
                       <strong>${_('Missing requirements:')}</strong>
                       ${_('These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled.')}
                     </div>
                   </div>
                 </div>
               % elif c.missing_commits:
                 <div class="box">
                   <div class="alert alert-warning">
                     <div>
                       <strong>${_('Missing commits')}:</strong>
                         ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}
                         ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}
                         ${_('Consider doing a {force_refresh_url} in case you think this is an error.').format(force_refresh_url=h.link_to('force refresh', h.current_route_path(request, force_refresh='1')))|n}
                     </div>
                   </div>
                 </div>
               % elif c.pr_merge_source_commit.changed:
                 <div class="box">
                   <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>
                 </div>
               % endif
 
               <div class="compare_view_commits_title">
                   % if not c.compare_mode:
 
                     % if c.at_version_pos:
                         <h4>
                         ${_('Showing changes at v%d, commenting is disabled.') % c.at_version_pos}
                         </h4>
                     % endif
 
                     <div class="pull-left">
                       <div class="btn-group">
                           <a class="${('collapsed' if c.collapse_all_commits else '')}" href="#expand-commits" onclick="toggleCommitExpand(this); return false" data-toggle-commits-cnt=${len(c.commit_ranges)} >
                               % if c.collapse_all_commits:
                                 <i class="icon-plus-squared-alt icon-no-margin"></i>
                                 ${_ungettext('Expand {} commit', 'Expand {} commits', len(c.commit_ranges)).format(len(c.commit_ranges))}
                               % else:
                                 <i class="icon-minus-squared-alt icon-no-margin"></i>
                                 ${_ungettext('Collapse {} commit', 'Collapse {} commits', len(c.commit_ranges)).format(len(c.commit_ranges))}
                               % endif
                           </a>
                       </div>
                     </div>
 
                     <div class="pull-right">
                         % if c.allowed_to_update and not c.pull_request.is_closed():
 
                             <div class="btn-group btn-group-actions">
                                 <a id="update_commits" class="btn btn-primary no-margin" onclick="updateController.updateCommits(this); return false">
                                     ${_('Update commits')}
                                 </a>
 
                                 <a id="update_commits_switcher" class="tooltip btn btn-primary" style="margin-left: -1px" data-toggle="dropdown" aria-pressed="false" role="button" title="${_('more update options')}">
                                     <i class="icon-down"></i>
                                 </a>
 
                                 <div class="btn-action-switcher-container" id="update-commits-switcher">
                                     <ul class="btn-action-switcher" role="menu">
                                         <li>
                                             <a href="#forceUpdate" onclick="updateController.forceUpdateCommits(this); return false">
                                                 ${_('Force update commits')}
                                             </a>
                                             <div class="action-help-block">
                                                ${_('Update commits and force refresh this pull request.')}
                                             </div>
                                         </li>
                                     </ul>
                                 </div>
                             </div>
 
                         % else:
                           <a class="tooltip btn disabled pull-right" disabled="disabled" title="${_('Update is disabled for current view')}">${_('Update commits')}</a>
                         % endif
 
                     </div>
                   % endif
               </div>
 
               % if not c.missing_commits:
                 % if c.compare_mode:
                     % if c.at_version:
                     <h4>
                         ${_('Commits and changes between v{ver_from} and {ver_to} of this pull request, commenting is disabled').format(ver_from=c.from_version_pos, ver_to=c.at_version_pos if c.at_version_pos else 'latest')}:
                     </h4>
 
                     <div class="subtitle-compare">
                         ${_('commits added: {}, removed: {}').format(len(c.commit_changes_summary.added), len(c.commit_changes_summary.removed))}
                     </div>
 
                     <div class="container">
                         <table class="rctable compare_view_commits">
                             <tr>
                                 <th></th>
                                 <th>${_('Time')}</th>
                                 <th>${_('Author')}</th>
                                 <th>${_('Commit')}</th>
                                 <th></th>
                                 <th>${_('Description')}</th>
                             </tr>
 
                             % for c_type, commit in c.commit_changes:
                               % if c_type in ['a', 'r']:
                                 <%
                                     if c_type == 'a':
                                         cc_title = _('Commit added in displayed changes')
                                     elif c_type == 'r':
                                         cc_title = _('Commit removed in displayed changes')
                                     else:
                                         cc_title = ''
                                 %>
                                 <tr id="row-${commit.raw_id}" commit_id="${commit.raw_id}" class="compare_select">
                                 <td>
                                     <div class="commit-change-indicator color-${c_type}-border">
                                       <div class="commit-change-content color-${c_type} tooltip" title="${h.tooltip(cc_title)}">
                                         ${c_type.upper()}
                                       </div>
                                     </div>
                                 </td>
                                 <td class="td-time">
                                     ${h.age_component(commit.date)}
                                 </td>
                                 <td class="td-user">
                                     ${base.gravatar_with_user(commit.author, 16, tooltip=True)}
                                 </td>
                                 <td class="td-hash">
                                     <code>
                                         <a href="${h.route_path('repo_commit', repo_name=c.target_repo.repo_name, commit_id=commit.raw_id)}">
                                             r${commit.idx}:${h.short_id(commit.raw_id)}
                                         </a>
                                         ${h.hidden('revisions', commit.raw_id)}
                                     </code>
                                 </td>
                                 <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_( 'Expand commit message')}" onclick="commitsController.expandCommit(this); return false">
                                     <i class="icon-expand-linked"></i>
                                 </td>
                                 <td class="mid td-description">
                                     <div class="log-container truncate-wrap">
                                         <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${h.urlify_commit_message(commit.message, c.repo_name)}</div>
                                     </div>
                                 </td>
                             </tr>
                               % endif
                             % endfor
                         </table>
                     </div>
 
                     % endif
 
                 % else:
                     <%include file="/compare/compare_commits.mako" />
                 % endif
 
                 <div class="cs_files">
                     <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
                     % if c.at_version:
                         <% c.inline_cnt = len(c.inline_versions[c.at_version_num]['display']) %>
                         <% c.comments = c.comment_versions[c.at_version_num]['display'] %>
                     % else:
                         <% c.inline_cnt = len(c.inline_versions[c.at_version_num]['until']) %>
                         <% c.comments = c.comment_versions[c.at_version_num]['until'] %>
                     % endif
 
                     <%
                         pr_menu_data = {
                             'outdated_comm_count_ver': outdated_comm_count_ver
                         }
                     %>
 
                     ${cbdiffs.render_diffset_menu(c.diffset, range_diff_on=c.range_diff_on)}
 
                     % if c.range_diff_on:
                         % for commit in c.commit_ranges:
                             ${cbdiffs.render_diffset(
                               c.changes[commit.raw_id],
                               commit=commit, use_comments=True,
                               collapse_when_files_over=5,
                               disable_new_comments=True,
                               deleted_files_comments=c.deleted_files_comments,
                               inline_comments=c.inline_comments,
                               pull_request_menu=pr_menu_data, show_todos=False)}
                         % endfor
                     % else:
                         ${cbdiffs.render_diffset(
                           c.diffset, use_comments=True,
                           collapse_when_files_over=30,
                           disable_new_comments=not c.allowed_to_comment,
                           deleted_files_comments=c.deleted_files_comments,
                           inline_comments=c.inline_comments,
                           pull_request_menu=pr_menu_data, show_todos=False)}
                     % endif
 
                 </div>
               % else:
                   ## skipping commits we need to clear the view for missing commits
                   <div style="clear:both;"></div>
               % endif
 
           </div>
       </div>
 
       ## template for inline comment form
       <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
 
       ## comments heading with count
       <div class="comments-heading">
         <i class="icon-comment"></i>
         ${_('Comments')} ${len(c.comments)}
       </div>
 
       ## render general comments
       <div id="comment-tr-show">
         % if general_outdated_comm_count_ver:
         <div class="info-box">
             % if general_outdated_comm_count_ver == 1:
                 ${_('there is {num} general comment from older versions').format(num=general_outdated_comm_count_ver)},
                 <a href="#show-hidden-comments" onclick="$('.comment-general.comment-outdated').show(); $(this).parent().hide(); return false;">${_('show it')}</a>
             % else:
                 ${_('there are {num} general comments from older versions').format(num=general_outdated_comm_count_ver)},
                 <a href="#show-hidden-comments" onclick="$('.comment-general.comment-outdated').show(); $(this).parent().hide(); return false;">${_('show them')}</a>
             % endif
         </div>
         % endif
       </div>
 
       ${comment.generate_comments(c.comments, include_pull_request=True, is_pull_request=True)}
 
       % if not c.pull_request.is_closed():
         ## main comment form and it status
         ${comment.comments(h.route_path('pullrequest_comment_create', repo_name=c.repo_name,
                                         pull_request_id=c.pull_request.pull_request_id),
                            c.pull_request_review_status,
                            is_pull_request=True, change_status=c.allowed_to_change_status)}
 
         ## merge status, and merge action
         <div class="pull-request-merge">
             <%include file="/pullrequests/pullrequest_merge_checks.mako"/>
         </div>
 
       %endif
 
    % endif
   </div>
 
   <script type="text/javascript">
 
       versionController = new VersionController();
       versionController.init();
 
       reviewersController = new ReviewersController();
       commitsController = new CommitsController();
 
       updateController = new UpdatePrController();
 
       $(function () {
 
           // custom code mirror
           var codeMirrorInstance = $('#pr-description-input').get(0).MarkupForm.cm;
 
           var PRDetails = {
               editButton: $('#open_edit_pullrequest'),
               closeButton: $('#close_edit_pullrequest'),
               deleteButton: $('#delete_pullrequest'),
               viewFields: $('#pr-desc, #pr-title'),
               editFields: $('#pr-desc-edit, #pr-title-edit, .pr-save'),
 
               init: function () {
                   var that = this;
                   this.editButton.on('click', function (e) {
                       that.edit();
                   });
                   this.closeButton.on('click', function (e) {
                       that.view();
                   });
               },
 
               edit: function (event) {
                   this.viewFields.hide();
                   this.editButton.hide();
                   this.deleteButton.hide();
                   this.closeButton.show();
                   this.editFields.show();
                   codeMirrorInstance.refresh();
               },
 
               view: function (event) {
                   this.editButton.show();
                   this.deleteButton.show();
                   this.editFields.hide();
                   this.closeButton.hide();
                   this.viewFields.show();
               }
           };
 
           var ReviewersPanel = {
               editButton: $('#open_edit_reviewers'),
               closeButton: $('#close_edit_reviewers'),
               addButton: $('#add_reviewer'),
               removeButtons: $('.reviewer_member_remove,.reviewer_member_mandatory_remove'),
 
               init: function () {
                   var self = this;
                   this.editButton.on('click', function (e) {
                       self.edit();
                   });
                   this.closeButton.on('click', function (e) {
                       self.close();
                   });
               },
 
               edit: function (event) {
                   this.editButton.hide();
                   this.closeButton.show();
                   this.addButton.show();
                   this.removeButtons.css('visibility', 'visible');
                   // review rules
                   reviewersController.loadReviewRules(
                       ${c.pull_request.reviewer_data_json | n});
               },
 
               close: function (event) {
                   this.editButton.show();
                   this.closeButton.hide();
                   this.addButton.hide();
                   this.removeButtons.css('visibility', 'hidden');
                   // hide review rules
                   reviewersController.hideReviewRules()
               }
           };
 
           PRDetails.init();
           ReviewersPanel.init();
 
           showOutdated = function (self) {
               $('.comment-inline.comment-outdated').show();
               $('.filediff-outdated').show();
               $('.showOutdatedComments').hide();
               $('.hideOutdatedComments').show();
           };
 
           hideOutdated = function (self) {
               $('.comment-inline.comment-outdated').hide();
               $('.filediff-outdated').hide();
               $('.hideOutdatedComments').hide();
               $('.showOutdatedComments').show();
           };
 
           refreshMergeChecks = function () {
               var loadUrl = "${request.current_route_path(_query=dict(merge_checks=1))}";
               $('.pull-request-merge').css('opacity', 0.3);
               $('.action-buttons-extra').css('opacity', 0.3);
 
               $('.pull-request-merge').load(
                       loadUrl, function () {
                           $('.pull-request-merge').css('opacity', 1);
 
                           $('.action-buttons-extra').css('opacity', 1);
                       }
               );
           };
 
           closePullRequest = function (status) {
               if (!confirm(_gettext('Are you sure to close this pull request without merging?'))) {
                   return false;
               }
               // inject closing flag
               $('.action-buttons-extra').append('<input type="hidden" class="close-pr-input" id="close_pull_request" value="1">');
               $(generalCommentForm.statusChange).select2("val", status).trigger('change');
               $(generalCommentForm.submitForm).submit();
           };
 
           $('#show-outdated-comments').on('click', function (e) {
               var button = $(this);
               var outdated = $('.comment-outdated');
 
               if (button.html() === "(Show)") {
                   button.html("(Hide)");
                   outdated.show();
               } else {
                   button.html("(Show)");
                   outdated.hide();
               }
           });
 
           $('.show-inline-comments').on('change', function (e) {
               var show = 'none';
               var target = e.currentTarget;
               if (target.checked) {
                   show = ''
               }
               var boxid = $(target).attr('id_for');
               var comments = $('#{0} .inline-comments'.format(boxid));
               var fn_display = function (idx) {
                   $(this).css('display', show);
               };
               $(comments).each(fn_display);
               var btns = $('#{0} .inline-comments-button'.format(boxid));
               $(btns).each(fn_display);
           });
 
           $('#merge_pull_request_form').submit(function () {
               if (!$('#merge_pull_request').attr('disabled')) {
                   $('#merge_pull_request').attr('disabled', 'disabled');
               }
               return true;
           });
 
           $('#edit_pull_request').on('click', function (e) {
               var title = $('#pr-title-input').val();
               var description = codeMirrorInstance.getValue();
               var renderer = $('#pr-renderer-input').val();
               editPullRequest(
                       "${c.repo_name}", "${c.pull_request.pull_request_id}",
                       title, description, renderer);
           });
 
           $('#update_pull_request').on('click', function (e) {
               $(this).attr('disabled', 'disabled');
               $(this).addClass('disabled');
               $(this).html(_gettext('Saving...'));
               reviewersController.updateReviewers(
                       "${c.repo_name}", "${c.pull_request.pull_request_id}");
           });
 
 
           // fixing issue with caches on firefox
           $('#update_commits').removeAttr("disabled");
 
           $('.show-inline-comments').on('click', function (e) {
               var boxid = $(this).attr('data-comment-id');
               var button = $(this);
 
               if (button.hasClass("comments-visible")) {
                   $('#{0} .inline-comments'.format(boxid)).each(function (index) {
                       $(this).hide();
                   });
                   button.removeClass("comments-visible");
               } else {
                   $('#{0} .inline-comments'.format(boxid)).each(function (index) {
                       $(this).show();
                   });
                   button.addClass("comments-visible");
               }
           });
 
           // register submit callback on commentForm form to track TODOs
           window.commentFormGlobalSubmitSuccessCallback = function () {
               refreshMergeChecks();
           };
 
           ReviewerAutoComplete('#user');
 
       })
 
   </script>
 
 </div>
 
 </%def>

rhodecode/templates/search/search_content.mako

@@ -1,165 +1,165 b''
 <%namespace name="search" file="/search/search.mako"/>
 
 <%def name="highlight_text_file(has_matched_content, file_content, lexer, html_formatter, matching_lines, shown_matching_lines, url, use_hl_filter)">
 % if has_matched_content:
     ${h.code_highlight(file_content, lexer, html_formatter, use_hl_filter=use_hl_filter)|n}
 % else:
     ${_('No content matched')} <br/>
 % endif
 
 %if len(matching_lines) > shown_matching_lines:
 <a href="${url}">
   ${len(matching_lines) - shown_matching_lines} ${_('more matches in this file')}
 </a>
 %endif
 </%def>
 
 <div class="search-results">
 <% query_mark = c.searcher.query_to_mark(c.cur_query, 'content') %>
 
 %for entry in c.formatted_results:
 
   <%
     file_content = entry['content_highlight'] or entry['content']
     mimetype = entry.get('mimetype')
     filepath = entry.get('path')
     max_lines = h.safe_int(request.GET.get('max_lines', '10'))
     line_context = h.safe_int(request.GET.get('line_contenxt', '3'))
 
     match_file_url=h.route_path('repo_files',repo_name=entry['repository'], commit_id=entry.get('commit_id', 'tip'),f_path=entry['f_path'], _query={"mark": query_mark})
     terms = c.cur_query
 
     if c.searcher.is_es_6:
         # use empty terms so we default to markers usage
         total_lines, matching_lines = h.get_matching_line_offsets(file_content, terms=None)
     else:
         total_lines, matching_lines = h.get_matching_line_offsets(file_content, terms)
 
     shown_matching_lines = 0
     lines_of_interest = set()
     for line_number in matching_lines:
         if len(lines_of_interest) < max_lines:
             lines_of_interest |= set(range(
                 max(line_number - line_context, 0),
                 min(line_number + line_context, total_lines + 1)))
             shown_matching_lines += 1
     lexer = h.get_lexer_safe(mimetype=mimetype, filepath=filepath)
 
     html_formatter = h.SearchContentCodeHtmlFormatter(
         linenos=True,
         cssclass="code-highlight",
         url=match_file_url,
         query_terms=terms,
         only_line_numbers=lines_of_interest
     )
 
     has_matched_content = len(lines_of_interest) >= 1
 
   %>
   ## search results are additionally filtered, and this check is just a safe gate
   % if c.rhodecode_user.is_admin or h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(entry['repository'], 'search results content check'):
       <div class="codeblock">
         <h1>
           <% repo_type = entry.get('repo_type') or h.get_repo_type_by_name(entry.get('repository')) %>
           ${search.repo_icon(repo_type)}
           ${h.link_to(entry['repository'], h.route_path('repo_summary', repo_name=entry['repository']))}
         </h1>
 
         <div class="codeblock-header">
 
             <div class="file-filename">
                 <i class="icon-file"></i> ${entry['f_path'].split('/')[-1]}
             </div>
 
             <div class="file-stats">
                 <div class="stats-info">
                     <span class="stats-first-item">
                         ${entry.get('lines', 0.)} ${_ungettext('line', 'lines', entry.get('lines', 0.))}
                         (${len(matching_lines)} ${_ungettext('matched', 'matched', len(matching_lines))})
                     </span>
                     <span>
                         % if entry.get('size'):
                           | ${h.format_byte_size_binary(entry['size'])}
                         % endif
                     </span>
                     <span>
                         % if entry.get('mimetype'):
                           | ${entry.get('mimetype', "unknown mimetype")}
                         % endif
                     </span>
                 </div>
             </div>
         </div>
 
         <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">
 ##                     <a id="file_history_overview_full" href="${h.route_path('repo_commits_file',repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path',''))}">
 ##                        ${_('Show Full History')}
 ##                     </a>
 ##                     | ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated', repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
 ##                     | ${h.link_to(_('Raw'), h.route_path('repo_file_raw', repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
                 <div class="search-tags">
 
                     <% repo_group = entry.get('repository_group')%>
                     ## hiden if in repo group view
                     % if repo_group and not c.repo_group_name:
                     <span class="tag tag8">
                         ${search.repo_group_icon()}
                         <a href="${h.route_path('search_repo_group', repo_group_name=repo_group, _query={'q': c.cur_query})}">${_('Narrow to this repository group')}</a>
                     </span>
                     % endif
                     ## hiden if in repo view
                     % if not c.repo_name:
                     <span class="tag tag8">
                         ${search.repo_icon(repo_type)}
                         <a href="${h.route_path('search_repo', repo_name=entry.get('repo_name'), _query={'q': c.cur_query})}">${_('Narrow to this repository')}</a>
                     </span>
                     % endif
                 </div>
 
             </div>
             <div class="clear-fix"></div>
         </div>
 
 
         <div class="code-body search-code-body clear-fix">
             ${highlight_text_file(
                 has_matched_content=has_matched_content,
                 file_content=file_content,
                 lexer=lexer,
                 html_formatter=html_formatter,
                 matching_lines=matching_lines,
                 shown_matching_lines=shown_matching_lines,
                 url=match_file_url,
                 use_hl_filter=c.searcher.is_es_6
             )}
         </div>
 
       </div>
     % endif
 %endfor
 </div>
 %if c.cur_query and c.formatted_results:
 <div class="pagination-wh pagination-left" >
     ${c.formatted_results.render()}
 </div>
 %endif
 
 %if c.cur_query:
 <script type="text/javascript">
 $(function(){
   $(".search-code-body").mark(
       "${query_mark}",
           {
               "className": 'match',
               "accuracy": "complementary",
               "ignorePunctuation": ":._(){}[]!'+=".split("")
           }
   );
 })
 </script>
 %endif

rhodecode/templates/search/search_path.mako

@@ -1,53 +1,53 b''
 <%namespace name="search" file="/search/search.mako"/>
 
 % if c.formatted_results:
 
 <table class="rctable search-results">
     <tr>
         <th>${_('Repository')}</th>
         <th>
             <a href="${search.field_sort('file')}">${_('File')}</a>
         </th>
         <th>
             <a href="${search.field_sort('size')}">${_('Size')}</a>
         </th>
         <th>
             <a href="${search.field_sort('lines')}">${_('Lines')}</a>
         </th>
     </tr>
     %for entry in c.formatted_results:
         ## search results are additionally filtered, and this check is just a safe gate
         % if c.rhodecode_user.is_admin or h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(entry['repository'], 'search results path check'):
             <tr class="body">
                 <td class="td-componentname">
                     <% repo_type = entry.get('repo_type') or h.get_repo_type_by_name(entry.get('repository')) %>
                     ${search.repo_icon(repo_type)}
                     ${h.link_to(entry['repository'], h.route_path('repo_summary',repo_name=entry['repository']))}
                 </td>
                 <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'):
                       ${h.format_byte_size_binary(entry['size'])}
                     %endif
                 </td>
                 <td>
                     %if entry.get('lines'):
                       ${entry.get('lines', 0.)}
                     %endif
                 </td>
             </tr>
         % endif
     %endfor
 </table>
 
 %if c.cur_query:
 <div class="pagination-wh pagination-left">
     ${c.formatted_results.render()}
 </div>
 %endif
 
 % endif

rhodecode/templates/summary/summary.mako

@@ -1,118 +1,118 b''
 <%inherit file="/summary/summary_base.mako"/>
 
 <%namespace name="components" file="/summary/components.mako"/>
 
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='summary')}
 </%def>
 
 <%def name="main()">
 
 <div id="repo-summary" class="summary">
     ${components.summary_detail(breadcrumbs_links=self.breadcrumbs_links(), show_downloads=True)}
 </div><!--end repo-summary-->
 
 
 <div class="box">
         %if not c.repo_commits:
             <div class="empty-repo">
                 <div class="title">
                   <h3>${_('Quick start')}</h3>
                 </div>
                 <div class="clear-fix"></div>
             </div>
          %endif
         <div class="table">
             <div id="shortlog_data">
                 <%include file='summary_commits.mako'/>
             </div>
         </div>
 </div>
 
 %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>
     </div>
     <div class="readme codeblock">
       <div class="readme_box">
         ${c.readme_data|n}
       </div>
     </div>
 </div>
 </div>
 %endif
 
 <script type="text/javascript">
 $(document).ready(function(){
 
     var showCloneField = function(clone_url_format){
         $.each(['http', 'http_id', 'ssh'], function (idx, val) {
             if(val === clone_url_format){
                 $('#clone_option_' + val).show();
                 $('#clone_option').val(val)
             } else {
                 $('#clone_option_' + val).hide();
             }
         });
     };
     // default taken from session
     showCloneField(templateContext.session_attrs.clone_url_format);
 
     $('#clone_option').on('change', function(e) {
         var selected = $(this).val();
 
         storeUserSessionAttr('rc_user_session_attr.clone_url_format', selected);
         showCloneField(selected)
     });
 
     var initialCommitData = {
         id: null,
         text: 'tip',
         type: 'tag',
         raw_id: null,
         files_url: null
     };
 
     select2RefSwitcher('#download_options', initialCommitData);
 
     // on change of download options
     $('#download_options').on('change', function(e) {
         // format of Object {text: "v0.0.3", type: "tag", id: "rev"}
         var ext = '.zip';
         var selected_cs = e.added;
         var fname = e.added.raw_id + ext;
         var href = pyroutes.url('repo_archivefile', {'repo_name': templateContext.repo_name, 'fname':fname});
         // set new label
         $('#archive_link').html('{0}{1}'.format(escapeHtml(e.added.text), ext));
 
         // set new url to button,
         $('#archive_link').attr('href', href)
     });
 
 
     // calculate size of repository
     calculateSize = function () {
 
         var callback = function (data) {
             % if c.show_stats:
                 showRepoStats('lang_stats', data);
             % endif
         };
 
         showRepoSize('repo_size_container', templateContext.repo_name, templateContext.repo_landing_commit, callback);
 
     }
 
 })
 </script>
 
 </%def>

rhodecode/tests/lib/test_helpers.py

@@ -1,242 +1,241 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import copy
 import mock
 import pytest
 
 from rhodecode.lib import helpers
 from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.model.settings import IssueTrackerSettingsModel
 from rhodecode.tests import no_newline_id_generator
 
 
 @pytest.mark.parametrize('url, expected_url', [
     ('http://rc.com', '<a href="http://rc.com">http://rc.com</a>'),
     ('http://rc.com/test', '<a href="http://rc.com/test">http://rc.com/test</a>'),
     ('http://rc.com/!foo', '<a href="http://rc.com/!foo">http://rc.com/!foo</a>'),
     ('http://rc.com/&foo', '<a href="http://rc.com/&amp;foo">http://rc.com/&amp;foo</a>'),
     ('http://rc.com/?foo-1&bar=1', '<a href="http://rc.com/?foo-1&amp;bar=1">http://rc.com/?foo-1&amp;bar=1</a>'),
     ('http://rc.com?foo-1&bar=1', '<a href="http://rc.com?foo-1&amp;bar=1">http://rc.com?foo-1&amp;bar=1</a>'),
     ('http://rc.com/#foo', '<a href="http://rc.com/#foo">http://rc.com/#foo</a>'),
     ('http://rc.com/@foo', '<a href="http://rc.com/@foo">http://rc.com/@foo</a>'),
 ])
 def test_urlify_text(url, expected_url):
     assert helpers.urlify_text(url) == expected_url
 
 
 @pytest.mark.parametrize('repo_name, commit_id, path, expected_result', [
     # Simple case 1
     ('repo', 'commit', 'a/b',
      '<a href="/repo/files/commit/"><i class="icon-home"></i></a>'
      ' / '
      '<a href="/repo/files/commit/a">a</a>'
      ' / '
      'b'),
 
     # Simple case
     ('rX<X', 'cX<X', 'pX<X/aX<X/bX<X',
      '<a href="/rX%3CX/files/cX%3CX/"><i class="icon-home"></i></a>'
      ' / '
      '<a href="/rX%3CX/files/cX%3CX/pX%3CX">pX&lt;X</a>'
      ' / '
      '<a href="/rX%3CX/files/cX%3CX/pX%3CX/aX%3CX">aX&lt;X</a>'
      ' / '
      'bX&lt;X'),
 
     # Path with only one segment
     ('rX<X', 'cX<X', 'pX<X',
      '<a href="/rX%3CX/files/cX%3CX/"><i class="icon-home"></i></a>'
      ' / '
      'pX&lt;X'),
 
     # Empty path
     ('rX<X', 'cX<X', '',
      '<i class="icon-home"></i>'),
 
     # simple quote
     ('rX"X', 'cX"X', 'pX"X/aX"X/bX"X',
      '<a href="/rX%22X/files/cX%22X/"><i class="icon-home"></i></a>'
      ' / '
      '<a href="/rX%22X/files/cX%22X/pX%22X">pX&#34;X</a>'
      ' / '
      '<a href="/rX%22X/files/cX%22X/pX%22X/aX%22X">aX&#34;X</a>'
      ' / '
      'bX&#34;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 != '':
         expected_result = expected_result + helpers.files_icon.format(helpers.escape(path))
     assert result == expected_result
 
 
 def test_format_binary():
     assert helpers.format_byte_size_binary(298489462784) == '278.0 GiB'
 
 
 @pytest.mark.parametrize('text_string, pattern, expected', [
     ('No issue here', '(?:#)(?P<issue_id>\d+)', []),
     ('Fix #42', '(?:#)(?P<issue_id>\d+)',
      [{'url': 'http://r.io/{repo}/i/42', 'id': '42'}]),
     ('Fix #42, #53', '(?:#)(?P<issue_id>\d+)', [
      {'url': 'http://r.io/{repo}/i/42', 'id': '42'},
      {'url': 'http://r.io/{repo}/i/53', 'id': '53'}]),
     ('Fix #42', '(?:#)?<issue_id>\d+)', []),  # Broken regex
 ])
 def test_extract_issues(backend, text_string, pattern, expected):
     repo = backend.create_repo()
     config = {
         '123': {
             'uid': '123',
             'pat': pattern,
             'url': 'http://r.io/${repo}/i/${issue_id}',
             'pref': '#',
             'desc': 'Test Pattern'
         }
     }
 
     def get_settings_mock(self, cache=True):
         return config
 
     with mock.patch.object(IssueTrackerSettingsModel,
                            'get_settings', get_settings_mock):
         text, issues = helpers.process_patterns(text_string, repo.repo_name)
 
     expected = copy.deepcopy(expected)
     for item in expected:
         item['url'] = item['url'].format(repo=repo.repo_name)
 
     assert issues == expected
 
 
 @pytest.mark.parametrize('text_string, pattern, link_format, expected_text', [
     ('Fix #42', '(?:#)(?P<issue_id>\d+)', 'html',
      'Fix <a class="tooltip issue-tracker-link" href="http://r.io/{repo}/i/42" title="Test Pattern">#42</a>'),
 
     ('Fix #42', '(?:#)(?P<issue_id>\d+)', 'markdown',
      'Fix [#42](http://r.io/{repo}/i/42)'),
 
     ('Fix #42', '(?:#)(?P<issue_id>\d+)', 'rst',
      'Fix `#42 <http://r.io/{repo}/i/42>`_'),
 
     ('Fix #42', '(?:#)?<issue_id>\d+)', 'html',
      'Fix #42'),  # Broken regex
 ])
 def test_process_patterns_repo(backend, text_string, pattern, expected_text, link_format):
     repo = backend.create_repo()
 
     def get_settings_mock(self, cache=True):
         return {
             '123': {
                 'uid': '123',
                 'pat': pattern,
                 'url': 'http://r.io/${repo}/i/${issue_id}',
                 'pref': '#',
                 'desc': 'Test Pattern'
             }
         }
 
     with mock.patch.object(IssueTrackerSettingsModel,
                            'get_settings', get_settings_mock):
         processed_text, issues = helpers.process_patterns(
             text_string, repo.repo_name, link_format)
 
     assert processed_text == expected_text.format(repo=repo.repo_name)
 
 
 @pytest.mark.parametrize('text_string, pattern, expected_text', [
     ('Fix #42', '(?:#)(?P<issue_id>\d+)',
      'Fix <a class="tooltip issue-tracker-link" href="http://r.io/i/42" title="Test Pattern">#42</a>'),
     ('Fix #42', '(?:#)?<issue_id>\d+)',
      'Fix #42'),  # Broken regex
 ])
 def test_process_patterns_no_repo(text_string, pattern, expected_text):
 
     def get_settings_mock(self, cache=True):
         return {
             '123': {
                 'uid': '123',
                 'pat': pattern,
                 'url': 'http://r.io/i/${issue_id}',
                 'pref': '#',
                 'desc': 'Test Pattern'
             }
         }
 
     with mock.patch.object(IssueTrackerSettingsModel,
                            'get_global_settings', get_settings_mock):
         processed_text, issues = helpers.process_patterns(
             text_string, '')
 
     assert processed_text == expected_text
 
 
 def test_process_patterns_non_existent_repo_name(backend):
     text_string = 'Fix #42'
     pattern = '(?:#)(?P<issue_id>\d+)'
     expected_text = ('Fix <a class="tooltip issue-tracker-link" '
                      'href="http://r.io/do-not-exist/i/42" title="Test Pattern">#42</a>')
 
     def get_settings_mock(self, cache=True):
         return {
             '123': {
                 'uid': '123',
                 'pat': pattern,
                 'url': 'http://r.io/${repo}/i/${issue_id}',
                 'pref': '#',
                 'desc': 'Test Pattern'
             }
         }
 
     with mock.patch.object(IssueTrackerSettingsModel,
                            'get_global_settings', get_settings_mock):
         processed_text, issues = helpers.process_patterns(
             text_string, 'do-not-exist')
 
     assert processed_text == expected_text
 
 
 def test_get_visual_attr(baseapp):
     from rhodecode.apps._base import TemplateArgs
     c = TemplateArgs()
     assert None is helpers.get_visual_attr(c, 'fakse')
 
     # emulate the c.visual behaviour
     c.visual = AttributeDict({})
     assert None is helpers.get_visual_attr(c, 'some_var')
 
     c.visual.some_var = 'foobar'
     assert 'foobar' == helpers.get_visual_attr(c, 'some_var')
 
 
 @pytest.mark.parametrize('test_text, inclusive, expected_text', [
     ('just a string', False, 'just a string'),
     ('just a string\n', False, 'just a string'),
     ('just a string\n next line', False, 'just a string...'),
     ('just a string\n next line', True, 'just a string\n...'),
 ], ids=no_newline_id_generator)
 def test_chop_at(test_text, inclusive, expected_text):
     assert helpers.chop_at_smart(
         test_text, '\n', inclusive, '...') == expected_text