release: merge back stable branch into default

docs/release-notes/release-notes-4.18.1.rst

@@ -0,0 +1,60 b''
+|RCE| 4.18.1 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2020-01-20
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+- API: invalidate license cache on set_license_key call.
+- API: add send_email flag for comments api to allow commenting without email notification.
+- API: added pull requests versions into returned API data.
+- Dashboard: fixed jumping of text in grid loading by new loading indicator.
+- Installation: add few extra defaults that makes RhodeCode nicer out of the box.
+- Pull Requests: small code cleanup to define other type of merge username.
+  RC_MERGE_USER_NAME_ATTR env variable defines what should be used from user as merge username.
+- Gists: cleanup UI and make the gist access id use monospace according to the new UI.
+
+
+Security
+^^^^^^^^
+
+- Repository permission: properly flush permission caches on set private mode of repository.
+  Otherwise we get cached values still in place until it expires.
+- Repository permission: add set/un-set of private repository from permissions page.
+- Permissions: flush all user permissions in case of default user permission changes.
+
+
+Performance
+^^^^^^^^^^^
+
+- Caches: used more efficient way of fetching all users for permissions invalidation.
+- Issue trackers: optimized performance of fetching issue tracker patterns.
+
+
+Fixes
+^^^^^
+
+- SSH: fixed SSH problems with EE edition.
+- Branch permissions: remove emtpy tooltips on branch permission entries.
+- Core: fixed cython compat inspect that caused some API calls to not work correctly in EE release.
+- Audit logger: use copy of params we later modify to prevent from modification by the store
+  function of parameters that we only use for reading.
+- Users: fixed wrong mention of readme in user description help block.
+- Issue trackers: fixed wrong examples in patterns.
+- Issue trackers: fixed missing option to get back to inherited settings.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Scheduled release addressing problems in 4.18.X releases.

docs/release-notes/release-notes-4.18.2.rst

@@ -0,0 +1,49 b''
+|RCE| 4.18.2 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2020-01-28
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+- Permissions: add better help text about default permissions, and correlation with anonymous access enabled.
+- Mentions: markdown renderer now wraps username in hovercard logic allowing checking the mentioned user.
+- Documentation: added note about hard restart due to celery update.
+- Maintenance: run rebuildfncache for Mercurial in maintenance command.
+
+
+Security
+^^^^^^^^
+
+
+
+Performance
+^^^^^^^^^^^
+
+- Authentication: cache plugins for auth and their settings in the auth_registry for single request.
+  This heavily influences SVN performance on multiple-file commits.
+
+
+Fixes
+^^^^^
+
+- Descriptions: fixed rendering problem with certain meta-tags in repo description.
+- Emails: fixed fonts rendering problems in Outlook.
+- Emails: fixed bug in test email sending.
+- Summary: fixed styling of readme indicator.
+- Flash: fixed display problem with flash messages on error pages.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Scheduled release addressing problems in 4.18.X releases.

docs/release-notes/release-notes-4.18.3.rst

@@ -0,0 +1,64 b''
+|RCE| 4.18.3 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2020-03-24
+
+
+New Features
+^^^^^^^^^^^^
+
+- LDAP: added nested user groups sync which was planned in 4.18.X but didn't
+  make it to the release. New option for sync is available in the LDAP configuration.
+
+
+General
+^^^^^^^
+
+- API: added branch permissions functions.
+- Pull requests: added creating indicator to let users know they should wait until PR is creating.
+- Pull requests: allow super-admins to force change state of locked PRs.
+- Users/User groups: in edit mode we now show the actual name of what we're editing.
+- SSH: allow generation of legacy SSH keys for older systems and Windows users.
+- File store: don't response with cookie data on file-store download response.
+- File store: use our own logic for setting content-type. This solves a problem
+  when previously used resolver set different content-type+content-encoding which
+  is an incorrect behaviour.
+- My Account: show info about password usage for external accounts e.g github/google etc
+  We now recommend using auth-tokens instead of actual passwords.
+- Repositories: in description field we now show mention of metatags only if they
+  are enabled.
+
+
+Security
+^^^^^^^^
+
+- Remote sync: don't expose credentials in displayed URLs.
+  Remote links url had visible credentials displayed in the link.
+  This was used for web-view and not needed anymore.
+
+
+Performance
+^^^^^^^^^^^
+
+- Full text search: significantly improved GIT commit indexing performance by reducing
+  number of calls to the vcsserver.
+
+
+Fixes
+^^^^^
+
+- Mercurial: fixed cases of lookup of branches that are exactly 20 character long.
+- SVN: allow legacy (pre SVN 1.7) extraction of post commit data.
+- GIT: use non-unicode author extraction as it's returned as bytes from backend, and
+  we can get an unicode errors while there's some non-ascii characters.
+- GIT: use safe configparser for git submodules to prevent from errors on submodules with % sign.
+- System info: fixed UI problem with new version update info screen.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Scheduled release addressing problems in 4.18.X releases.

.hgtags

@@ -58,3 +58,7 b' ad5bd0c4bd322fdbd04bb825a3d027e08f7a3901'
 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

docs/admin/repo_admin/repo-admin-tasks.rst

@@ -57,5 +57,5 b' Each lines should represent a single nam'
 Run this line from CLI to execute the code from the `repo_delete_task.py` file and
 exit the ishell after the execution::
 
-    echo "%run repo_delete_task.py" | rccontrol ishell Enterprise-1
+    echo "%run repo_delete_task.py" | rccontrol ishell enterprise-1
 

docs/admin/system_admin/svn-http.rst

@@ -124,6 +124,7 b' 1. To configure Apache, create and edit '
         LogLevel info
         # allows custom host names, prevents 400 errors on checkout
         HttpProtocolOptions Unsafe
+        # Most likely this will be: /home/user/.rccontrol/enterprise-1/mod_dav_svn.conf
         Include /home/user/.rccontrol/enterprise-1/mod_dav_svn.conf
     </VirtualHost>
 

docs/admin/system_admin/tuning/tuning-user-sessions-performance.rst

@@ -48,7 +48,7 b' uses, or if required it can be a differe'
 
 
 
-To switch to reds-based user sessions uncomment the following section in
+To switch to redis-based user sessions uncomment the following section in
 your :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file.
 
 .. code-block:: ini

docs/install/quick-start.rst

@@ -33,6 +33,15 b' 2. Run the |RCC| installer and accept th'
     Do you accept the RhodeCode Control license?
     Press [Y] to accept license and [V] to view license text: y
 
+
+.. important::
+
+   We recommend running RhodeCode as a non-root user, such as `rhodecode`;
+   this user must have a proper home directory.
+   Either log in as that user to install the software, or do it as root
+   with `sudo -i -u rhodecode ./RhodeCode-installer-linux-*`
+
+
 3. Install a VCS Server, and configure it to start at boot.
 
 .. code-block:: bash

docs/release-notes/release-notes-4.18.0.rst

@@ -193,6 +193,10 b' Fixes'
 Upgrade notes
 ^^^^^^^^^^^^^
 
+- Major Celery Version upgrade. The 4.18.X release includes a major Celery version.
+  It's recommended to run `rccontrol self-stop && rccontrol self-init` after the
+  upgrade to ensure celery workers are restarted and updated.
+
 - New Automation task. We've changed the logic for updating latest change inside repository group.
   New logic includes scanning for changes in all nested objects. Since this is a heavy task
   a new dedicated scheduler task has been created to update it automatically on a scheduled base.
@@ -218,6 +222,11 b' Upgrade notes'
   Please review vcsserver.ini settings under:
   `rc_cache.repo_object.backend = dogpile.cache.rc.redis_msgpack`
 
+- Gunicorn configuration now moved to .ini files.
+  Upgrading to 4.18.X will overwrite the gunicorn_conf.py file. If there are any custom changes in that file
+  they will be lost. Recommended way to configure gunicorn is now via the .ini files. Please check `rhodecode.template.ini` file
+  for example gunicorn configuration.
+
 - New memory monitoring for Gunicorn workers. Starting from 4.18 release a option was added
   to limit the maximum amount of memory used by a worker.
   Please review new settings in `[server:main]` section for memory management in both

docs/release-notes/release-notes.rst

@@ -9,6 +9,9 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   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

rhodecode/api/__init__.py

@@ -18,7 +18,6 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-import inspect
 import itertools
 import logging
 import sys
@@ -186,10 +185,12 b' def request_view(request):'
     Main request handling method. It handles all logic to call a specific
     exposed method
     """
+    # cython compatible inspect
+    from rhodecode.config.patches import inspect_getargspec
+    inspect = inspect_getargspec()
 
     # check if we can find this session using api_key, get_by_auth_token
     # search not expired tokens only
-
     try:
         api_user = User.get_by_auth_token(request.rpc_api_key)
 

rhodecode/api/tests/test_get_method.py

@@ -56,5 +56,6 b' class TestGetMethod(object):'
                      'request': '<RequiredType>',
                      'resolves_comment_id': '<Optional:None>',
                      'status': '<Optional:None>',
-                     'userid': '<Optional:<OptionalAttr:apiuser>>'}]
+                     'userid': '<Optional:<OptionalAttr:apiuser>>',
+                     'send_email': '<Optional:True>'}]
         assert_ok(id_, expected, given=response.body)

rhodecode/api/tests/test_grant_user_group_permission.py

@@ -66,7 +66,7 b' class TestGrantUserGroupPermission(objec'
             perm=perm)
         response = api_call(self.app, params)
 
-        expected = 'permission `%s` does not exist' % (perm,)
+        expected = 'permission `%s` does not exist.' % (perm,)
         assert_error(id_, expected, given=response.body)
 
     @mock.patch.object(RepoModel, 'grant_user_group_permission', crash)

rhodecode/api/tests/test_grant_user_group_permission_to_repo_group.py

@@ -132,8 +132,7 b' class TestGrantUserGroupPermissionFromRe'
                 RepoGroupModel().revoke_user_group_permission(
                     repo_group.group_id, user_group.users_group_id)
         else:
-            expected = 'repository group `%s` does not exist' % (
-                repo_group.name,)
+            expected = 'repository group `%s` does not exist' % (repo_group.name,)
             assert_error(id_, expected, given=response.body)
 
     def test_api_grant_user_group_permission_to_repo_group_wrong_permission(
@@ -149,7 +148,7 b' class TestGrantUserGroupPermissionFromRe'
             perm=perm)
         response = api_call(self.app, params)
 
-        expected = 'permission `%s` does not exist' % (perm,)
+        expected = 'permission `%s` does not exist. Permission should start with prefix: `group.`' % (perm,)
         assert_error(id_, expected, given=response.body)
 
     @mock.patch.object(RepoGroupModel, 'grant_user_group_permission', crash)

rhodecode/api/tests/test_grant_user_permission.py

@@ -65,7 +65,7 b' class TestGrantUserPermission(object):'
             perm=perm)
         response = api_call(self.app, params)
 
-        expected = 'permission `%s` does not exist' % (perm,)
+        expected = 'permission `%s` does not exist.' % (perm,)
         assert_error(id_, expected, given=response.body)
 
     @mock.patch.object(RepoModel, 'grant_user_permission', crash)

rhodecode/api/tests/test_grant_user_permission_to_repo_group.py

@@ -132,7 +132,7 b' class TestGrantUserPermissionFromRepoGro'
             perm=perm)
         response = api_call(self.app, params)
 
-        expected = 'permission `%s` does not exist' % (perm,)
+        expected = 'permission `%s` does not exist. Permission should start with prefix: `group.`' % (perm,)
         assert_error(id_, expected, given=response.body)
 
     @mock.patch.object(RepoGroupModel, 'grant_user_permission', crash)

rhodecode/api/tests/test_grant_user_permission_to_user_group.py

@@ -130,7 +130,7 b' class TestGrantUserPermissionFromUserGro'
             perm=perm)
         response = api_call(self.app, params)
 
-        expected = 'permission `%s` does not exist' % perm
+        expected = 'permission `%s` does not exist. Permission should start with prefix: `usergroup.`' % perm
         assert_error(id_, expected, given=response.body)
 
     def test_api_grant_user_permission_to_user_group_exception_when_adding(

rhodecode/api/utils.py

@@ -308,7 +308,11 b' def get_perm_or_error(permid, prefix=Non'
 
     perm = PermissionModel.cls.get_by_key(permid)
     if perm is None:
-        raise JSONRPCError('permission `%s` does not exist' % (permid,))
+        msg = 'permission `{}` does not exist.'.format(permid)
+        if prefix:
+            msg += ' Permission should start with prefix: `{}`'.format(prefix)
+        raise JSONRPCError(msg)
+
     if prefix:
         if not perm.permission_name.startswith(prefix):
             raise JSONRPCError('permission `%s` is invalid, '
@@ -351,12 +355,12 b' def get_pull_request_or_error(pullreques'
 def build_commit_data(commit, detail_level):
     parsed_diff = []
     if detail_level == 'extended':
-        for f in commit.added:
-            parsed_diff.append(_get_commit_dict(filename=f.path, op='A'))
-        for f in commit.changed:
-            parsed_diff.append(_get_commit_dict(filename=f.path, op='M'))
-        for f in commit.removed:
-            parsed_diff.append(_get_commit_dict(filename=f.path, op='D'))
+        for f_path in commit.added_paths:
+            parsed_diff.append(_get_commit_dict(filename=f_path, op='A'))
+        for f_path in commit.changed_paths:
+            parsed_diff.append(_get_commit_dict(filename=f_path, op='M'))
+        for f_path in commit.removed_paths:
+            parsed_diff.append(_get_commit_dict(filename=f_path, op='D'))
 
     elif detail_level == 'full':
         from rhodecode.lib.diffs import DiffProcessor

rhodecode/api/views/pull_request_api.py

@@ -73,6 +73,7 b' def get_pull_request(request, apiuser, p'
             "status" :           "<status>",
             "created_on":        "<date_time_created>",
             "updated_on":        "<date_time_updated>",
+            "versions":          "<number_or_versions_of_pr>",
             "commit_ids":        [
                                      ...
                                      "<commit_id>",
@@ -452,7 +453,7 b' def comment_pull_request('
         message=Optional(None), commit_id=Optional(None), status=Optional(None),
         comment_type=Optional(ChangesetComment.COMMENT_TYPE_NOTE),
         resolves_comment_id=Optional(None), extra_recipients=Optional([]),
-        userid=Optional(OAttr('apiuser'))):
+        userid=Optional(OAttr('apiuser')), send_email=Optional(True)):
     """
     Comment on the pull request specified with the `pullrequestid`,
     in the |repo| specified by the `repoid`, and optionally change the
@@ -483,6 +484,8 b' def comment_pull_request('
     :type extra_recipients: Optional(list)
     :param userid: Comment on the pull request as this user
     :type userid: Optional(str or int)
+    :param send_email: Define if this comment should also send email notification
+    :type send_email: Optional(bool)
 
     Example output:
 
@@ -527,6 +530,7 b' def comment_pull_request('
     comment_type = Optional.extract(comment_type)
     resolves_comment_id = Optional.extract(resolves_comment_id)
     extra_recipients = Optional.extract(extra_recipients)
+    send_email = Optional.extract(send_email, binary=True)
 
     if not message and not status:
         raise JSONRPCError(
@@ -587,7 +591,8 b' def comment_pull_request('
         comment_type=comment_type,
         resolves_comment_id=resolves_comment_id,
         auth_user=auth_user,
-        extra_recipients=extra_recipients
+        extra_recipients=extra_recipients,
+        send_email=send_email
     )
 
     if allowed_to_change_status and status:

rhodecode/api/views/repo_api.py

@@ -1551,7 +1551,7 b' def comment_commit('
         request, apiuser, repoid, commit_id, message, status=Optional(None),
         comment_type=Optional(ChangesetComment.COMMENT_TYPE_NOTE),
         resolves_comment_id=Optional(None), extra_recipients=Optional([]),
-        userid=Optional(OAttr('apiuser'))):
+        userid=Optional(OAttr('apiuser')), send_email=Optional(True)):
     """
     Set a commit comment, and optionally change the status of the commit.
 
@@ -1575,6 +1575,8 b' def comment_commit('
     :type extra_recipients: Optional(list)
     :param userid: Set the user name of the comment creator.
     :type userid: Optional(str or int)
+    :param send_email: Define if this comment should also send email notification
+    :type send_email: Optional(bool)
 
     Example error output:
 
@@ -1610,6 +1612,7 b' def comment_commit('
     comment_type = Optional.extract(comment_type)
     resolves_comment_id = Optional.extract(resolves_comment_id)
     extra_recipients = Optional.extract(extra_recipients)
+    send_email = Optional.extract(send_email, binary=True)
 
     allowed_statuses = [x[0] for x in ChangesetStatus.STATUSES]
     if status and status not in allowed_statuses:
@@ -1639,7 +1642,8 b' def comment_commit('
             comment_type=comment_type,
             resolves_comment_id=resolves_comment_id,
             auth_user=apiuser,
-            extra_recipients=extra_recipients
+            extra_recipients=extra_recipients,
+            send_email=send_email
         )
         if status:
             # also do a status change

rhodecode/api/views/server_api.py

@@ -18,7 +18,6 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-import inspect
 import logging
 import itertools
 import base64
@@ -334,6 +333,9 b' def get_method(request, apiuser, pattern'
       ]
       error :  null
     """
+    from rhodecode.config.patches import inspect_getargspec
+    inspect = inspect_getargspec()
+
     if not has_superadmin_permission(apiuser):
         raise JSONRPCForbidden()
 

rhodecode/apps/_base/__init__.py

@@ -37,7 +37,7 b' 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
+from rhodecode.model.settings import VcsSettingsModel, IssueTrackerSettingsModel
 from rhodecode.model.repo import ReadmeFinder
 
 log = logging.getLogger(__name__)
@@ -226,6 +226,7 b' class RepoAppView(BaseAppView):'
         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(

rhodecode/apps/admin/views/settings.py

@@ -573,7 +573,7 b' class AdminSettingsView(BaseAppView):'
 
         email_kwargs = {
             'date': datetime.datetime.now(),
-            'user': c.rhodecode_user
+            'user': self._rhodecode_db_user
         }
 
         (subject, headers, email_body,

rhodecode/apps/admin/views/users.py

@@ -872,7 +872,10 b' class UsersView(UserAppView):'
 
         c.active = 'ssh_keys_generate'
         comment = 'RhodeCode-SSH {}'.format(c.user.email or '')
-        c.private, c.public = SshKeyModel().generate_keypair(comment=comment)
+        private_format = self.request.GET.get('private_format') \
+                         or SshKeyModel.DEFAULT_PRIVATE_KEY_FORMAT
+        c.private, c.public = SshKeyModel().generate_keypair(
+            comment=comment, private_format=private_format)
 
         return self._get_template_context(c)
 

rhodecode/apps/file_store/views.py

@@ -33,6 +33,7 b' from rhodecode.lib import audit_logger'
 from rhodecode.lib.auth import (
     CSRFRequired, NotAnonymous, HasRepoPermissionAny, HasRepoGroupPermissionAny,
     LoginRequired)
+from rhodecode.lib.vcs.conf.mtypes import get_mimetypes_db
 from rhodecode.model.db import Session, FileStore, UserApiKeys
 
 log = logging.getLogger(__name__)
@@ -46,6 +47,15 b' class FileStoreView(BaseAppView):'
         self.storage = utils.get_file_storage(self.request.registry.settings)
         return c
 
+    def _guess_type(self, file_name):
+        """
+        Our own type guesser for mimetypes using the rich DB
+        """
+        if not hasattr(self, 'db'):
+            self.db = get_mimetypes_db()
+        _content_type, _encoding = self.db.guess_type(file_name, strict=False)
+        return _content_type, _encoding
+
     def _serve_file(self, file_uid):
 
         if not self.storage.exists(file_uid):
@@ -92,7 +102,18 b' class FileStoreView(BaseAppView):'
         FileStore.bump_access_counter(file_uid)
 
         file_path = self.storage.store_path(file_uid)
-        return FileResponse(file_path)
+        content_type = 'application/octet-stream'
+        content_encoding = None
+
+        _content_type, _encoding = self._guess_type(file_path)
+        if _content_type:
+            content_type = _content_type
+
+        # For file store we don't submit any session data, this logic tells the
+        # Session lib to skip it
+        setattr(self.request, '_file_response', True)
+        return FileResponse(file_path, request=self.request,
+                            content_type=content_type, content_encoding=content_encoding)
 
     @LoginRequired()
     @NotAnonymous()

rhodecode/apps/gist/tests/test_admin_gists.py

@@ -105,11 +105,11 b' class TestGistsController(TestController'
         g4 = create_gist('gist4', gist_type='private').gist_access_id
         response = self.app.get(route_path('gists_show'))
 
-        response.mustcontain('gist: %s' % g1.gist_access_id)
-        response.mustcontain('gist: %s' % g2.gist_access_id)
-        response.mustcontain('gist: %s' % g3.gist_access_id)
+        response.mustcontain(g1.gist_access_id)
+        response.mustcontain(g2.gist_access_id)
+        response.mustcontain(g3.gist_access_id)
         response.mustcontain('gist3-desc')
-        response.mustcontain(no=['gist: %s' % g4])
+        response.mustcontain(no=[g4])
 
         # Expiration information should be visible
         expires_tag = '%s' % h.age_component(
@@ -122,7 +122,7 b' class TestGistsController(TestController'
         response = self.app.get(route_path('gists_show', params=dict(private=1)))
 
         # and privates
-        response.mustcontain('gist: %s' % gist.gist_access_id)
+        response.mustcontain(gist.gist_access_id)
 
     def test_index_show_all(self, create_gist):
         self.log_user()
@@ -136,7 +136,7 b' class TestGistsController(TestController'
         assert len(GistModel.get_all()) == 4
         # and privates
         for gist in GistModel.get_all():
-            response.mustcontain('gist: %s' % gist.gist_access_id)
+            response.mustcontain(gist.gist_access_id)
 
     def test_index_show_all_hidden_from_regular(self, create_gist):
         self.log_user(TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
@@ -150,7 +150,7 b' class TestGistsController(TestController'
         # since we don't have access to private in this view, we
         # should see nothing
         for gist in GistModel.get_all():
-            response.mustcontain(no=['gist: %s' % gist.gist_access_id])
+            response.mustcontain(no=[gist.gist_access_id])
 
     def test_create(self):
         self.log_user()

rhodecode/apps/home/tests/__init__.py

@@ -33,7 +33,7 b' def assert_and_get_main_filter_content(r'
         if data_item['type'] == 'search':
             display_val = data_item['value_display']
             if data_item['id'] == -1:
-                assert 'File search for:' in display_val, display_val
+                assert 'File content search for:' in display_val, display_val
             elif data_item['id'] == -2:
                 assert 'Commit search for:' in display_val, display_val
             else:

rhodecode/apps/home/views.py

@@ -453,7 +453,7 b' class HomeView(BaseAppView, DataGridAppV'
                 qry = query
                 return {'q': qry, 'type': 'content'}
 
-            label = u'File search for `{}`'.format(h.escape(query))
+            label = u'File content search for `{}`'.format(h.escape(query))
             file_qry = {
                 'id': -10,
                 'value': query,
@@ -497,7 +497,7 b' class HomeView(BaseAppView, DataGridAppV'
                 qry = query
                 return {'q': qry, 'type': 'content'}
 
-            label = u'File search for `{}`'.format(query)
+            label = u'File content search for `{}`'.format(query)
             file_qry = {
                 'id': -30,
                 'value': query,
@@ -541,7 +541,7 b' class HomeView(BaseAppView, DataGridAppV'
                 {
                     'id': -1,
                     'value': query,
-                    'value_display': u'File search for: `{}`'.format(query),
+                    'value_display': u'File content search for: `{}`'.format(query),
                     'value_icon': '<i class="icon-code"></i>',
                     'type': 'search',
                     'subtype': 'global',

rhodecode/apps/hovercards/__init__.py

@@ -26,6 +26,10 b' def includeme(config):'
         pattern='/_hovercard/user/{user_id}')
 
     config.add_route(
+        name='hovercard_username',
+        pattern='/_hovercard/username/{username}')
+
+    config.add_route(
         name='hovercard_user_group',
         pattern='/_hovercard/user_group/{user_group_id}')
 

rhodecode/apps/hovercards/views.py

@@ -65,6 +65,19 b' class HoverCardsView(BaseAppView):'
 
     @LoginRequired()
     @view_config(
+        route_name='hovercard_username', request_method='GET', xhr=True,
+        renderer='rhodecode:templates/hovercards/hovercard_user.mako')
+    def hovercard_username(self):
+        c = self.load_default_context()
+        username = self.request.matchdict['username']
+        c.user = User.get_by_username(username)
+        if not c.user:
+            raise HTTPNotFound()
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @view_config(
         route_name='hovercard_user_group', request_method='GET', xhr=True,
         renderer='rhodecode:templates/hovercards/hovercard_user_group.mako')
     def hovercard_user_group(self):

rhodecode/apps/login/tests/test_login.py

@@ -108,7 +108,8 b' class TestLoginController(object):'
 
     def test_login_regular_forbidden_when_super_admin_restriction(self):
         from rhodecode.authentication.plugins.auth_rhodecode import RhodeCodeAuthPlugin
-        with fixture.auth_restriction(RhodeCodeAuthPlugin.AUTH_RESTRICTION_SUPER_ADMIN):
+        with fixture.auth_restriction(self.app._pyramid_registry,
+                                      RhodeCodeAuthPlugin.AUTH_RESTRICTION_SUPER_ADMIN):
             response = self.app.post(route_path('login'),
                                      {'username': 'test_regular',
                                       'password': 'test12'})
@@ -118,7 +119,8 b' class TestLoginController(object):'
 
     def test_login_regular_forbidden_when_scope_restriction(self):
         from rhodecode.authentication.plugins.auth_rhodecode import RhodeCodeAuthPlugin
-        with fixture.scope_restriction(RhodeCodeAuthPlugin.AUTH_RESTRICTION_SCOPE_VCS):
+        with fixture.scope_restriction(self.app._pyramid_registry,
+                                       RhodeCodeAuthPlugin.AUTH_RESTRICTION_SCOPE_VCS):
             response = self.app.post(route_path('login'),
                                      {'username': 'test_regular',
                                       'password': 'test12'})

rhodecode/apps/my_account/views/my_account.py

@@ -76,6 +76,7 b' class MyAccountView(BaseAppView, DataGri'
     def my_account_profile(self):
         c = self.load_default_context()
         c.active = 'profile'
+        c.extern_type = c.user.extern_type
         return self._get_template_context(c)
 
     @LoginRequired()

rhodecode/apps/my_account/views/my_account_ssh_keys.py

@@ -72,8 +72,11 b' class MyAccountSshKeysView(BaseAppView, '
 
         c.active = 'ssh_keys_generate'
         if c.ssh_key_generator_enabled:
+            private_format = self.request.GET.get('private_format') \
+                             or SshKeyModel.DEFAULT_PRIVATE_KEY_FORMAT
             comment = 'RhodeCode-SSH {}'.format(c.user.email or '')
-            c.private, c.public = SshKeyModel().generate_keypair(comment=comment)
+            c.private, c.public = SshKeyModel().generate_keypair(
+                comment=comment, private_format=private_format)
             c.target_form_url = h.route_path(
                 'my_account_ssh_keys', _query=dict(default_key=c.public))
         return self._get_template_context(c)

rhodecode/apps/repo_group/views/repo_group_permissions.py

@@ -28,6 +28,7 b' from rhodecode.lib import helpers as h'
 from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoGroupPermissionAnyDecorator, CSRFRequired)
+from rhodecode.model.db import User
 from rhodecode.model.permission import PermissionModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.forms import RepoGroupPermsForm
@@ -96,7 +97,13 b' class RepoGroupPermissionsView(RepoGroup'
 
         Session().commit()
         h.flash(_('Repository Group permissions updated'), category='success')
-        PermissionModel().flush_user_permission_caches(changes)
+
+        affected_user_ids = None
+        if changes.get('default_user_changed', False):
+            # if we change the default user, we need to flush everyone permissions
+            affected_user_ids = User.get_all_user_ids()
+        PermissionModel().flush_user_permission_caches(
+            changes, affected_user_ids=affected_user_ids)
 
         raise HTTPFound(
             h.route_path('edit_repo_group_perms',

rhodecode/apps/repository/views/repo_permissions.py

@@ -28,6 +28,8 b' from rhodecode.lib import helpers as h'
 from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
+from rhodecode.lib.utils2 import str2bool
+from rhodecode.model.db import User
 from rhodecode.model.forms import RepoPermsForm
 from rhodecode.model.meta import Session
 from rhodecode.model.permission import PermissionModel
@@ -89,7 +91,12 b' class RepoSettingsPermissionsView(RepoAp'
         Session().commit()
         h.flash(_('Repository access permissions updated'), category='success')
 
-        PermissionModel().flush_user_permission_caches(changes)
+        affected_user_ids = None
+        if changes.get('default_user_changed', False):
+            # if we change the default user, we need to flush everyone permissions
+            affected_user_ids = User.get_all_user_ids()
+        PermissionModel().flush_user_permission_caches(
+            changes, affected_user_ids=affected_user_ids)
 
         raise HTTPFound(
             h.route_path('edit_repo_perms', repo_name=self.db_repo_name))
@@ -104,9 +111,11 b' class RepoSettingsPermissionsView(RepoAp'
         _ = self.request.translate
         self.load_default_context()
 
+        private_flag = str2bool(self.request.POST.get('private'))
+
         try:
             RepoModel().update(
-                self.db_repo, **{'repo_private': True, 'repo_name': self.db_repo_name})
+                self.db_repo, **{'repo_private': private_flag, 'repo_name': self.db_repo_name})
             Session().commit()
 
             h.flash(_('Repository `{}` private mode set successfully').format(self.db_repo_name),
@@ -116,7 +125,11 b' class RepoSettingsPermissionsView(RepoAp'
             h.flash(_('Error occurred during update of repository {}').format(
                 self.db_repo_name), category='error')
 
+        # NOTE(dan): we change repo private mode we need to notify all USERS
+        affected_user_ids = User.get_all_user_ids()
+        PermissionModel().trigger_permission_flush(affected_user_ids)
+
         return {
             'redirect_url': h.route_path('edit_repo_perms', repo_name=self.db_repo_name),
-            'private': True
+            'private': private_flag
         }

rhodecode/apps/repository/views/repo_pull_requests.py

@@ -275,6 +275,20 b' class RepoPullRequestsView(RepoAppView, '
 
         c.state_progressing = pull_request.is_state_changing()
 
+        _new_state = {
+            'created': PullRequest.STATE_CREATED,
+        }.get(self.request.GET.get('force_state'))
+        if c.is_super_admin and _new_state:
+            with pull_request.set_state(PullRequest.STATE_UPDATING, final_state=_new_state):
+                h.flash(
+                    _('Pull Request state was force changed to `{}`').format(_new_state),
+                    category='success')
+                Session().commit()
+
+            raise HTTPFound(h.route_path(
+                'pullrequest_show', repo_name=self.db_repo_name,
+                pull_request_id=pull_request_id))
+
         version = self.request.GET.get('version')
         from_version = self.request.GET.get('from_version') or version
         merge_checks = self.request.GET.get('merge_checks')

rhodecode/apps/repository/views/repo_settings_issue_trackers.py

@@ -31,7 +31,7 b' from rhodecode.lib.auth import ('
     LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
 from rhodecode.model.forms import IssueTrackerPatternsForm
 from rhodecode.model.meta import Session
-from rhodecode.model.settings import IssueTrackerSettingsModel, SettingsModel
+from rhodecode.model.settings import SettingsModel
 
 log = logging.getLogger(__name__)
 
@@ -53,7 +53,7 b' class RepoSettingsIssueTrackersView(Repo'
         c.active = 'issuetracker'
         c.data = 'data'
 
-        c.settings_model = IssueTrackerSettingsModel(repo=self.db_repo)
+        c.settings_model = self.db_repo_patterns
         c.global_patterns = c.settings_model.get_global_settings()
         c.repo_patterns = c.settings_model.get_repo_settings()
 
@@ -79,7 +79,7 b' class RepoSettingsIssueTrackersView(Repo'
     def repo_issuetracker_delete(self):
         _ = self.request.translate
         uid = self.request.POST.get('uid')
-        repo_settings = IssueTrackerSettingsModel(repo=self.db_repo_name)
+        repo_settings = self.db_repo_patterns
         try:
             repo_settings.delete_entries(uid)
         except Exception:
@@ -113,7 +113,7 b' class RepoSettingsIssueTrackersView(Repo'
     def repo_issuetracker_update(self):
         _ = self.request.translate
         # Save inheritance
-        repo_settings = IssueTrackerSettingsModel(repo=self.db_repo_name)
+        repo_settings = self.db_repo_patterns
         inherited = (
             self.request.POST.get('inherit_global_issuetracker') == "inherited")
         repo_settings.inherit_global_settings = inherited

rhodecode/apps/svn_support/templates/mod-dav-svn.conf.mako

@@ -24,6 +24,7 b''
 #         LogLevel info
 #         # allows custom host names, prevents 400 errors on checkout
 #         HttpProtocolOptions Unsafe
+#         # Most likely this will be: /home/user/.rccontrol/enterprise-1/mod_dav_svn.conf
 #         Include /path/to/generated/mod_dav_svn.conf
 #     </VirtualHost>
 #

rhodecode/authentication/base.py

@@ -150,6 +150,7 b' class RhodeCodeAuthPluginBase(object):'
 
     def __init__(self, plugin_id):
         self._plugin_id = plugin_id
+        self._settings = {}
 
     def __str__(self):
         return self.get_id()
@@ -226,17 +227,26 b' class RhodeCodeAuthPluginBase(object):'
         """
         return AuthnPluginSettingsSchemaBase()
 
-    def get_settings(self):
-        """
-        Returns the plugin settings as dictionary.
-        """
+    def _propagate_settings(self, raw_settings):
         settings = {}
-        raw_settings = SettingsModel().get_all_settings()
         for node in self.get_settings_schema():
             settings[node.name] = self.get_setting_by_name(
                 node.name, plugin_cached_settings=raw_settings)
         return settings
 
+    def get_settings(self, use_cache=True):
+        """
+        Returns the plugin settings as dictionary.
+        """
+        if self._settings != {} and use_cache:
+            return self._settings
+
+        raw_settings = SettingsModel().get_all_settings()
+        settings = self._propagate_settings(raw_settings)
+
+        self._settings = settings
+        return self._settings
+
     def get_setting_by_name(self, name, default=None, plugin_cached_settings=None):
         """
         Returns a plugin setting by name.
@@ -594,19 +604,19 b' class AuthLdapBase(object):'
             if not full_resolve:
                 return '{}:{}'.format(host, port)
 
-            log.debug('LDAP: Resolving IP for LDAP host %s', host)
+            log.debug('LDAP: Resolving IP for LDAP host `%s`', host)
             try:
                 ip = socket.gethostbyname(host)
-                log.debug('Got LDAP server %s ip %s', host, ip)
+                log.debug('LDAP: Got LDAP host `%s` ip %s', host, ip)
             except Exception:
-                raise LdapConnectionError(
-                    'Failed to resolve host: `{}`'.format(host))
+                raise LdapConnectionError('Failed to resolve host: `{}`'.format(host))
 
             log.debug('LDAP: Checking if IP %s is accessible', ip)
             s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             try:
                 s.connect((ip, int(port)))
                 s.shutdown(socket.SHUT_RD)
+                log.debug('LDAP: connection to %s successful', ip)
             except Exception:
                 raise LdapConnectionError(
                     'Failed to connect to host: `{}:{}`'.format(host, port))
@@ -667,7 +677,7 b' def loadplugin(plugin_id):'
 
 def get_authn_registry(registry=None):
     registry = registry or get_current_registry()
-    authn_registry = registry.getUtility(IAuthnPluginRegistry)
+    authn_registry = registry.queryUtility(IAuthnPluginRegistry)
     return authn_registry
 
 
@@ -690,6 +700,7 b' def authenticate(username, password, env'
     headers_only = environ and not (username and password)
 
     authn_registry = get_authn_registry(registry)
+
     plugins_to_check = authn_registry.get_plugins_for_authentication()
     log.debug('Starting ordered authentication chain using %s plugins',
               [x.name for x in plugins_to_check])

rhodecode/authentication/plugins/auth_ldap.py

@@ -145,16 +145,16 b' class AuthLdap(AuthLdapBase):'
             log.debug('Trying simple_bind with password and given login DN: %r',
                       self.LDAP_BIND_DN)
             ldap_conn.simple_bind_s(self.LDAP_BIND_DN, self.LDAP_BIND_PASS)
-
+        log.debug('simple_bind successful')
         return ldap_conn
 
     def fetch_attrs_from_simple_bind(self, server, dn, username, password):
         try:
             log.debug('Trying simple bind with %r', dn)
             server.simple_bind_s(dn, safe_str(password))
-            user = server.search_ext_s(
+            _dn, attrs = server.search_ext_s(
                 dn, ldap.SCOPE_BASE, '(objectClass=*)', )[0]
-            _, attrs = user
+
             return attrs
 
         except ldap.INVALID_CREDENTIALS:
@@ -272,7 +272,7 b' class LdapSettingsSchema(AuthnPluginSett'
                       'uid=root,cn=users,dc=mydomain,dc=com, or [e-mail]'),
         missing='',
         preparer=strip_whitespace,
-        title=_('Account'),
+        title=_('Bind account'),
         widget='string')
     dn_pass = colander.SchemaNode(
         colander.String(),
@@ -280,7 +280,7 b' class LdapSettingsSchema(AuthnPluginSett'
         description=_('Password to authenticate for given user DN.'),
         missing='',
         preparer=strip_whitespace,
-        title=_('Password'),
+        title=_('Bind account password'),
         widget='password')
     tls_kind = colander.SchemaNode(
         colander.String(),
@@ -318,7 +318,7 b' class LdapSettingsSchema(AuthnPluginSett'
         colander.String(),
         default='',
         description=_('Base DN to search. Dynamic bind is supported. Add `$login` marker '
-                      'in it to be replaced with current user credentials \n'
+                      'in it to be replaced with current user username \n'
                       '(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)'),
         missing='',
         preparer=strip_whitespace,

rhodecode/authentication/registry.py

@@ -38,6 +38,7 b' class AuthenticationPluginRegistry(objec'
 
     def __init__(self, settings):
         self._plugins = {}
+        self._plugins_for_auth = None
         self._fallback_plugin = settings.get(self.fallback_plugin_key, None)
 
     def add_authn_plugin(self, config, plugin):
@@ -63,6 +64,10 b' class AuthenticationPluginRegistry(objec'
             if plugin.uid == plugin_uid:
                 return plugin
 
+    def invalidate_plugins_for_auth(self):
+        log.debug('Invalidating cached plugins for authentication')
+        self._plugins_for_auth = None
+
     def get_plugins_for_authentication(self):
         """
         Returns a list of plugins which should be consulted when authenticating
@@ -70,6 +75,9 b' class AuthenticationPluginRegistry(objec'
         Additionally it includes the fallback plugin from the INI file, if
         `rhodecode.auth_plugin_fallback` is set to a plugin ID.
         """
+        if self._plugins_for_auth is not None:
+            return self._plugins_for_auth
+
         plugins = []
 
         # Add all enabled and active plugins to the list. We iterate over the
@@ -80,6 +88,9 b' class AuthenticationPluginRegistry(objec'
             plugin = self.get_plugin(plugin_id)
             if plugin is not None and plugin.is_active(
                     plugin_cached_settings=raw_settings):
+
+                # inject settings into plugin, we can re-use the DB fetched settings here
+                plugin._settings = plugin._propagate_settings(raw_settings)
                 plugins.append(plugin)
 
         # Add the fallback plugin from ini file.
@@ -89,6 +100,8 b' class AuthenticationPluginRegistry(objec'
                 self._fallback_plugin)
             plugin = self.get_plugin(self._fallback_plugin)
             if plugin is not None and plugin not in plugins:
+                plugin._settings = plugin._propagate_settings(raw_settings)
                 plugins.append(plugin)
 
-        return plugins
+        self._plugins_for_auth = plugins
+        return self._plugins_for_auth

rhodecode/authentication/views.py

@@ -99,11 +99,12 b' class AuthnPluginViewBase(BaseAppView):'
         for name, value in valid_data.items():
             self.plugin.create_or_update_setting(name, value)
         Session().commit()
+        SettingsModel().invalidate_settings_cache()
 
         # Display success message and redirect.
         h.flash(_('Auth settings updated successfully.'), category='success')
-        redirect_to = self.request.resource_path(
-            self.context, route_name='auth_home')
+        redirect_to = self.request.resource_path(self.context, route_name='auth_home')
+
         return HTTPFound(redirect_to)
 
 
@@ -159,7 +160,7 b' class AuthSettingsView(BaseAppView):'
                 'auth_plugins', plugins)
             Session().add(setting)
             Session().commit()
-
+            SettingsModel().invalidate_settings_cache()
             h.flash(_('Auth settings updated successfully.'), category='success')
         except formencode.Invalid as errors:
             e = errors.error_dict or {}
@@ -174,6 +175,6 b' class AuthSettingsView(BaseAppView):'
             h.flash(_('Error occurred during update of auth settings.'),
                     category='error')
 
-        redirect_to = self.request.resource_path(
-            self.context, route_name='auth_home')
+        redirect_to = self.request.resource_path(self.context, route_name='auth_home')
+
         return HTTPFound(redirect_to)

rhodecode/config/patches.py

@@ -95,3 +95,5 b' def inspect_getargspec():'
         return inspect.ArgSpec(args, varargs, varkw, func.func_defaults)
 
     inspect.getargspec = custom_getargspec
+
+    return inspect

rhodecode/i18n/rhodecode.pot

@@ -1,14 +1,14 b''
 # Translations template for rhodecode-enterprise-ce.
-# Copyright (C) 2019 RhodeCode GmbH
+# Copyright (C) 2020 RhodeCode GmbH
 # This file is distributed under the same license as the rhodecode-enterprise-ce project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rhodecode-enterprise-ce 4.17.0\n"
+"Project-Id-Version: rhodecode-enterprise-ce 4.18.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-03 14:48+0000\n"
+"POT-Creation-Date: 2020-01-08 13:56+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"
@@ -33,60 +33,60 b' msgstr ""'
 msgid "Removed Exception {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:120
+#: rhodecode/apps/admin/views/permissions.py:121
 msgid "Application permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:141
-#: rhodecode/apps/admin/views/permissions.py:217
-#: rhodecode/apps/admin/views/permissions.py:319
+#: 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:197
+#: rhodecode/apps/admin/views/permissions.py:198
 msgid "Object permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:299
+#: rhodecode/apps/admin/views/permissions.py:300
 msgid "Global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:484
-#: rhodecode/templates/admin/gists/show.mako:63
+#: 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:5
-#: rhodecode/templates/base/issue_tracker_settings.mako:60
-#: rhodecode/templates/data_table/_dt_elements.mako:167
-#: rhodecode/templates/data_table/_dt_elements.mako:241
-#: rhodecode/templates/data_table/_dt_elements.mako:254
-#: rhodecode/templates/data_table/_dt_elements.mako:255
-#: rhodecode/templates/data_table/_dt_elements.mako:267
+#: 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/debug_style/buttons.html:128
 #: rhodecode/templates/files/files_add.mako:57
 #: 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:60
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:343
-#: rhodecode/templates/user_group/profile.mako:7
-#: rhodecode/templates/users/user_profile.mako:7
+#: 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:512
+#: rhodecode/apps/admin/views/permissions.py:513
 msgid "Updated SSH keys file: {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:515
+#: rhodecode/apps/admin/views/permissions.py:516
 msgid "SSH key support is disabled in .ini file"
 msgstr ""
 
-#: rhodecode/apps/admin/views/repo_groups.py:329
+#: rhodecode/apps/admin/views/repo_groups.py:328
 #, python-format
 msgid "Created repository group %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/repo_groups.py:347
+#: rhodecode/apps/admin/views/repo_groups.py:346
 #, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr ""
@@ -102,7 +102,7 b' 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:724
+#: rhodecode/apps/admin/views/settings.py:726
 #: rhodecode/apps/repository/views/repo_settings_vcs.py:124
 msgid "Some form inputs contain invalid data."
 msgstr ""
@@ -135,45 +135,45 b' msgid "Error occurred during updating vi'
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:496
-#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125
+#: 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:134
+#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:136
 msgid "Updated issue tracker entries"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:531
-#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89
-msgid "Removed issue tracker entry"
-msgstr ""
-
-#: rhodecode/apps/admin/views/settings.py:568
+#: 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:586
+#: rhodecode/apps/admin/views/settings.py:588
 msgid "Send email task created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:636
+#: rhodecode/apps/admin/views/settings.py:638
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:651
+#: rhodecode/apps/admin/views/settings.py:653
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:655
+#: rhodecode/apps/admin/views/settings.py:657
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:748
+#: rhodecode/apps/admin/views/settings.py:750
 msgid "Error occurred during updating labs settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:753
+#: rhodecode/apps/admin/views/settings.py:755
 msgid "Updated Labs settings"
 msgstr ""
 
@@ -330,6 +330,7 b' msgid "VCS Backends"'
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:151
+#: rhodecode/templates/admin/settings/settings_system.mako:32
 msgid "VCS Server"
 msgstr ""
 
@@ -345,200 +346,210 b' msgstr ""'
 msgid "SVN"
 msgstr ""
 
-#: rhodecode/apps/admin/views/user_groups.py:243
+#: 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:265
+#: 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:219
+#: rhodecode/apps/admin/views/users.py:221
 #, python-format
 msgid "Created user %(user_link)s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:240
+#: rhodecode/apps/admin/views/users.py:242
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:314
+#: rhodecode/apps/admin/views/users.py:344
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:332
+#: rhodecode/apps/admin/views/users.py:362
 #, python-format
 msgid "Error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:364
+#: rhodecode/apps/admin/views/users.py:391
 #, python-format
 msgid "Detached %s repositories"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:369
+#: rhodecode/apps/admin/views/users.py:394
 #, python-format
 msgid "Deleted %s repositories"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:377
+#: rhodecode/apps/admin/views/users.py:400
 #, python-format
 msgid "Detached %s repository groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:382
+#: rhodecode/apps/admin/views/users.py:403
 #, python-format
 msgid "Deleted %s repository groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:390
+#: rhodecode/apps/admin/views/users.py:409
 #, python-format
 msgid "Detached %s user groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:395
-#, python-format
-msgid "Deleted %s user groups"
-msgstr ""
-
 #: rhodecode/apps/admin/views/users.py:412
-msgid "Successfully deleted user"
+#, 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 "Deleted %s artifacts"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:454
+msgid "Successfully deleted user `{}`"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:460
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:483
+#: rhodecode/apps/admin/views/users.py:525
 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:489
+#: rhodecode/apps/admin/views/users.py:531
 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:578
+#: rhodecode/apps/admin/views/users.py:620
 msgid "User global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:596
+#: rhodecode/apps/admin/views/users.py:638
 #: rhodecode/apps/user_group/views/__init__.py:479
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:619
+#: rhodecode/apps/admin/views/users.py:661
 msgid "Force password change enabled for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:627
-#: rhodecode/apps/admin/views/users.py:657
+#: rhodecode/apps/admin/views/users.py:669
+#: rhodecode/apps/admin/views/users.py:699
 msgid "An error occurred during password reset for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:648
+#: rhodecode/apps/admin/views/users.py:690
 msgid "Force password change disabled for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:695
+#: rhodecode/apps/admin/views/users.py:737
 #, python-format
 msgid "Linked repository group `%s` as personal"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:701
+#: rhodecode/apps/admin/views/users.py:743
 #, python-format
 msgid "Created repository group `%s`"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:705
+#: rhodecode/apps/admin/views/users.py:747
 #, python-format
 msgid "Repository group `%s` is already taken"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:710
+#: rhodecode/apps/admin/views/users.py:752
 msgid "An error occurred during repository group creation for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:733
-#: rhodecode/apps/my_account/views/my_account.py:161
+#: 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
 msgid "Role"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:772
-#: rhodecode/apps/my_account/views/my_account.py:196
+#: rhodecode/apps/admin/views/users.py:814
+#: rhodecode/apps/my_account/views/my_account.py:195
 msgid "Auth token successfully created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:801
-#: rhodecode/apps/my_account/views/my_account.py:220
+#: rhodecode/apps/admin/views/users.py:843
+#: rhodecode/apps/my_account/views/my_account.py:219
 msgid "Auth token successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:874
+#: rhodecode/apps/admin/views/users.py:916
 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:114
 msgid "Ssh Key successfully created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:880
-#: rhodecode/apps/admin/views/users.py:884
+#: 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
 msgid "An error occurred during ssh key saving: {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:918
+#: rhodecode/apps/admin/views/users.py:960
 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:154
 msgid "Ssh key successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:964
+#: rhodecode/apps/admin/views/users.py:1006
 #, python-format
 msgid "Added new email address `%s` for user account"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:970
+#: rhodecode/apps/admin/views/users.py:1012
 msgid "Email `{}` is already registered for another user."
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:974
+#: rhodecode/apps/admin/views/users.py:1016
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1001
+#: rhodecode/apps/admin/views/users.py:1043
 msgid "Removed email address from user account"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1047
+#: rhodecode/apps/admin/views/users.py:1089
 #, python-format
 msgid "An error occurred during ip saving:%s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1069
+#: rhodecode/apps/admin/views/users.py:1111
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1073
+#: rhodecode/apps/admin/views/users.py:1115
 #, python-format
 msgid "Added ips %s to user whitelist"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1103
+#: rhodecode/apps/admin/views/users.py:1145
 msgid "Removed ip address from user whitelist"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1168
+#: rhodecode/apps/admin/views/users.py:1210
 msgid "Groups successfully changed"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1262
+#: rhodecode/apps/admin/views/users.py:1330
 msgid "Deleted {} cache keys"
 msgstr ""
 
@@ -562,9 +573,10 b' msgstr ""'
 msgid "1 month"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:44668
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
-#: rhodecode/public/js/src/rhodecode.js:502
+#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:50068
+#: rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
+#: rhodecode/public/js/src/rhodecode.js:621
 msgid "Lifetime"
 msgstr ""
 
@@ -576,158 +588,170 b' msgstr ""'
 msgid "Can be accessed by anonymous users"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:213
+#: rhodecode/apps/gist/views.py:218
 msgid "Error occurred during gist creation"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:237
+#: rhodecode/apps/gist/views.py:242
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:325
-#: rhodecode/templates/admin/gists/show.mako:74
+#: 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:324
+#: rhodecode/templates/data_table/_dt_elements.mako:333
 msgid "never"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:331
+#: rhodecode/apps/gist/views.py:336
 #, python-format
 msgid "%(expiry)s - current value"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:376
-msgid "Successfully updated gist content"
-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:384
+#: rhodecode/apps/gist/views.py:389
 msgid "Error occurred during update of gist {}: {}"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:388
+#: rhodecode/apps/gist/views.py:393
 #, python-format
 msgid "Error occurred during update of gist %s"
 msgstr ""
 
-#: rhodecode/apps/home/views.py:388
-#: rhodecode/apps/repository/views/repo_pull_requests.py:878
-#: rhodecode/templates/admin/my_account/my_account.mako:42
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:198
+#: 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/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:103
-#: rhodecode/templates/base/base.mako:122
-#: rhodecode/templates/base/base.mako:944
+#: rhodecode/templates/base/base.mako:107
+#: rhodecode/templates/base/base.mako:126
+#: rhodecode/templates/base/base.mako:1111
 msgid "Repositories"
 msgstr ""
 
-#: rhodecode/apps/home/views.py:415
+#: rhodecode/apps/home/views.py:424
 #: 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:197
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:198
 msgid "Repository Groups"
 msgstr ""
 
-#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178
+#: rhodecode/apps/journal/views.py:133 rhodecode/apps/journal/views.py:179
 msgid "public journal"
 msgstr ""
 
-#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:182
+#: 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:400
+#: rhodecode/apps/login/views.py:304 rhodecode/apps/login/views.py:403
 msgid "Bad captcha"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:332
-msgid "You have successfully registered with RhodeCode"
-msgstr ""
-
-#: rhodecode/apps/login/views.py:369
+#: 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:382
+#: rhodecode/apps/login/views.py:385
 msgid "Password reset has been disabled."
 msgstr ""
 
-#: rhodecode/apps/login/views.py:471
+#: rhodecode/apps/login/views.py:474
 msgid "Given reset token is invalid"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:479
+#: 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:136
+#: rhodecode/apps/my_account/views/my_account.py:135
 msgid "Error occurred during update of user password"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:143
+#: rhodecode/apps/my_account/views/my_account.py:142
 msgid "Successfully updated password"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:284
+#: rhodecode/apps/my_account/views/my_account.py:283
 msgid "Error occurred during adding email"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:287
+#: rhodecode/apps/my_account/views/my_account.py:286
 msgid "Successfully added email"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:309
+#: rhodecode/apps/my_account/views/my_account.py:308
 msgid "Email successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:476
+#: rhodecode/apps/my_account/views/my_account.py:518
+msgid "Position {} is defined twice. Please correct this error."
+msgstr ""
+
+#: rhodecode/apps/my_account/views/my_account.py:531
 msgid "Update Bookmarks"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:478
-msgid "Failed to update bookmarks. Make sure an unique position is used"
-msgstr ""
-
-#: rhodecode/apps/my_account/views/my_account.py:629
+#: rhodecode/apps/my_account/views/my_account.py:533
+msgid "Failed to update bookmarks. Make sure an unique position is used."
+msgstr ""
+
+#: rhodecode/apps/my_account/views/my_account.py:685
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:636
+#: rhodecode/apps/my_account/views/my_account.py:692
 msgid "Error occurred during update of user"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98
+#: rhodecode/apps/repo_group/views/repo_group_advanced.py:57
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:77
+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:102
+#: 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:76
+#: rhodecode/apps/repo_group/views/repo_group_permissions.py:74
 #: 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:100
+#: rhodecode/apps/repo_group/views/repo_group_permissions.py:98
 msgid "Repository Group permissions updated"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_settings.py:173
+#: 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:178
+#: rhodecode/apps/repo_group/views/repo_group_settings.py:179
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
@@ -742,7 +766,7 b' 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:727
+#: rhodecode/apps/repository/views/repo_pull_requests.py:728
 msgid "There are no commits yet"
 msgstr ""
 
@@ -752,32 +776,32 b' msgstr ""'
 msgid "No such commit exists for this repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_checks.py:102
+#: rhodecode/apps/repository/views/repo_checks.py:103
 #, python-format
 msgid "Created repository %s from %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_checks.py:111
+#: rhodecode/apps/repository/views/repo_checks.py:112
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_checks.py:114
+#: rhodecode/apps/repository/views/repo_checks.py:115
 #, python-format
 msgid "Created repository %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:110
+#: rhodecode/apps/repository/views/repo_commits.py:111
 msgid "No such commit exists. Org exception: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:326
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1347
+#: rhodecode/apps/repository/views/repo_commits.py:330
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1362
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:371
+#: 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 ""
 
@@ -806,12 +830,12 b' msgstr ""'
 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:69
+#: rhodecode/apps/repository/views/repo_feed.py:68
 #, python-format
 msgid "Changes on %s repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_feed.py:70
+#: rhodecode/apps/repository/views/repo_feed.py:69
 #, python-format
 msgid "%s %s feed"
 msgstr ""
@@ -838,108 +862,108 b' msgstr ""'
 msgid "There are no files yet. %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:325
+#: rhodecode/apps/repository/views/repo_files.py:341
 msgid "Downloads disabled"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:331
+#: rhodecode/apps/repository/views/repo_files.py:347
 msgid "Unknown archive type for: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:337
+#: rhodecode/apps/repository/views/repo_files.py:353
 msgid "Unknown commit_id {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:340
+#: rhodecode/apps/repository/views/repo_files.py:356
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:345
+#: rhodecode/apps/repository/views/repo_files.py:361
 msgid "No node at path {} for this repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:394
+#: rhodecode/apps/repository/views/repo_files.py:410
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:963
+#: rhodecode/apps/repository/views/repo_files.py:989
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:984
-#: rhodecode/apps/repository/views/repo_summary.py:346
-#: rhodecode/model/pull_request.py:1456 rhodecode/model/scm.py:918
+#: rhodecode/apps/repository/views/repo_files.py:1010
+#: rhodecode/apps/repository/views/repo_summary.py:264
+#: rhodecode/model/pull_request.py:1572 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:988 rhodecode/model/scm.py:933
-#: rhodecode/templates/base/vcs_settings.mako:260
+#: rhodecode/apps/repository/views/repo_files.py:1014
+#: 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:1092
-#: rhodecode/apps/repository/views/repo_files.py:1120
+#: rhodecode/apps/repository/views/repo_files.py:1118
+#: rhodecode/apps/repository/views/repo_files.py:1146
 msgid "Deleted file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1141
+#: rhodecode/apps/repository/views/repo_files.py:1167
 msgid "Successfully deleted file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1145
-#: rhodecode/apps/repository/views/repo_files.py:1262
-#: rhodecode/apps/repository/views/repo_files.py:1393
-#: rhodecode/apps/repository/views/repo_files.py:1516
+#: 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
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1177
-#: rhodecode/apps/repository/views/repo_files.py:1208
+#: rhodecode/apps/repository/views/repo_files.py:1203
+#: rhodecode/apps/repository/views/repo_files.py:1234
 msgid "Edited file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1231
+#: rhodecode/apps/repository/views/repo_files.py:1257
 msgid "No changes detected on {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1255
+#: rhodecode/apps/repository/views/repo_files.py:1281
 msgid "Successfully committed changes to file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1296
-#: rhodecode/apps/repository/views/repo_files.py:1337
+#: rhodecode/apps/repository/views/repo_files.py:1322
+#: rhodecode/apps/repository/views/repo_files.py:1363
 msgid "Added file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1353
+#: rhodecode/apps/repository/views/repo_files.py:1379
 msgid "No filename specified"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1378
+#: rhodecode/apps/repository/views/repo_files.py:1404
 msgid "Successfully committed new file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1386
-#: rhodecode/apps/repository/views/repo_files.py:1498
+#: rhodecode/apps/repository/views/repo_files.py:1412
+#: rhodecode/apps/repository/views/repo_files.py:1524
 msgid "The location specified must be a relative path and must not contain .. in the path"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1443
+#: rhodecode/apps/repository/views/repo_files.py:1469
 msgid "Uploaded file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1487
+#: rhodecode/apps/repository/views/repo_files.py:1513
 msgid "Successfully committed {} new files"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1489
+#: rhodecode/apps/repository/views/repo_files.py:1515
 msgid "Successfully committed 1 new file"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_forks.py:147
+#: rhodecode/apps/repository/views/repo_forks.py:146
 msgid "Compare fork"
 msgstr ""
 
@@ -948,185 +972,186 b' msgstr ""'
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_permissions.py:57
+#: rhodecode/apps/repository/views/repo_permissions.py:55
 msgid "Explicitly add user or user group with write+ permission to modify their branch permissions."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_permissions.py:92
-msgid "Repository permissions updated"
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_pull_requests.py:278
-msgid "Cannot show pull requests in state other than `{}`. Current state is: `{}`"
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_pull_requests.py:757
+#: rhodecode/apps/repository/views/repo_permissions.py:90
+msgid "Repository access permissions updated"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_permissions.py:112
+msgid "Repository `{}` private mode set successfully"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_permissions.py:116
+#: 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
 msgid "Commit does not exist"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:909
+#: rhodecode/apps/repository/views/repo_pull_requests.py:910
 msgid "Error creating pull request: {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:928
+#: rhodecode/apps/repository/views/repo_pull_requests.py:929
 msgid "source_repo or target repo not found"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:939
+#: rhodecode/apps/repository/views/repo_pull_requests.py:940
 msgid "Not Enough permissions to source repo `{}`."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:954
+#: rhodecode/apps/repository/views/repo_pull_requests.py:955
 msgid "Not Enough permissions to target repo `{}`."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1017
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1018
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1020
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1021
 msgid "Error occurred during creation of this pull request."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1051
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1094
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1053
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1108
 msgid "Cannot update closed pull requests."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1058
-msgid "Cannot update pull requests in state other than `{}`. Current state is: `{}`"
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1100
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1075
+msgid "Cannot update pull requests commits in state other than `{}`. Current state is: `{}`"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1114
 msgid "Pull request title & description updated."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1121
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1136
 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:1135
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1150
 msgid "Reload page"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1170
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1185
 msgid "Cannot merge pull requests in state other than `{}`. Current state is: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1216
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1231
 msgid "Pull request was successfully merged and closed."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1240
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1255
 msgid "Pull request reviewers updated."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1273
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1288
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:171
+#: rhodecode/apps/repository/views/repo_settings.py:172
 msgid "Repository `{}` updated successfully"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:175
-msgid "Error occurred during update of repository {}"
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_settings.py:208
+#: rhodecode/apps/repository/views/repo_settings.py:209
 msgid "Unlocked"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:213
+#: rhodecode/apps/repository/views/repo_settings.py:214
 msgid "Locked"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:215
+#: rhodecode/apps/repository/views/repo_settings.py:216
 #, python-format
 msgid "Repository has been %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:219
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:290
+#: rhodecode/apps/repository/views/repo_settings.py:220
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:297
 msgid "An error occurred during unlocking"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:263
+#: 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:99
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:106
 #, python-format
 msgid "Archived repository `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:104
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:111
 #, python-format
 msgid "An error occurred during archiving of `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:142
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:149
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:144
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:151
 #, python-format
 msgid "Deleted %s forks"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:153
-#, python-format
-msgid "Deleted repository `%s`"
-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:161
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:168
 msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:176
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:183
 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:185
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:192
 #, python-format
 msgid "An error occurred during deletion of `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:210
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:217
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:214
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:221
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:250
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:257
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:253
-#, python-format
-msgid "Marked repo %s as fork of %s"
-msgstr ""
-
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:260
+#, python-format
+msgid "Marked repo %s as fork of %s"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:267
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:284
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:291
 msgid "Locked repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:287
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:294
 msgid "Unlocked repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:307
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:314
 msgid "installed updated hooks into this repository"
 msgstr ""
 
@@ -1154,23 +1179,23 b' msgstr ""'
 msgid "Error occurred during updating repository VCS settings"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:322
+#: 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:323
+#: rhodecode/apps/repository/views/repo_summary.py:241
 #: rhodecode/templates/summary/components.mako:32
 msgid "Tag"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:324
+#: rhodecode/apps/repository/views/repo_summary.py:242
 #: rhodecode/templates/summary/components.mako:44
 msgid "Bookmark"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:347
+#: rhodecode/apps/repository/views/repo_summary.py:265
 msgid "Closed branches"
 msgstr ""
 
@@ -1230,12 +1255,13 b' msgid "Enable or disable this authentica'
 msgstr ""
 
 #: rhodecode/authentication/schema.py:38 rhodecode/integrations/schema.py:32
-#: 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: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/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 ""
 
@@ -1334,7 +1360,7 b' msgstr ""'
 msgid "Clean username"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_headers.py:98
+#: rhodecode/authentication/plugins/auth_headers.py:99
 msgid "Headers"
 msgstr ""
 
@@ -1390,7 +1416,7 b' 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:30
+#: 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"
@@ -1641,17 +1667,17 b' msgstr ""'
 msgid "user permissions change"
 msgstr ""
 
-#: rhodecode/forms/__init__.py:35 rhodecode/templates/admin/gists/new.mako:62
+#: 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/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:206
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84
+#: 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/repos/repo_edit_fields.mako:66
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:188
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:192
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:244
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44
 #: rhodecode/templates/admin/settings/settings_global.mako:141
@@ -1663,19 +1689,20 b' msgstr ""'
 #: 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:135
+#: rhodecode/templates/admin/users/user_edit_profile.mako:146
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:67
 #: rhodecode/templates/base/default_perms_box.mako:89
 msgid "Reset"
 msgstr ""
 
-#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54
+#: rhodecode/forms/__init__.py:36
+#: rhodecode/templates/admin/gists/gist_show.mako:57
 #: 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/notifications/notifications_data.mako:22
-#: rhodecode/templates/admin/notifications/notifications_show.mako:35
+#: 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
@@ -1683,23 +1710,21 b' msgstr ""'
 #: 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/base/issue_tracker_settings.mako:69
+#: 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:144
-#: rhodecode/templates/changeset/changeset_file_comment.mako:146
-#: rhodecode/templates/changeset/changeset_file_comment.mako:149
-#: rhodecode/templates/data_table/_dt_elements.mako:172
-#: rhodecode/templates/data_table/_dt_elements.mako:245
-#: rhodecode/templates/data_table/_dt_elements.mako:259
-#: rhodecode/templates/data_table/_dt_elements.mako:271
-#: rhodecode/templates/data_table/_dt_elements.mako:397
+#: 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/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
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:53
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:57
 msgid "Delete"
 msgstr ""
 
@@ -1755,11 +1780,11 b' msgstr ""'
 msgid "Integration {integration_name} deleted successfully."
 msgstr ""
 
-#: rhodecode/integrations/views.py:301
+#: rhodecode/integrations/views.py:305
 msgid "Errors exist when saving integration settings. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/integrations/views.py:326
+#: rhodecode/integrations/views.py:330
 msgid "Integration {integration_name} updated successfully."
 msgstr ""
 
@@ -1778,12 +1803,12 b' msgstr ""'
 
 #: rhodecode/integrations/types/email.py:174
 #: rhodecode/templates/register.mako:95
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:55
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:67
 #: rhodecode/templates/admin/users/user_add.mako:86
-#: rhodecode/templates/admin/users/user_edit_profile.mako:64
+#: rhodecode/templates/admin/users/user_edit_profile.mako:62
 #: rhodecode/templates/admin/users/users.mako:76
-#: rhodecode/templates/email_templates/user_registration.mako:25
-#: rhodecode/templates/users/user_profile.mako:58
+#: rhodecode/templates/email_templates/user_registration.mako:50
+#: rhodecode/templates/users/user_profile.mako:69
 msgid "Email"
 msgstr ""
 
@@ -1855,17 +1880,17 b' msgstr ""'
 #: rhodecode/integrations/types/webhook.py:79 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:25
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:27
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:23
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70
 #: rhodecode/templates/admin/users/user_add.mako:35
-#: rhodecode/templates/admin/users/user_edit_profile.mako:38
+#: rhodecode/templates/admin/users/user_edit_profile.mako:36
 #: rhodecode/templates/admin/users/users.mako:74
 #: rhodecode/templates/debug_style/login.html:36
-#: rhodecode/templates/email_templates/user_registration.mako:23
-#: rhodecode/templates/user_group/profile.mako:51
-#: rhodecode/templates/users/user_profile.mako:28
+#: 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 ""
 
@@ -2043,7 +2068,6 b' msgid "fork name %s"'
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:191
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:48
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
@@ -2076,24 +2100,23 b' msgstr ""'
 msgid "Commit not found"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1619
-#, python-format
-msgid "IP %s not allowed"
-msgstr ""
-
-#: rhodecode/lib/auth.py:1703
+#: rhodecode/lib/auth.py:1672
+msgid "IP {} not allowed"
+msgstr ""
+
+#: rhodecode/lib/auth.py:1764
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1747
+#: rhodecode/lib/auth.py:1808
 msgid "You need to be signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:900
+#: rhodecode/lib/diffs.py:902
 msgid "Click to select line"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1857
+#: rhodecode/lib/helpers.py:1706
 msgid ""
 "Example filter terms:\n"
 "     repository:vcs\n"
@@ -2115,45 +2138,46 b' msgid ""'
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1881
+#: rhodecode/lib/helpers.py:1730
 #, 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:536
-msgid "in ${ago}"
-msgstr ""
-
 #: rhodecode/lib/utils2.py:542
+msgid "in ${ago}"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:548
 msgid "${ago} ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:551
-msgid "${val}, ${detail}"
-msgstr ""
-
-#: rhodecode/lib/utils2.py:553
-msgid "${val}, ${detail} ago"
-msgstr ""
-
-#: rhodecode/lib/utils2.py:555
-msgid "in ${val}, ${detail}"
-msgstr ""
-
 #: rhodecode/lib/utils2.py:557
-msgid "${val} and ${detail}"
+msgid "${val}, ${detail}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:559
-msgid "${val} and ${detail} ago"
+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:565 rhodecode/public/js/scripts.js:25634
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92
+#: rhodecode/lib/utils2.py:571 rhodecode/public/js/scripts.js:25634
+#: rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
 msgid "just now"
 msgstr ""
@@ -2186,6 +2210,7 b' msgstr ""'
 #: 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_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
@@ -2193,7 +2218,7 b' msgstr ""'
 #: 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:2959
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:3061
 msgid "Repository no access"
 msgstr ""
 
@@ -2225,6 +2250,7 b' msgstr ""'
 #: 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_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
@@ -2232,7 +2258,7 b' msgstr ""'
 #: 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:2960
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:3062
 msgid "Repository read access"
 msgstr ""
 
@@ -2264,6 +2290,7 b' msgstr ""'
 #: 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_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
@@ -2271,7 +2298,7 b' msgstr ""'
 #: 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:2961
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:3063
 msgid "Repository write access"
 msgstr ""
 
@@ -2303,6 +2330,7 b' msgstr ""'
 #: 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_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
@@ -2310,7 +2338,7 b' msgstr ""'
 #: 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:2962
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:3064
 msgid "Repository admin access"
 msgstr ""
 
@@ -2382,6 +2410,7 b' msgstr ""'
 #: 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_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
@@ -2389,7 +2418,7 b' msgstr ""'
 #: 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:2985
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:3087
 msgid "Repository creation disabled"
 msgstr ""
 
@@ -2421,6 +2450,7 b' msgstr ""'
 #: 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_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
@@ -2428,7 +2458,7 b' msgstr ""'
 #: 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:2986
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:3088
 msgid "Repository creation enabled"
 msgstr ""
 
@@ -2460,6 +2490,7 b' msgstr ""'
 #: 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_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
@@ -2467,7 +2498,7 b' msgstr ""'
 #: 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:2990
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:3092
 msgid "Repository forking disabled"
 msgstr ""
 
@@ -2499,6 +2530,7 b' msgstr ""'
 #: 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_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
@@ -2506,7 +2538,7 b' msgstr ""'
 #: 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:2991
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:3093
 msgid "Repository forking enabled"
 msgstr ""
 
@@ -2559,6 +2591,7 b' msgstr ""'
 #: 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_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
@@ -2566,10 +2599,10 b' msgstr ""'
 #: 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:3712
-#: rhodecode/public/js/scripts.js:43644
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:319
+#: 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
 msgid "Not Reviewed"
 msgstr ""
 
@@ -2601,6 +2634,7 b' msgstr ""'
 #: 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_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
@@ -2608,7 +2642,7 b' msgstr ""'
 #: 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:3713
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3832
 msgid "Approved"
 msgstr ""
 
@@ -2640,6 +2674,7 b' msgstr ""'
 #: 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_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
@@ -2647,7 +2682,7 b' msgstr ""'
 #: 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:3714
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3833
 msgid "Rejected"
 msgstr ""
 
@@ -2679,6 +2714,7 b' msgstr ""'
 #: 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_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
@@ -2686,7 +2722,7 b' msgstr ""'
 #: 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:3715
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3834
 msgid "Under Review"
 msgstr ""
 
@@ -2715,6 +2751,7 b' msgstr ""'
 #: 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_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
@@ -2722,7 +2759,7 b' msgstr ""'
 #: 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:2964
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:3066
 msgid "Repository group no access"
 msgstr ""
 
@@ -2751,6 +2788,7 b' msgstr ""'
 #: 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_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
@@ -2758,7 +2796,7 b' msgstr ""'
 #: 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:2965
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:3067
 msgid "Repository group read access"
 msgstr ""
 
@@ -2787,6 +2825,7 b' msgstr ""'
 #: 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_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
@@ -2794,7 +2833,7 b' msgstr ""'
 #: 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:2966
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:3068
 msgid "Repository group write access"
 msgstr ""
 
@@ -2823,6 +2862,7 b' msgstr ""'
 #: 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_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
@@ -2830,7 +2870,7 b' msgstr ""'
 #: 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:2967
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:3069
 msgid "Repository group admin access"
 msgstr ""
 
@@ -2858,6 +2898,7 b' msgstr ""'
 #: 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_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
@@ -2865,7 +2906,7 b' msgstr ""'
 #: 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:2969
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:3071
 msgid "User group no access"
 msgstr ""
 
@@ -2893,6 +2934,7 b' msgstr ""'
 #: 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_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
@@ -2900,7 +2942,7 b' msgstr ""'
 #: 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:2970
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:3072
 msgid "User group read access"
 msgstr ""
 
@@ -2928,6 +2970,7 b' msgstr ""'
 #: 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_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
@@ -2935,7 +2978,7 b' msgstr ""'
 #: 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:2971
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:3073
 msgid "User group write access"
 msgstr ""
 
@@ -2963,6 +3006,7 b' msgstr ""'
 #: 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_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
@@ -2970,7 +3014,7 b' msgstr ""'
 #: 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:2972
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:3074
 msgid "User group admin access"
 msgstr ""
 
@@ -2998,6 +3042,7 b' msgstr ""'
 #: 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_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
@@ -3005,7 +3050,7 b' msgstr ""'
 #: 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:2979
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:3081
 msgid "Repository Group creation disabled"
 msgstr ""
 
@@ -3033,6 +3078,7 b' msgstr ""'
 #: 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_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
@@ -3040,7 +3086,7 b' msgstr ""'
 #: 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:2980
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:3082
 msgid "Repository Group creation enabled"
 msgstr ""
 
@@ -3068,6 +3114,7 b' msgstr ""'
 #: 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_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
@@ -3075,7 +3122,7 b' msgstr ""'
 #: 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:2982
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:3084
 msgid "User Group creation disabled"
 msgstr ""
 
@@ -3103,6 +3150,7 b' msgstr ""'
 #: 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_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
@@ -3110,7 +3158,7 b' msgstr ""'
 #: 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:2983
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:3085
 msgid "User Group creation enabled"
 msgstr ""
 
@@ -3138,6 +3186,7 b' msgstr ""'
 #: 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_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
@@ -3145,7 +3194,7 b' msgstr ""'
 #: 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:2993
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:3095
 msgid "Registration disabled"
 msgstr ""
 
@@ -3173,6 +3222,7 b' msgstr ""'
 #: 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_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
@@ -3180,7 +3230,7 b' msgstr ""'
 #: 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:2994
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:3096
 msgid "User Registration with manual account activation"
 msgstr ""
 
@@ -3208,6 +3258,7 b' msgstr ""'
 #: 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_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
@@ -3215,7 +3266,7 b' msgstr ""'
 #: 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:2995
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:3097
 msgid "User Registration with automatic account activation"
 msgstr ""
 
@@ -3243,6 +3294,7 b' msgstr ""'
 #: 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_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
@@ -3250,8 +3302,8 b' msgstr ""'
 #: 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:3001
-#: rhodecode/model/permission.py:105
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3103
+#: rhodecode/model/permission.py:106
 msgid "Manual activation of external account"
 msgstr ""
 
@@ -3279,6 +3331,7 b' msgstr ""'
 #: 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_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
@@ -3286,8 +3339,8 b' msgstr ""'
 #: 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:3002
-#: rhodecode/model/permission.py:106
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3104
+#: rhodecode/model/permission.py:107
 msgid "Automatic activation of external account"
 msgstr ""
 
@@ -3309,6 +3362,7 b' msgstr ""'
 #: 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_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
@@ -3316,7 +3370,7 b' msgstr ""'
 #: 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:2987
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:3089
 msgid "Repository creation enabled with write permission to a repository group"
 msgstr ""
 
@@ -3338,6 +3392,7 b' msgstr ""'
 #: 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_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
@@ -3345,7 +3400,7 b' msgstr ""'
 #: 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:2988
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:3090
 msgid "Repository creation disabled with write permission to a repository group"
 msgstr ""
 
@@ -3364,6 +3419,7 b' msgstr ""'
 #: 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_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
@@ -3371,7 +3427,7 b' msgstr ""'
 #: 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:2957
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:3059
 msgid "RhodeCode Super Administrator"
 msgstr ""
 
@@ -3388,6 +3444,7 b' msgstr ""'
 #: 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_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
@@ -3395,7 +3452,7 b' msgstr ""'
 #: 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:3004
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3106
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
@@ -3412,6 +3469,7 b' msgstr ""'
 #: 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_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
@@ -3419,7 +3477,7 b' msgstr ""'
 #: 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:3005
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3107
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
@@ -3428,6 +3486,7 b' msgstr ""'
 #: 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_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
@@ -3435,7 +3494,7 b' msgstr ""'
 #: 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:1134
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1178
 msgid "all"
 msgstr ""
 
@@ -3444,6 +3503,7 b' msgstr ""'
 #: 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_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
@@ -3451,7 +3511,7 b' msgstr ""'
 #: 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:1135
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1179
 msgid "http/web interface"
 msgstr ""
 
@@ -3460,6 +3520,7 b' msgstr ""'
 #: 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_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
@@ -3467,7 +3528,7 b' msgstr ""'
 #: 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:1136
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1180
 msgid "vcs (git/hg/svn protocol)"
 msgstr ""
 
@@ -3476,6 +3537,7 b' msgstr ""'
 #: 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_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
@@ -3483,7 +3545,7 b' msgstr ""'
 #: 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:1137
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1181
 msgid "api calls"
 msgstr ""
 
@@ -3492,6 +3554,7 b' msgstr ""'
 #: 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_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
@@ -3499,7 +3562,7 b' msgstr ""'
 #: 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:1138
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1182
 msgid "feed access"
 msgstr ""
 
@@ -3508,6 +3571,7 b' msgstr ""'
 #: 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_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
@@ -3515,7 +3579,7 b' msgstr ""'
 #: 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:2610
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2717
 msgid "No parent"
 msgstr ""
 
@@ -3524,9 +3588,10 b' msgstr ""'
 #: 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_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:2997
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:3099
 msgid "Password reset enabled"
 msgstr ""
 
@@ -3535,9 +3600,10 b' msgstr ""'
 #: 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_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:2998
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:3100
 msgid "Password reset hidden"
 msgstr ""
 
@@ -3546,9 +3612,10 b' msgstr ""'
 #: 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_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:2999
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:3101
 msgid "Password reset disabled"
 msgstr ""
 
@@ -3556,7 +3623,8 b' msgstr ""'
 #: 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/model/db.py:2974
+#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3002
+#: rhodecode/model/db.py:3076
 msgid "Branch no permissions"
 msgstr ""
 
@@ -3564,7 +3632,8 b' msgstr ""'
 #: 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/model/db.py:2975
+#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3003
+#: rhodecode/model/db.py:3077
 msgid "Branch access by web merge"
 msgstr ""
 
@@ -3572,7 +3641,8 b' msgstr ""'
 #: 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/model/db.py:2976
+#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3004
+#: rhodecode/model/db.py:3078
 msgid "Branch access by push"
 msgstr ""
 
@@ -3580,27 +3650,28 b' msgstr ""'
 #: 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/model/db.py:2977
+#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3005
+#: rhodecode/model/db.py:3079
 msgid "Branch access by push with force"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:164
+#: rhodecode/lib/index/whoosh.py:189
 msgid "Index Type"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:167
+#: rhodecode/lib/index/whoosh.py:192
 msgid "File Index"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:174
+#: rhodecode/lib/index/whoosh.py:193 rhodecode/lib/index/whoosh.py:199
 msgid "Indexed documents"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:175
+#: rhodecode/lib/index/whoosh.py:194 rhodecode/lib/index/whoosh.py:200
 msgid "Last update"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:173
+#: rhodecode/lib/index/whoosh.py:198
 msgid "Commit index"
 msgstr ""
 
@@ -3613,7 +3684,7 b' msgid "This pull request cannot be merge'
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:155
-msgid "This pull request cannot be merged because of merge conflicts."
+msgid "This pull request cannot be merged because of merge conflicts. {unresolved_files}"
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:157
@@ -3668,14 +3739,18 b' msgstr ""'
 msgid "1 month {end_date}"
 msgstr ""
 
-#: rhodecode/model/comment.py:422
+#: rhodecode/model/comment.py:473
 msgid "made a comment"
 msgstr ""
 
-#: rhodecode/model/comment.py:423
+#: 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 ""
@@ -3694,96 +3769,106 b' msgstr ""'
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/notification.py:244
+#: rhodecode/model/notification.py:245
 #, python-format
 msgid "%(user)s commented on commit %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:245
+#: rhodecode/model/notification.py:246
 #, python-format
 msgid "%(user)s commented on commit at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:248
-#, python-format
-msgid "%(user)s sent message %(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 at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:252
-#, python-format
-msgid "%(user)s mentioned you %(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 at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:256
-#, python-format
-msgid "%(user)s registered in RhodeCode %(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 at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:260
-#, python-format
-msgid "%(user)s opened new pull request %(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 at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:264
-#, python-format
-msgid "%(user)s commented on pull request %(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 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 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:196
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11
-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: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: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"
 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: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:273
-#: rhodecode/templates/changeset/changeset_file_comment.mako:323
-#: rhodecode/templates/data_table/_dt_elements.mako:411
-msgid "Write"
+#: 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"
 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
@@ -3805,153 +3890,154 b' msgstr ""'
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:14
 #: rhodecode/templates/admin/users/user_add.mako:11
 #: rhodecode/templates/admin/users/user_edit.mako:12
-#: rhodecode/templates/base/base.mako:639
+#: rhodecode/templates/base/base.mako:801
 msgid "Admin"
 msgstr ""
 
-#: rhodecode/model/permission.py:89
-msgid "Protected/No Access"
-msgstr ""
-
 #: rhodecode/model/permission.py:90
-msgid "Web merge"
+msgid "Protected/No Access"
 msgstr ""
 
 #: rhodecode/model/permission.py:91
-msgid "Push"
+msgid "Web merge"
 msgstr ""
 
 #: rhodecode/model/permission.py:92
+msgid "Push"
+msgstr ""
+
+#: rhodecode/model/permission.py:93
 msgid "Force Push"
 msgstr ""
 
-#: 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/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/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 "Hide password recovery link"
+msgid "Allow password recovery"
 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:80
+#: rhodecode/model/pull_request.py:90
 msgid "Pull request update successful."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:82
-msgid "Pull request update failed because of an unknown error."
-msgstr ""
-
-#: rhodecode/model/pull_request.py:84
-msgid "No update needed because the source and target have not changed."
-msgstr ""
-
-#: rhodecode/model/pull_request.py:86
-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:89
-msgid "This pull request cannot be updated because the target reference is missing."
-msgstr ""
-
 #: rhodecode/model/pull_request.py:92
+msgid "Pull request update failed because of an unknown error."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:94
+msgid "No update needed because the source and target have not changed."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:96
+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
+msgid "This pull request cannot be updated because the target reference is missing."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:102
 msgid "This pull request cannot be updated because the source reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1240
+#: rhodecode/model/pull_request.py:1355
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1242
+#: rhodecode/model/pull_request.py:1357
 msgid "This pull request is closed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1256
+#: rhodecode/model/pull_request.py:1371
 msgid "Pull request merging is not supported."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1275
+#: rhodecode/model/pull_request.py:1390
 msgid "Target repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1278
+#: rhodecode/model/pull_request.py:1393
 msgid "Source repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1455 rhodecode/model/scm.py:926
-#: rhodecode/templates/admin/my_account/my_account.mako:31
-#: rhodecode/templates/base/base.mako:469
+#: rhodecode/model/pull_request.py:1571 rhodecode/model/scm.py:1004
+#: rhodecode/templates/admin/my_account/my_account.mako:32
+#: rhodecode/templates/base/base.mako:633
 #: rhodecode/templates/summary/components.mako:46
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1460
+#: rhodecode/model/pull_request.py:1576
 msgid "Commit IDs"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1463
+#: rhodecode/model/pull_request.py:1579
 #: rhodecode/templates/summary/components.mako:22
 msgid "Closed Branches"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1629
+#: rhodecode/model/pull_request.py:1744
+msgid "WIP marker in title prevents from accidental merge."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:1755
 msgid "User `{}` not allowed to perform merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1647
+#: rhodecode/model/pull_request.py:1773
 msgid "Target branch `{}` changes rejected by rule {}."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1661
+#: rhodecode/model/pull_request.py:1787
 msgid "Pull request reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1675
+#: rhodecode/model/pull_request.py:1801
 msgid "Cannot merge, {} TODO still not resolved."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1678
+#: rhodecode/model/pull_request.py:1804
 msgid "Cannot merge, {} TODOs still not resolved."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1713
+#: rhodecode/model/pull_request.py:1839
 msgid "Merge strategy: rebase"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1718
+#: rhodecode/model/pull_request.py:1844
 msgid "Merge strategy: explicit merge commit"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1726
+#: rhodecode/model/pull_request.py:1852
 msgid "Source branch will be closed after merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1728
+#: rhodecode/model/pull_request.py:1854
 msgid "Source branch will be deleted after merge."
 msgstr ""
 
-#: rhodecode/model/scm.py:904
-msgid "latest tip"
-msgstr ""
-
 #: rhodecode/model/validators.py:93 rhodecode/model/validators.py:94
 msgid "Value cannot be an empty list"
 msgstr ""
@@ -4066,7 +4152,7 b' msgid "Repository group with name \\"%(re'
 msgstr ""
 
 #: rhodecode/model/validators.py:567
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:219
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:230
 msgid "Repository name cannot end with .git"
 msgstr ""
 
@@ -4089,7 +4175,7 b' msgid "You do not have the permission to'
 msgstr ""
 
 #: rhodecode/model/validators.py:680
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:125
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:136
 msgid "You do not have the permission to store repositories in the root location."
 msgstr ""
 
@@ -4102,8 +4188,8 b' msgid "This is not a valid path"'
 msgstr ""
 
 #: rhodecode/model/validators.py:871
-#: rhodecode/model/validation_schema/schemas/user_schema.py:141
-#: rhodecode/model/validation_schema/schemas/user_schema.py:145
+#: 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 ""
 
@@ -4240,29 +4326,29 b' msgid "Repo group owner with id `{}` doe'
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:204
+#: 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:209
+#: 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:55
+#: 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:91
+#: 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:94
+#: 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:119
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:123
+#: 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 ""
 
@@ -4282,7 +4368,7 b' msgstr ""'
 msgid "New password must be different to old password"
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/user_schema.py:174
+#: rhodecode/model/validation_schema/schemas/user_schema.py:183
 msgid "Additional emails can be specified at <a href=\"{}\">extra emails</a> page."
 msgstr ""
 
@@ -4290,398 +4376,418 b' msgstr ""'
 msgid ": , "
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:24109
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
+#: 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/src/plugins/jquery.autocomplete.js:87
 msgid "No results"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25569
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:121
+#: 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/src/plugins/jquery.timeago-extension.js:109
 msgid "{0} year"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25570
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113
+#: 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/src/plugins/jquery.timeago-extension.js:110
 msgid "{0} month"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25571
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
+#: 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/src/plugins/jquery.timeago-extension.js:111
 msgid "{0} day"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25572
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
+#: 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/src/plugins/jquery.timeago-extension.js:112
 msgid "{0} hour"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25573
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112
+#: 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/src/plugins/jquery.timeago-extension.js:113
 msgid "{0} min"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25574
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:118
+#: 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/src/plugins/jquery.timeago-extension.js:114
 msgid "{0} sec"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25594
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
+#: 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/src/plugins/jquery.timeago-extension.js:134
 msgid "in {0}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25602
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105
+#: 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/src/plugins/jquery.timeago-extension.js:142
 msgid "{0} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25614
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:123
+#: 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/src/plugins/jquery.timeago-extension.js:154
 msgid "{0}, {1} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25616
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91
+#: 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/src/plugins/jquery.timeago-extension.js:156
 msgid "in {0}, {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25620
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106
+#: 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/src/plugins/jquery.timeago-extension.js:160
 msgid "{0} and {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25622
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
+#: 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/src/plugins/jquery.timeago-extension.js:162
 msgid "{0} and {1} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25624
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90
+#: 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/src/plugins/jquery.timeago-extension.js:164
 msgid "in {0} and {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39683
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
+#: 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/rhodecode/i18n/select2/translations.js:4
 msgid "Loading more results..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39686
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
+#: 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/rhodecode/i18n/select2/translations.js:7
 msgid "Searching..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39689
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
+#: 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/rhodecode/i18n/select2/translations.js:10
 msgid "No matches found"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39692
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
+#: 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/rhodecode/i18n/select2/translations.js:13
 msgid "Loading failed"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39696
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
+#: 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/rhodecode/i18n/select2/translations.js:17
 msgid "One result is available, press enter to select it."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39698
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:117
+#: 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/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:39703
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
+#: 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/rhodecode/i18n/select2/translations.js:24
 msgid "Please enter {0} or more character"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39705
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
+#: 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/rhodecode/i18n/select2/translations.js:26
 msgid "Please enter {0} or more characters"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39710
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
+#: 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/rhodecode/i18n/select2/translations.js:31
 msgid "Please delete {0} character"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39712
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
+#: 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/rhodecode/i18n/select2/translations.js:33
 msgid "Please delete {0} characters"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39716
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80
+#: 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/rhodecode/i18n/select2/translations.js:37
 msgid "You can only select {0} item"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39718
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
+#: 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/rhodecode/i18n/select2/translations.js:39
 msgid "You can only select {0} items"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40656
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
+#: 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/src/rhodecode/changelog.js:35
 msgid "showing {0} out of {1} commit"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40658
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
+#: 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/src/rhodecode/changelog.js:37
 msgid "showing {0} out of {1} commits"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41194
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
-#: rhodecode/public/js/src/rhodecode/codemirror.js:364
+#: 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/src/rhodecode/codemirror.js:363
 msgid "Set status to Approved"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41213
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
+#: 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/src/rhodecode/codemirror.js:383
 msgid "Set status to Rejected"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41232
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
+#: 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/src/rhodecode/codemirror.js:402
-#: rhodecode/templates/email_templates/commit_comment.mako:102
-#: rhodecode/templates/email_templates/pull_request_comment.mako:107
 msgid "TODO comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41252
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
+#: 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/src/rhodecode/codemirror.js:422
 msgid "Note Comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41553 rhodecode/public/js/scripts.js:41907
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
+#: rhodecode/public/js/scripts.js:42496 rhodecode/public/js/scripts.js:42850
+#: rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
 #: 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:41568 rhodecode/public/js/scripts.js:41922
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
+#: rhodecode/public/js/scripts.js:42511 rhodecode/public/js/scripts.js:42865
+#: rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
 #: 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:41649 rhodecode/public/js/scripts.js:42117
-#: rhodecode/public/js/scripts.js:43030
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
+#: 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/src/rhodecode/codemirror.js:819
-#: rhodecode/public/js/src/rhodecode/comments.js:443
-#: rhodecode/public/js/src/rhodecode/files.js:493
-#: rhodecode/templates/files/files_browser_tree.mako:52
+#: rhodecode/public/js/src/rhodecode/comments.js:444
+#: rhodecode/public/js/src/rhodecode/files.js:495
+#: rhodecode/templates/files/files_browser_tree.mako:55
 msgid "Loading ..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41823
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
+#: 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/src/rhodecode/comments.js:149
 msgid "resolve comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42066
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
-#: rhodecode/public/js/src/rhodecode/comments.js:392
+#: 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
 msgid "Submitting..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42231
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
-#: rhodecode/public/js/src/rhodecode/comments.js:557
+#: 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:42305
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
-#: rhodecode/public/js/src/rhodecode/comments.js:631
+#: 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:42382
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
-#: rhodecode/public/js/src/rhodecode/comments.js:708
+#: 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
 msgid "Leave a comment on line {0}."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42507
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
-#: rhodecode/public/js/src/rhodecode/comments.js:833
+#: 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
 msgid "TODO from comment {0} was fixed."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42785
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100
+#: 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/src/rhodecode/files.js:248
 msgid "truncated result"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42787
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
+#: 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/src/rhodecode/files.js:250
 msgid "truncated results"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42796
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
+#: 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/src/rhodecode/files.js:259
 msgid "No matching files"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42854
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
+#: 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/src/rhodecode/files.js:317
 msgid "Selection link"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42946
-#: rhodecode/public/js/src/rhodecode/files.js:409
+#: rhodecode/public/js/scripts.js:43981 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
+#: rhodecode/public/js/src/rhodecode/files.js:410
 msgid "All Authors"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43081
+#: 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/src/rhodecode/followers.js:26
 msgid "Stopped watching this repository"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43082
+#: 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/src/rhodecode/followers.js:27
-#: rhodecode/templates/base/base.mako:226
+#: rhodecode/templates/base/base.mako:301
 msgid "Watch"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43085
+#: 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/src/rhodecode/followers.js:30
 msgid "Started watching this repository"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43086
+#: 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/src/rhodecode/followers.js:31
-#: rhodecode/templates/base/base.mako:224
+#: rhodecode/templates/base/base.mako:299
 msgid "Unwatch"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43459
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:134
-msgid "All reviewers must vote."
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:43468
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:143
-msgid "All individual reviewers must vote."
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:43473
+#: rhodecode/public/js/scripts.js:44495 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:148
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:135
+msgid "All reviewers must vote."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:44504 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:144
+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:43479
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:154
+#: rhodecode/public/js/scripts.js:44515 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} reviewers must vote."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43495
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:170
+#: 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
 msgid "Reviewers picked from source code changes."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43502
+#: rhodecode/public/js/scripts.js:44538 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:177
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:178
 msgid "Adding new reviewers is forbidden."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43509
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:184
+#: 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
 msgid "Author is not allowed to be a reviewer."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43523
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:198
+#: 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
 msgid "Commit Authors are not allowed to be a reviewer."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43631
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:306
+#: 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
 msgid "User `{0}` not allowed to be a reviewer"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43637
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:312
+#: 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
 msgid "User `{0}` already in reviewers"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43725
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:400
+#: 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
 msgid "added manually by \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43729
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:404
+#: 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
 msgid "member of \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44310
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
+#: 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
+msgid "Updating..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:44963 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:618
+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/src/rhodecode.js:144
 msgid "file"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44704
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
-#: rhodecode/public/js/src/rhodecode.js:538
+#: rhodecode/public/js/scripts.js:49735 rhodecode/public/js/scripts.min.js:1
+#: 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
 msgid "date not in future"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:44712
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
-#: rhodecode/public/js/src/rhodecode.js:546
+#: 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
 msgid "Specified expiration date"
 msgstr ""
 
@@ -4690,248 +4796,260 b' msgid "(from usergroup {0})"'
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
-#: rhodecode/templates/codeblocks/diffs.mako:506
-#: rhodecode/templates/codeblocks/diffs.mako:511
+#: rhodecode/templates/codeblocks/diffs.mako:594
+#: rhodecode/templates/codeblocks/diffs.mako:598
 msgid "Add another comment"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
-msgid "Changed files"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
+msgid "Changed files"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
 #: rhodecode/public/js/src/i18n_messages.js:5
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:329
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:288
 msgid "Close"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
 msgid "Context file: "
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
-msgid "Diff to Commit "
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
-msgid "Fetching repository state failed. Error code: {0} {1}. Try <a href=\"{2}\">refreshing</a> this page."
+msgid "Diff to Commit "
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
-msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page."
+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:19
-msgid "Follow"
+msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
-msgid "Hide full context diff"
+msgid "Follow"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
-msgid "Hide whitespace changes"
+msgid "Hide full context diff"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
+msgid "Hide whitespace changes"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
 #: rhodecode/public/js/src/i18n_messages.js:4
 msgid "Invite reviewers to this discussion"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
-msgid "No bookmarks available yet."
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30
-msgid "No branches available yet."
+msgid "No bookmarks available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31
-msgid "No forks available yet."
+msgid "No branches available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:32
+msgid "No forks available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
 msgid "No gists available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
-msgid "No pull requests available yet."
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36
-msgid "No repositories available yet."
+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."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
-msgid "No ssh keys available yet."
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:40
-msgid "No tags available yet."
+msgid "No ssh keys available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
-msgid "No user groups available yet."
+msgid "No tags available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:42
+msgid "No user groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43
 msgid "No users available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
-#: rhodecode/templates/commits/changelog.mako:78
-msgid "Open new pull request"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
+#: rhodecode/templates/commits/changelog.mako:78
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
 msgid "Open new pull request for selected commit"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
 msgid "Saving..."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
+#: 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"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
 msgid "Show at Commit "
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
-msgid "Show full context diff"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:39
-msgid "Show more"
+msgid "Show commit range {0} ... {1}"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
-msgid "Show selected commit __S"
+msgid "Show full context diff"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
-msgid "Show selected commits __S ... __E"
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:39
+msgid "Show more"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
-msgid "Show whitespace changes"
+msgid "Show selected commit __S"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
+msgid "Show selected commits __S ... __E"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
-msgid "Start following this repository"
+msgid "Show whitespace changes"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
-msgid "Stop following this repository"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
-#: rhodecode/public/js/src/i18n_messages.js:7
-msgid "Switch to chat"
+msgid "Start following this repository"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
-#: rhodecode/public/js/src/i18n_messages.js:8
-msgid "Switch to comment"
+msgid "Stop following this repository"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:74
-msgid "There are currently no open pull requests requiring your participation."
+#: rhodecode/public/js/src/i18n_messages.js:7
+msgid "Switch to chat"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:75
+#: rhodecode/public/js/src/i18n_messages.js:8
+msgid "Switch to comment"
+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"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80
 msgid "Unfollow"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77
-msgid "Updating..."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
-#: rhodecode/templates/admin/auth/auth_settings.mako:69
-msgid "activated"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
-msgid "disabled"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86
-msgid "enabled"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:88
+#: rhodecode/templates/admin/auth/auth_settings.mako:69
+msgid "activated"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91
+msgid "disabled"
+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:93
-#: rhodecode/templates/pullrequests/pullrequest.mako:135
-msgid "loading..."
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:95
-#: rhodecode/templates/admin/auth/auth_settings.mako:69
-msgid "not active"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
-msgid "specify commit"
+msgid "go to numeric commit"
+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
-msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
-msgid "{0} ({1} inactive) of {2} users ({3} inactive)"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104
-msgid "{0} active out of {1} users"
+#: rhodecode/templates/admin/auth/auth_settings.mako:69
+msgid "not active"
+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} days"
+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} hours"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:114
-msgid "{0} months"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:115
-msgid "{0} out of {1} ssh keys"
+msgid "{0} active out of {1} users"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:116
-msgid "{0} out of {1} users"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:119
-msgid "{0} user groups ({1} inactive)"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:120
-msgid "{0} users ({1} inactive)"
+msgid "{0} days"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:118
+msgid "{0} hours"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:121
+msgid "{0} months"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:122
+msgid "{0} of {1} repository groups"
+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"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:128
+msgid "{0} user groups ({1} inactive)"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:129
+msgid "{0} users ({1} inactive)"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:131
 msgid "{0} years"
 msgstr ""
 
@@ -4943,58 +5061,45 b' msgstr ""'
 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/admin/main.mako:34
-#: rhodecode/templates/admin/repos/repo_add.mako:22
-#: rhodecode/templates/admin/repos/repos.mako:31
-#: rhodecode/templates/base/base.mako:410
-msgid "Add Repository"
-msgstr ""
-
-#: rhodecode/templates/index_base.mako:24
-#: 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
-#: rhodecode/templates/base/base.mako:413
-msgid "Add Repository Group"
-msgstr ""
-
-#: rhodecode/templates/index_base.mako:47
 msgid "No repositories or repositories groups exists here."
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:65
-#: rhodecode/templates/index_base.mako:98
-#: rhodecode/templates/admin/gists/index.mako:107
+#: rhodecode/templates/index_base.mako:62
+#: rhodecode/templates/index_base.mako:153
+#: rhodecode/templates/admin/gists/gist_index.mako:107
 #: rhodecode/templates/admin/integrations/list.mako:72
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55
-#: rhodecode/templates/admin/my_account/my_account_repos.mako:31
+#: 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:31
+#: 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:58
+#: 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/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:11
-#: rhodecode/templates/pullrequests/pullrequests.mako:81
+#: rhodecode/templates/files/files_browser_tree.mako:13
 #: rhodecode/templates/tags/tags.mako:57
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:68
-#: rhodecode/templates/index_base.mako:101
-#: rhodecode/templates/admin/gists/index.mako:109
+#: rhodecode/templates/index_base.mako:71
+#: rhodecode/templates/index_base.mako:162
+#: 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_ssh_keys.mako:10
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:57
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:44
@@ -5005,7 +5110,7 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repo_add_base.mako:66
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:170
-#: rhodecode/templates/admin/repos/repos.mako:61
+#: 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_groups.mako:78
@@ -5013,61 +5118,61 b' msgstr ""'
 #: 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/base/issue_tracker_settings.mako:10
-#: rhodecode/templates/changeset/changeset.mako:76
+#: rhodecode/templates/base/issue_tracker_settings.mako:78
 #: rhodecode/templates/compare/compare_commits.mako:21
-#: rhodecode/templates/email_templates/commit_comment.mako:89
-#: rhodecode/templates/email_templates/pull_request_review.mako:41
-#: rhodecode/templates/email_templates/pull_request_review.mako:75
+#: 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:49
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:166
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:480
+#: rhodecode/templates/pullrequests/pullrequest.mako:50
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:547
 #: 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:71
-#: rhodecode/templates/index_base.mako:104
+#: rhodecode/templates/index_base.mako:78
+#: rhodecode/templates/index_base.mako:169
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:80
-#: rhodecode/templates/admin/repos/repos.mako:64
+#: rhodecode/templates/admin/repos/repos.mako:91
 msgid "Last Change"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:76
-#: rhodecode/templates/index_base.mako:109
+#: rhodecode/templates/index_base.mako:91
+#: rhodecode/templates/index_base.mako:182
 #: 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:69
+#: 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_groups.mako:86
 #: rhodecode/templates/admin/users/user_edit_groups.mako:65
 #: rhodecode/templates/forks/forks.mako:58
 #: rhodecode/templates/summary/components.mako:148
-#: rhodecode/templates/user_group/profile.mako:24
+#: rhodecode/templates/user_group/profile.mako:35
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:107
-#: rhodecode/templates/admin/my_account/my_account_repos.mako:35
-#: rhodecode/templates/admin/my_account/my_account_watched.mako:35
-#: rhodecode/templates/admin/repos/repos.mako:67
+#: rhodecode/templates/index_base.mako:176
+#: rhodecode/templates/admin/repos/repos.mako:98
 #: rhodecode/templates/bookmarks/bookmarks.mako:64
 #: rhodecode/templates/branches/branches.mako:63
-#: rhodecode/templates/changeset/changeset.mako:33
 #: rhodecode/templates/compare/compare_commits.mako:19
-#: rhodecode/templates/email_templates/commit_comment.mako:49
-#: rhodecode/templates/email_templates/commit_comment.mako:88
-#: rhodecode/templates/files/file_authors_box.mako:26
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:478
+#: 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/search/search_commit.mako:9
 #: rhodecode/templates/summary/components.mako:117
 #: rhodecode/templates/summary/components.mako:125
@@ -5082,8 +5187,8 b' msgid "%s Repository group dashboard"'
 msgstr ""
 
 #: rhodecode/templates/index_repo_group.mako:13
-#: rhodecode/templates/base/base.mako:611
-#: rhodecode/templates/base/base.mako:612
+#: rhodecode/templates/base/base.mako:773
+#: rhodecode/templates/base/base.mako:774
 msgid "Home"
 msgstr ""
 
@@ -5121,7 +5226,7 b' msgid "Please contact "'
 msgstr ""
 
 #: rhodecode/templates/login.mako:84 rhodecode/templates/password_reset.mako:39
-#: rhodecode/templates/base/base.mako:50
+#: rhodecode/templates/base/base.mako:59
 msgid "Support"
 msgstr ""
 
@@ -5191,19 +5296,19 b' msgid "Re-enter password"'
 msgstr ""
 
 #: rhodecode/templates/register.mako:81
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:35
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:37
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:32
 #: rhodecode/templates/admin/users/user_add.mako:68
-#: rhodecode/templates/admin/users/user_edit_profile.mako:46
+#: rhodecode/templates/admin/users/user_edit_profile.mako:44
 #: 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:45
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:47
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:41
 #: rhodecode/templates/admin/users/user_add.mako:77
-#: rhodecode/templates/admin/users/user_edit_profile.mako:55
+#: rhodecode/templates/admin/users/user_edit_profile.mako:53
 #: rhodecode/templates/admin/users/users.mako:80
 msgid "Last Name"
 msgstr ""
@@ -5229,7 +5334,7 b' msgid "Audit long entry"'
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:34
-#: rhodecode/templates/users/user.mako:4 rhodecode/templates/users/user.mako:11
+#: rhodecode/templates/users/user.mako:4
 msgid "User"
 msgstr ""
 
@@ -5249,12 +5354,11 b' 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_repos.mako:37
 #: 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:73
+#: rhodecode/templates/admin/repos/repos.mako:116
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71
 #: rhodecode/templates/admin/user_groups/user_groups.mako:88
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:19
@@ -5279,16 +5383,16 b' msgstr ""'
 #: 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:486
-#: rhodecode/templates/base/base.mako:488
-#: rhodecode/templates/base/base.mako:490
+#: 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:102
+#: rhodecode/templates/base/base.mako:106
 msgid "Admin audit logs"
 msgstr ""
 
@@ -5298,7 +5402,7 b' 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:15
+#: rhodecode/templates/admin/users/user_edit_audit.mako:16
 #: rhodecode/templates/journal/journal.mako:13
 msgid "filter"
 msgstr ""
@@ -5311,7 +5415,7 b' 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:18
+#: rhodecode/templates/admin/users/user_edit_audit.mako:19
 #: rhodecode/templates/journal/journal.mako:16
 msgid "Example Queries"
 msgstr ""
@@ -5341,10 +5445,22 b' msgstr ""'
 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 ""
@@ -5393,24 +5509,20 b' 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:108
+#: 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_add.mako:77
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:205
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83
-#: rhodecode/templates/admin/repos/repo_add_base.mako:106
+#: 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:187
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:191
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:243
 #: rhodecode/templates/admin/settings/settings_hooks.mako:63
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15
-#: rhodecode/templates/admin/user_groups/user_group_add.mako:59
 #: 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_add.mako:128
 #: rhodecode/templates/admin/users/user_edit_groups.mako:27
-#: rhodecode/templates/admin/users/user_edit_profile.mako:134
+#: rhodecode/templates/admin/users/user_edit_profile.mako:145
 #: rhodecode/templates/base/default_perms_box.mako:88
 msgid "Save"
 msgstr ""
@@ -5429,22 +5541,23 b' msgid "Default Settings For New Reposito'
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14
-#: rhodecode/templates/admin/gists/index.mako:105
+#: rhodecode/templates/admin/gists/gist_index.mako:105
 #: rhodecode/templates/admin/integrations/list.mako:73
-#: rhodecode/templates/admin/repos/repo_add_base.mako:43
+#: rhodecode/templates/admin/repos/repo_add_base.mako:57
 #: 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:98
+#: rhodecode/templates/admin/repos/repo_add_base.mako:89
 msgid "Private Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27
-#: rhodecode/templates/admin/repos/repo_add_base.mako:102
+#: 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:95
+#: rhodecode/templates/forks/fork.mako:85
 msgid "Private repositories are only visible to people explicitly added as collaborators."
 msgstr ""
 
@@ -5472,88 +5585,85 b' msgstr ""'
 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/edit.mako:5
-#: rhodecode/templates/admin/gists/edit.mako:12
+#: rhodecode/templates/admin/gists/gist_edit.mako:5
 msgid "Edit Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.mako:33
-#: rhodecode/templates/admin/gists/new.mako:30
+#: 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/edit.mako:38
-#: rhodecode/templates/admin/gists/new.mako:38
-msgid "Gist lifetime"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/edit.mako:41
-#: rhodecode/templates/admin/gists/new.mako:41
-msgid "Gist access level"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/edit.mako:56
-#: rhodecode/templates/admin/gists/new.mako:50
+#: 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_edit.mako:69
 msgid "plain"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.mako:101
+#: rhodecode/templates/admin/gists/gist_edit.mako:99
 msgid "Update Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.mako:102
-#: rhodecode/templates/base/issue_tracker_settings.mako:73
-#: rhodecode/templates/changeset/changeset_file_comment.mako:392
-#: rhodecode/templates/codeblocks/diffs.mako:72
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:61
+#: 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/pullrequests/pullrequest_show.mako:75
 msgid "Cancel"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.mako:125
+#: 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/index.mako:6
+#: rhodecode/templates/admin/gists/gist_index.mako:6
 msgid "Private Gists for user {}"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:8
+#: rhodecode/templates/admin/gists/gist_index.mako:8
 msgid "Public Gists for user {}"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:10
+#: rhodecode/templates/admin/gists/gist_index.mako:10
 msgid "Public Gists"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:30
+#: rhodecode/templates/admin/gists/gist_index.mako:30
 msgid "All gists"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:32
+#: rhodecode/templates/admin/gists/gist_index.mako:32
 msgid "All public"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:34
+#: rhodecode/templates/admin/gists/gist_index.mako:34
 msgid "My gists"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:35
+#: rhodecode/templates/admin/gists/gist_index.mako:35
 msgid "My private"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:36
+#: rhodecode/templates/admin/gists/gist_index.mako:36
 msgid "My public"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:43
-#: rhodecode/templates/admin/gists/show.mako:35
+#: rhodecode/templates/admin/gists/gist_index.mako:43
 msgid "Create New Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:54
+#: rhodecode/templates/admin/gists/gist_index.mako:54
 #: 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
@@ -5564,27 +5674,27 b' msgstr ""'
 #: 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/index.mako:103
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57
+#: rhodecode/templates/admin/gists/gist_index.mako:103
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59
 #: rhodecode/templates/bookmarks/bookmarks.mako:61
 #: rhodecode/templates/branches/branches.mako:60
-#: rhodecode/templates/changeset/changeset.mako:195
 #: rhodecode/templates/commits/changelog.mako:119
 #: rhodecode/templates/compare/compare_commits.mako:18
-#: rhodecode/templates/files/files_browser_tree.mako:15
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:477
-#: rhodecode/templates/pullrequests/pullrequests.mako:83
-#: rhodecode/templates/search/search_commit.mako:19
+#: rhodecode/templates/files/files_browser_tree.mako:17
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:544
+#: 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/index.mako:111
+#: 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
@@ -5592,71 +5702,92 b' msgstr ""'
 #: 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
 msgid "Created on"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:113
-#: rhodecode/templates/admin/gists/show.mako:72
+#: rhodecode/templates/admin/gists/gist_index.mako:113
 msgid "Expires"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/new.mako:5
-#: rhodecode/templates/admin/gists/new.mako:12
+#: rhodecode/templates/admin/gists/gist_new.mako:5
+#: rhodecode/templates/base/base.mako:572
 msgid "New Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/new.mako:35
+#: rhodecode/templates/admin/gists/gist_new.mako:31
 msgid "Gist id"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/new.mako:36
+#: rhodecode/templates/admin/gists/gist_new.mako:32
 msgid "Auto generated"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/new.mako:49
-msgid "name this file..."
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.mako:60
-msgid "Create Private Gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.mako:61
-msgid "Create Public Gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.mako:13
-#: rhodecode/templates/admin/gists/show.mako:20
+#: 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
+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
+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/show.mako:47
+#: rhodecode/templates/admin/gists/gist_show.mako:41
 msgid "Copy the url"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/show.mako:54
-msgid "Confirm to delete this Gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.mako:60
+#: rhodecode/templates/admin/gists/gist_show.mako:47
+#: rhodecode/templates/files/files_source.mako:106
 msgid "Copy content"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/show.mako:65
+#: rhodecode/templates/admin/gists/gist_show.mako:52
 msgid "Show as Raw"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/show.mako:69
-msgid "Private Gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.mako:85
+#: rhodecode/templates/admin/gists/gist_show.mako:57
+msgid "Confirm to delete this Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/gist_show.mako:70
 msgid "created"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/show.mako:100
+#: rhodecode/templates/admin/gists/gist_show.mako:71
+msgid "expires"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/gist_show.mako:92
 #: rhodecode/templates/files/files_delete.mako:58
-#: rhodecode/templates/files/files_source.mako:133
+#: rhodecode/templates/files/files_source.mako:125
 msgid "Show as raw"
 msgstr ""
 
@@ -5676,7 +5807,7 b' msgstr ""'
 #: 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:109
+#: rhodecode/templates/base/base.mako:113
 msgid "Integrations"
 msgstr ""
 
@@ -5690,7 +5821,7 b' msgstr ""'
 #: 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/base/base.mako:111
+#: rhodecode/templates/base/base.mako:115
 msgid "Settings"
 msgstr ""
 
@@ -5746,6 +5877,7 b' msgid "Create one"'
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:132
+#: rhodecode/templates/hovercards/hovercard_pull_request.mako:19
 msgid "repo"
 msgstr ""
 
@@ -5790,7 +5922,7 b' msgid "No description available"'
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:5
-#: rhodecode/templates/base/base.mako:462
+#: rhodecode/templates/base/base.mako:617
 msgid "My account"
 msgstr ""
 
@@ -5799,16 +5931,21 b' msgid "My Account"'
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:29
-#: rhodecode/templates/email_templates/user_registration.mako:26
-#: rhodecode/templates/users/user.mako:29
+#: rhodecode/templates/email_templates/user_registration.mako:54
 msgid "Profile"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account.mako:32
-msgid "Auth Tokens"
+#: 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
@@ -5817,41 +5954,39 b' msgstr ""'
 msgid "SSH Keys"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account.mako:34
+#: 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:39
+#: rhodecode/templates/admin/my_account/my_account.mako:40
 msgid "External Identities"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account.mako:41
-#: rhodecode/templates/admin/users/user_edit.mako:45
-msgid "Emails"
-msgstr ""
-
 #: rhodecode/templates/admin/my_account/my_account.mako:43
-msgid "Watched"
+msgid "Owned Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:44
-#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42
-#: rhodecode/templates/base/base.mako:303
-#: rhodecode/templates/base/base.mako:466
-msgid "Pull Requests"
+msgid "Watched Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:45
-#: rhodecode/templates/admin/permissions/permissions.mako:14
-#: 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.mako:35
-#: rhodecode/templates/base/base.mako:107
-msgid "Permissions"
+#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42
+#: rhodecode/templates/base/base.mako:376
+#: rhodecode/templates/base/base.mako:621
+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 ""
 
@@ -5926,63 +6061,63 b' msgstr ""'
 msgid "Position"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:16
+#: 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:23
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:24
 msgid "Clear"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:29
+#: 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:33
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:34
 msgid "Redirect URL"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:43
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:44
 msgid "Repository template"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:49
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:50
 msgid "Repository group template"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:55
+#: 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:65
+#: 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:67
+#: 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:69
+#: 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:79
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:80
 msgid "Your Bookmarks"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:84
+#: 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:86
+#: 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:140
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:141
 msgid "repository"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:191
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:192
 msgid "repository group"
 msgstr ""
 
@@ -6016,15 +6151,15 b' msgstr ""'
 msgid "Source type"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_notifications.mako:22
+#: 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:34
+#: rhodecode/templates/admin/my_account/my_account_notifications.mako:16
 msgid "Notifications Status"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_notifications.mako:47
+#: rhodecode/templates/admin/my_account/my_account_notifications.mako:40
 msgid "Test Notifications"
 msgstr ""
 
@@ -6032,20 +6167,20 b' msgstr ""'
 msgid "Change Your Account Password"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:4
+#: 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:11
+#: 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:25
-#: rhodecode/templates/users/user_profile.mako:14
+#: rhodecode/templates/admin/users/user_edit_profile.mako:23
+#: rhodecode/templates/users/user_profile.mako:15
 msgid "Photo"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:59
-#: rhodecode/templates/users/user_profile.mako:62
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:71
+#: rhodecode/templates/users/user_profile.mako:73
 msgid "Missing email, please update your user email address."
 msgstr ""
 
@@ -6062,21 +6197,26 b' msgstr ""'
 msgid "Pull Requests You Participate In"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:51
 msgid "Target Repo"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55
+#: rhodecode/templates/pullrequests/pullrequests.mako:94
+msgid "Id"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57
 #: rhodecode/templates/admin/settings/settings_global.mako:9
-#: rhodecode/templates/email_templates/pull_request_review.mako:39
-#: rhodecode/templates/email_templates/pull_request_review.mako:72
-#: rhodecode/templates/pullrequests/pullrequest.mako:40
-#: rhodecode/templates/pullrequests/pullrequests.mako:85
+#: 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/pullrequests/pullrequests.mako:89
+#: rhodecode/templates/pullrequests/pullrequests.mako:102
 msgid "Last Update"
 msgstr ""
 
@@ -6131,15 +6271,15 b' msgid "Click add to use this generated S'
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:41
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:47
 #: 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_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:89
+#: rhodecode/templates/admin/users/user_edit_profile.mako:101
 #: rhodecode/templates/admin/users/users.mako:85
-#: rhodecode/templates/user_group/profile.mako:34
+#: rhodecode/templates/user_group/profile.mako:44
 msgid "Active"
 msgstr ""
 
@@ -6161,16 +6301,20 b' 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:40
+#: rhodecode/templates/admin/notifications/notifications_show.mako:42
+#: rhodecode/templates/debug_style/email_plain_rendered.mako:38
 msgid "Subject"
 msgstr ""
 
@@ -6188,7 +6332,8 b' msgid "All"'
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:41
-#: rhodecode/templates/changeset/changeset.mako:158
+#: rhodecode/templates/changeset/changeset.mako:172
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:656
 msgid "Comments"
 msgstr ""
 
@@ -6357,8 +6502,8 b' 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:104
-#: rhodecode/templates/base/base.mako:125
+#: rhodecode/templates/base/base.mako:108
+#: rhodecode/templates/base/base.mako:129
 msgid "Repository groups"
 msgstr ""
 
@@ -6371,10 +6516,10 b' 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:52
+#: rhodecode/templates/admin/repos/repo_add_base.mako:43
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33
-#: rhodecode/templates/base/base.mako:499
-#: rhodecode/templates/data_table/_dt_elements.mako:208
+#: rhodecode/templates/base/base.mako:666
+#: rhodecode/templates/data_table/_dt_elements.mako:215
 #: rhodecode/templates/forks/fork.mako:41
 msgid "Repository group"
 msgstr ""
@@ -6385,15 +6530,19 b' msgid "Plain text format with support of'
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:68
-#: rhodecode/templates/admin/repos/repo_add_base.mako:89
+#: rhodecode/templates/admin/repos/repo_add_base.mako:80
 msgid "Copy Parent Group Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72
-#: rhodecode/templates/admin/repos/repo_add_base.mako:93
+#: rhodecode/templates/admin/repos/repo_add_base.mako:84
 msgid "Copy permissions from parent repository group."
 msgstr ""
 
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:77
+msgid "Create Repository Group"
+msgstr ""
+
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:5
 #, python-format
 msgid "%s repository group settings"
@@ -6416,44 +6565,54 b' msgid "Updated on"'
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:11
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:10
-msgid "Cached Commit date"
+msgid "Cached Commit source"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:12
-msgid "Cached Commit repo_id"
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:14
-msgid "Is Personal Group"
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:16
-msgid "Total repositories"
+#: 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 "Top level repositories"
+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:25
+#: 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:35
+#: 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:64
+#: 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:65
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:68
 msgid "Delete this repository group"
 msgstr ""
 
@@ -6470,7 +6629,7 b' 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
-msgid "super admin"
+msgid "super-admin"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:35
@@ -6496,9 +6655,9 b' 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:156
+#: 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:151
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:155
 #: 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
@@ -6510,27 +6669,27 b' msgstr ""'
 msgid "delegated admin"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:151
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:146
+#: 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
 msgid "members"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:183
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:178
+#: 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:193
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:194
 msgid "Apply to children"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:199
-msgid "Both"
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:200
+msgid "Both"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:201
 msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen."
 msgstr ""
 
@@ -6546,22 +6705,10 b' msgstr ""'
 msgid "Change owner of this repository group."
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72
-msgid "Enable Repository Locking"
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78
-msgid "Repository locking will be enabled on all subgroups and repositories inside this repository group. Pulling from a repository locks it, and it is unlocked by pushing back by the same user."
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:5
 msgid "Repository groups administration"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_groups.mako:26
-msgid "repository groups"
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:82
 msgid "Number of top level repositories"
 msgstr ""
@@ -6579,41 +6726,34 b' msgid "Import Existing Repository ?"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:23
-#: rhodecode/templates/base/base.mako:248
+#: rhodecode/templates/base/base.mako:323
 msgid "Clone from"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.mako:47
-msgid "Set the type of repository to create."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.mako:58
+#: 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:61
+#: 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
+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:80
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:141
-#: rhodecode/templates/forks/fork.mako:71
-msgid "Landing commit"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.mako:84
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:146
-#: rhodecode/templates/forks/fork.mako:75
-msgid "The default commit for file pages, downloads, full text search index, and README generation."
+#: rhodecode/templates/admin/repos/repo_add_base.mako:97
+msgid "Create Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.mako:5
@@ -6630,8 +6770,11 b' msgid "Repository \\"%(repo_name)s\\" is b'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:8
-#, python-format
-msgid "%s repository settings"
+msgid "{} repository settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.mako:45
+msgid "Access Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:48
@@ -6685,133 +6828,129 b' msgstr ""'
 msgid "Repository ID"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9
-msgid "Cached Commit id"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:11
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:12
 msgid "Attached scoped tokens"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:12
-msgid "Pull requests source"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:13
-msgid "Pull requests target"
+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:20
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:21
 #, python-format
 msgid "Repository: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31
 msgid "Fork Reference"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36
+#: 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:42
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:43
 msgid "Set"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:45
+#: 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:54
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55
 msgid "Public Journal Visibility"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:61
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:62
 msgid "Remove from Public Journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:66
 msgid "Add to Public Journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:70
+#: 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:79
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:80
 msgid "Locking state"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:88
+#: 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:95
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96
 msgid "Confirm to unlock repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98
 msgid "Unlock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:102
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:103
 msgid "Confirm to lock repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105
 msgid "Lock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:110
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:111
 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:120
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:121
 msgid "Hooks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124
-msgid "Hook type"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125
-msgid "Hook version"
+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 "Current version"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130
 msgid "PRE HOOK"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:134
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:135
 msgid "POST HOOK"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141
 msgid "Unable to read hook information from VCS Server"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146
-msgid "Confirm to reinstall hooks for this repository."
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:147
+msgid "Confirm to reinstall hooks for this repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:148
 msgid "Update Hooks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:154
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:155
 msgid "Archive repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:163
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:164
 #, python-format
 msgid "Confirm to archive this repository: %s"
 msgstr ""
@@ -6841,24 +6980,24 b' msgid "Consider to archive this reposito'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:219
-#: rhodecode/templates/data_table/_dt_elements.mako:173
+#: 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:221
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:220
 msgid "Delete this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:226
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:225
 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:260
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:259
 msgid "Change repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:260
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:259
 msgid "Pick repository"
 msgstr ""
 
@@ -6867,7 +7006,7 b' msgid "Repository Audit Logs"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:14
-#: rhodecode/templates/admin/users/user_edit_audit.mako:14
+#: rhodecode/templates/admin/users/user_edit_audit.mako:15
 msgid "audit filter..."
 msgstr ""
 
@@ -6895,45 +7034,59 b' msgstr ""'
 msgid "Confirm to invalidate repository cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:39
-#: rhodecode/templates/admin/repos/repo_edit_fields.mako:11
-msgid "Key"
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:32
+msgid "Invalidation keys"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:40
-msgid "Namespace"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:58
-msgid "Cache keys"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:77
+#: 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:95
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:44
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:88
+#: rhodecode/templates/admin/repos/repo_edit_fields.mako:11
+msgid "Key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:45
+msgid "State UID"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:46
+msgid "Namespace"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:65
+msgid "Cache keys"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:89
+msgid "Region"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:106
 msgid "Shadow Repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:107
-msgid "No Shadow repositories exist for this repository."
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:118
+msgid "No Shadow repositories exist for this repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:129
 msgid "Diff Caches"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:123
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:137
 msgid "Cached diff name"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:131
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:145
 msgid "Cached diff files"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:135
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:149
 msgid "Cached diff size"
 msgstr ""
 
@@ -6988,18 +7141,17 b' msgid "Inherited Issue Tracker Patterns"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:30
-#: rhodecode/templates/base/issue_tracker_settings.mako:11
+#: 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/base/issue_tracker_settings.mako:12
+#: rhodecode/templates/base/issue_tracker_settings.mako:80
 msgid "Url"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32
-#: rhodecode/templates/base/issue_tracker_settings.mako:13
 msgid "Prefix"
 msgstr ""
 
@@ -7038,7 +7190,7 b' msgid "Performing Maintenance"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5
-msgid "Repository Permissions"
+msgid "Repository Access Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:55
@@ -7057,6 +7209,10 b' msgstr ""'
 msgid "used by {} branch rules, requires write+ permissions"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110
+msgid "set private mode"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:3
 msgid "Repository Branch Permissions."
 msgstr ""
@@ -7180,12 +7336,20 b' msgstr ""'
 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/data_table/_dt_elements.mako:92
+#: rhodecode/templates/data_table/_dt_elements.mako:104
 msgid "Private repository"
 msgstr ""
 
@@ -7307,11 +7471,7 b' msgstr ""'
 msgid "Repositories administration"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repos.mako:26
-msgid "repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repos.mako:71
+#: rhodecode/templates/admin/repos/repos.mako:110
 msgid "State"
 msgstr ""
 
@@ -7444,7 +7604,7 b' msgid "Set a custom text that is shown a'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:36
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:69
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:80
 msgid "Personal Repository Group"
 msgstr ""
 
@@ -7553,11 +7713,11 b' msgid "Custom logos"'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:111
-msgid "Custom js/css code added at the end of the <header/> tag."
+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 <css/> tags to define custom styling or scripting"
+msgid "Use <script/> or <style/> tags to define custom scripting or styling."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:119
@@ -7569,7 +7729,7 b' msgid "Custom js/css code added at the e'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:134
-msgid "Use <script> or <css> tags to define custom styling or scripting"
+msgid "Use <script> or <style> tags to define custom scripting or styling."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.mako:3
@@ -7693,7 +7853,7 b' msgstr ""'
 msgid "create summary snapshot"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_system.mako:32
+#: rhodecode/templates/admin/settings/settings_system.mako:46
 msgid "Python Packages"
 msgstr ""
 
@@ -7808,7 +7968,7 b' msgid ""'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:136
-#: rhodecode/templates/debug_style/index.html:63
+#: rhodecode/templates/debug_style/index.html:64
 msgid "Icons"
 msgstr ""
 
@@ -7867,8 +8027,8 b' 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:106
-#: rhodecode/templates/base/base.mako:128
+#: rhodecode/templates/base/base.mako:110
+#: rhodecode/templates/base/base.mako:132
 msgid "User groups"
 msgstr ""
 
@@ -7877,9 +8037,12 b' msgstr ""'
 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
-#, python-format
-msgid "%s user group settings"
+msgid "{} user group settings"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37
@@ -7899,7 +8062,7 b' 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:45
+#: rhodecode/templates/user_group/profile.mako:55
 msgid "Members"
 msgstr ""
 
@@ -7916,7 +8079,7 b' 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:17
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:19
 msgid "Assigned to review rules"
 msgstr ""
 
@@ -7980,7 +8143,7 b' msgid "Add members"'
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:96
-#: rhodecode/templates/user_group/profile.mako:68
+#: rhodecode/templates/user_group/profile.mako:78
 msgid "No members yet"
 msgstr ""
 
@@ -7999,7 +8162,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_add.mako:13
 #: rhodecode/templates/admin/users/user_edit.mako:14
-#: rhodecode/templates/base/base.mako:105
+#: rhodecode/templates/base/base.mako:109
 msgid "Users"
 msgstr ""
 
@@ -8029,22 +8192,23 b' msgid "Add personal repository group"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:121
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:80
-#, python-format
-msgid "New group will be created at: `/%(path)s`"
+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
-#, python-format
-msgid "%s user settings"
+msgid "{} user settings"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:31
@@ -8053,7 +8217,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_edit.mako:39
 #: rhodecode/templates/admin/users/user_edit_profile.mako:5
-#: rhodecode/templates/users/user_profile.mako:5
+#: rhodecode/templates/users/user_profile.mako:6
 msgid "User Profile"
 msgstr ""
 
@@ -8088,99 +8252,115 b' 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:19
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:21
 msgid "Member of User groups"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:20
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:22
 msgid "Force password change"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:26
-#, python-format
-msgid "User: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:35
-msgid "Force Password Reset"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:41
-msgid "Disable forced password reset"
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:28
+msgid "User: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:46
+msgid "Force Password Reset"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:52
+msgid "Disable forced password reset"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:57
 msgid "Clear the forced password change flag."
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:53
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:64
 msgid "Confirm to enable forced password change"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:54
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:65
 msgid "Enable forced password reset"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:59
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:70
 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:75
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:86
 msgid "Users personal repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:78
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:89
 msgid "This user currently does not have a personal repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:85
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:91
+#, python-format
+msgid "New group will be created at: `/%(path)s`"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:96
 msgid "Create personal repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:94
-msgid "Delete User"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:105
+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:108
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:120
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:132
+#: 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 "Delete repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:117
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:128
 msgid "Detach repository groups"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:129
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:140
 msgid "Detach user groups"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:141
-msgid "New owner for detached objects"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:148
-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:150
-msgid "The delete option will delete the user and all his owned objects!"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:163
-#: rhodecode/templates/data_table/_dt_elements.mako:260
-#, python-format
-msgid "Confirm to delete this user: %s"
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:152
+msgid "Detach Artifacts"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:155
+msgid "Delete Artifacts"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:165
+msgid "New owner for detached objects"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:172
+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
+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
 msgid "Delete this user"
 msgstr ""
 
@@ -8188,6 +8368,10 b' msgstr ""'
 msgid "User Audit Logs"
 msgstr ""
 
+#: rhodecode/templates/admin/users/user_edit_audit.mako:10
+msgid "Download as JSON"
+msgstr ""
+
 #: rhodecode/templates/admin/users/user_edit_caches.mako:33
 msgid "Invalidate user cache"
 msgstr ""
@@ -8238,44 +8422,46 b' msgid ""'
 "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:17
+#: 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:30
+#: rhodecode/templates/admin/users/user_edit_profile.mako:28
 msgid "Change the avatar at"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:73
+#: rhodecode/templates/admin/users/user_edit_profile.mako:85
 msgid "New Password"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:81
+#: rhodecode/templates/admin/users/user_edit_profile.mako:93
 msgid "New Password Confirmation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:97
-msgid "Super Admin"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_profile.mako:105
+#: rhodecode/templates/admin/users/user_edit_profile.mako:109
+#: 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
 msgid "Authentication type"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:110
-msgid "User was created using an external source. He is bound to authentication using this method."
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_profile.mako:115
+#: rhodecode/templates/admin/users/user_edit_profile.mako:121
+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:124
+#: rhodecode/templates/admin/users/user_edit_profile.mako:135
 msgid "Language"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:130
+#: rhodecode/templates/admin/users/user_edit_profile.mako:141
 #, python-format
 msgid "User interface language. Help translate %(rc_link)s into your language."
 msgstr ""
@@ -8321,11 +8507,6 b' msgstr ""'
 msgid "Users administration"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.mako:87
-#: rhodecode/templates/base/perms_summary.mako:145
-msgid "Super admin"
-msgstr ""
-
 #: rhodecode/templates/admin/users/users.mako:89
 msgid "Auth type"
 msgstr ""
@@ -8334,203 +8515,177 b' msgstr ""'
 msgid "{} Artifacts"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:57
+#: rhodecode/templates/base/base.mako:66
 msgid "RhodeCode instance id: {}"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:90
-msgid "Super Admin Panel"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:92
+#: 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:108
+#: rhodecode/templates/base/base.mako:112
 msgid "Authentication"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:110
+#: rhodecode/templates/base/base.mako:114
 msgid "Defaults"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:150
-#: rhodecode/templates/files/files_source_header.mako:53
-#: rhodecode/templates/files/files_tree_header.mako:40
+#: 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/summary/components.mako:250
 msgid "Show More"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:220
-#: rhodecode/templates/base/base.mako:231
+#: rhodecode/templates/base/base.mako:295
+#: rhodecode/templates/base/base.mako:306
 msgid "RSS Feed"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:222
+#: rhodecode/templates/base/base.mako:297
 msgid "Watch this Repository and actions on it in your personalized journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:240
+#: rhodecode/templates/base/base.mako:315
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:257
+#: rhodecode/templates/base/base.mako:332
 #, python-format
 msgid "Repository locked by %(user)s"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:262
+#: rhodecode/templates/base/base.mako:337
 msgid "Repository not locked. Pull repository to lock it."
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:277
+#: rhodecode/templates/base/base.mako:353
 msgid "This repository has been archived. It is now read-only."
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:290
-#: rhodecode/templates/data_table/_dt_elements.mako:46
-#: rhodecode/templates/data_table/_dt_elements.mako:47
-#: rhodecode/templates/data_table/_dt_elements.mako:198
-#: rhodecode/templates/pullrequests/pullrequest.mako:30
+#: 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
 msgid "Summary"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:291
-#: rhodecode/templates/data_table/_dt_elements.mako:51
-#: rhodecode/templates/data_table/_dt_elements.mako:52
-#: rhodecode/templates/files/file_authors_box.mako:28
-#: rhodecode/templates/search/search.mako:85
+#: 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:292
-#: rhodecode/templates/data_table/_dt_elements.mako:56
-#: rhodecode/templates/data_table/_dt_elements.mako:57
+#: 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:85
+#: rhodecode/templates/search/search.mako:99
 msgid "Files"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:293
+#: 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:298
+#: rhodecode/templates/base/base.mako:374
 #, python-format
 msgid "Show Pull Requests for %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:301
-msgid "Pull Request"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:310
+#: rhodecode/templates/base/base.mako:385
 msgid "Artifacts"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:313
+#: rhodecode/templates/base/base.mako:391
 msgid "Repository Settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:324
-#: rhodecode/templates/base/base.mako:339
-#: rhodecode/templates/base/base.mako:406
-#: rhodecode/templates/base/base.mako:418
+#: rhodecode/templates/base/base.mako:397
+#: rhodecode/templates/base/base.mako:410
 msgid "Options"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:327
-msgid "Fork this repository"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:328
-msgid "Create Pull Request"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:331
+#: rhodecode/templates/base/base.mako:402
 msgid "Unlock Repository"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:333
+#: rhodecode/templates/base/base.mako:404
 msgid "Lock Repository"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:393
+#: rhodecode/templates/base/base.mako:461
 msgid "Group Home"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:395
+#: rhodecode/templates/base/base.mako:465
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:395
+#: rhodecode/templates/base/base.mako:465
 msgid "Group Settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:439
+#: rhodecode/templates/base/base.mako:508
+msgid "Create"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:516
+msgid "This Repository"
+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:529
+msgid "This Repository Group"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:533
+#: rhodecode/templates/base/base.mako:549
+#: rhodecode/templates/base/base.mako:561
+msgid "New Repository"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:539
+#: rhodecode/templates/base/base.mako:553
+#: rhodecode/templates/base/base.mako:567
+msgid "New Repository Group"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:594
 msgid "Sign in"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:464
-msgid "My personal group"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:471
-msgid "Manage"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:476
-msgid "No Bookmarks yet."
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:514
-msgid "Sign Out"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:575
-msgid "search / go to..."
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:618
-msgid "Show activity journal"
-msgstr ""
-
 #: rhodecode/templates/base/base.mako:619
-#: rhodecode/templates/journal/journal.mako:4
-#: rhodecode/templates/journal/journal.mako:14
-msgid "Journal"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:624
-msgid "Show Public activity journal"
+msgid "My personal group"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:625
-msgid "Public journal"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:631
-msgid "Show Gists"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:632
-msgid "Gists"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:638
-msgid "Admin settings"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:649
 #: 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
@@ -8548,15 +8703,57 b' msgstr ""'
 msgid "Style"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:650
+#: rhodecode/templates/base/base.mako:626
 msgid "[Style]"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:907
+#: rhodecode/templates/base/base.mako:643
+msgid "No Bookmarks yet."
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:681
+msgid "Sign Out"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:737
+msgid "search / go to..."
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:780
+msgid "Show activity journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:781
+#: rhodecode/templates/journal/journal.mako:4
+#: rhodecode/templates/journal/journal.mako:14
+msgid "Journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:786
+msgid "Show Public activity journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:787
+msgid "Public journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:793
+msgid "Show Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:794
+msgid "Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:800
+msgid "Admin settings"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:1074
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:915
+#: rhodecode/templates/base/base.mako:1082
 msgid "Site-wide shortcuts"
 msgstr ""
 
@@ -8635,32 +8832,36 b' msgid ""'
 "permission by members of user groups."
 msgstr ""
 
-#: rhodecode/templates/base/issue_tracker_settings.mako:21
-msgid "Read more"
-msgstr ""
-
-#: rhodecode/templates/base/issue_tracker_settings.mako:83
+#: 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:91
+#: rhodecode/templates/base/issue_tracker_settings.mako:168
 msgid "New Entry"
 msgstr ""
 
-#: rhodecode/templates/base/issue_tracker_settings.mako:95
+#: rhodecode/templates/base/issue_tracker_settings.mako:172
 msgid "Confirm to remove this pattern:"
 msgstr ""
 
-#: rhodecode/templates/base/issue_tracker_settings.mako:191
-#: rhodecode/templates/changeset/changeset_file_comment.mako:276
-#: rhodecode/templates/changeset/changeset_file_comment.mako:326
-#: rhodecode/templates/data_table/_dt_elements.mako:414
+#: 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/files/files_edit.mako:62
 msgid "Preview"
 msgstr ""
 
-#: rhodecode/templates/base/issue_tracker_settings.mako:192
+#: rhodecode/templates/base/issue_tracker_settings.mako:294
 msgid "Test Pattern Preview"
 msgstr ""
 
@@ -8679,7 +8880,6 b' msgid "none"'
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:37
-#: rhodecode/templates/changeset/changeset.mako:107
 #: rhodecode/templates/commits/changelog_elements.mako:102
 #: rhodecode/templates/files/base.mako:11
 msgid "merge"
@@ -8769,7 +8969,7 b' msgstr ""'
 msgid "No matching permission defined"
 msgstr ""
 
-#: rhodecode/templates/base/root.mako:149
+#: rhodecode/templates/base/root.mako:155
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
@@ -8994,15 +9194,6 b' msgstr ""'
 msgid "bookmarks"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks_data.mako:13
-#: rhodecode/templates/changeset/changeset.mako:113
-#: rhodecode/templates/commits/changelog_elements.mako:116
-#: rhodecode/templates/files/base.mako:17
-#: rhodecode/templates/summary/summary_commits.mako:64
-#, python-format
-msgid "Bookmark %s"
-msgstr ""
-
 #: rhodecode/templates/branches/branches.mako:5
 #, python-format
 msgid "%s Branches"
@@ -9016,220 +9207,172 b' msgstr ""'
 msgid "branches"
 msgstr ""
 
-#: rhodecode/templates/branches/branches_data.mako:12
-#: rhodecode/templates/changeset/changeset.mako:126
-#: rhodecode/templates/commits/changelog_elements.mako:108
-#: rhodecode/templates/files/base.mako:36
-#: rhodecode/templates/summary/summary_commits.mako:78
-#, python-format
-msgid "Branch %s"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:7
-#, python-format
-msgid "%s Commit"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:38
+#: 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:40
+#: rhodecode/templates/changeset/changeset.mako:83
 msgid "Commit phase"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:46
-#: rhodecode/templates/changeset/changeset.mako:53
+#: rhodecode/templates/changeset/changeset.mako:90
+#: rhodecode/templates/changeset/changeset.mako:97
 msgid "Evolve State"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:46
+#: rhodecode/templates/changeset/changeset.mako:91
 msgid "obsolete"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:53
+#: rhodecode/templates/changeset/changeset.mako:98
 msgid "hidden"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:60
-msgid "Parent Commit"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:60
-msgid "parent"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:64
-msgid "Child Commit"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:64
-msgid "child"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:80
-msgid "Expand"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:89
-#: rhodecode/templates/changeset/changeset.mako:94
-#: rhodecode/templates/changeset/changeset_file_comment.mako:83
-#: rhodecode/templates/compare/compare_diff.mako:139
-msgid "Commit status"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:102
-msgid "References"
+#: rhodecode/templates/changeset/changeset.mako:117
+msgid "Commit navigation"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:120
-#: rhodecode/templates/commits/changelog_elements.mako:124
-#: rhodecode/templates/files/base.mako:27
-#: rhodecode/templates/summary/summary_commits.mako:71
-#: rhodecode/templates/tags/tags_data.mako:12
-#, python-format
-msgid "Tag %s"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:137
+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 "Raw diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:141
-msgid "Raw Diff"
+msgid "Patch Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:144
-msgid "Patch diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:145
-msgid "Patch Diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:148
-msgid "Download diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:149
 msgid "Download Diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:178
-msgid "Unresolved TODOs"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:186
-msgid "There are no unresolved TODOs"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.mako:268
+#: rhodecode/templates/changeset/changeset.mako:224
 msgid "No Child Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:304
+#: rhodecode/templates/changeset/changeset.mako:263
 msgid "No Parent Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:34
+#: 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:41
+#: rhodecode/templates/changeset/changeset_file_comment.mako:40
 msgid "Click to resolve this comment"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:68
 #: rhodecode/templates/changeset/changeset_file_comment.mako:70
-#, python-format
-msgid "pull request #%s"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:75
+#: 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:90
-msgid "resolves comment #{}"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:98
+#: 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:99
+#: 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:123
-msgid "Outdated comment from pull request version v{0}, latest v{1}"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:111
-#: rhodecode/templates/changeset/changeset_file_comment.mako:126
+#: 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:153
-#: rhodecode/templates/changeset/changeset_file_comment.mako:156
+#: 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:154
-#: rhodecode/templates/changeset/changeset_file_comment.mako:157
+#: 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
+msgid "Leave a comment on this Pull Request."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:190
+msgid "Leave a comment on {} commits in this range."
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset_file_comment.mako:192
-msgid "Leave a comment on this Pull Request."
-msgstr ""
-
-#: 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:196
 msgid "Leave a comment on this Commit."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:284
-#: rhodecode/templates/codeblocks/diffs.mako:67
+#: rhodecode/templates/changeset/changeset_file_comment.mako:279
+#: rhodecode/templates/codeblocks/diffs.mako:79
 msgid "You need to be logged in to leave comments."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:285
-#: rhodecode/templates/codeblocks/diffs.mako:67
+#: rhodecode/templates/changeset/changeset_file_comment.mako:280
+#: rhodecode/templates/codeblocks/diffs.mako:79
 msgid "Login now"
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset_file_comment.mako:327
+msgid "Mark as"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset_file_comment.mako:350
-#, python-format
-msgid "Comments parsed using %s syntax with %s, and %s actions support."
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:352
-msgid "Use @username inside this text to send notification to this RhodeCode user"
+#: 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/files/files_upload.mako:86
+msgid "Choose your files"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:353
-msgid "Start typing with / for certain actions to be triggered via text box."
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:370
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:16
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:156
-#: rhodecode/templates/pullrequests/pullrequests.mako:31
-msgid "Closed"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:400
+msgid "uploading..."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:384
 #: rhodecode/templates/compare/compare_diff.mako:108
 #: rhodecode/templates/compare/compare_diff.mako:116
 #: rhodecode/templates/compare/compare_diff.mako:124
@@ -9237,20 +9380,47 b' msgstr ""'
 msgid "Comment"
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset_file_comment.mako:403
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:16
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:103
+#: rhodecode/templates/pullrequests/pullrequests.mako:31
+msgid "Closed"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:412
+msgid "Comments parsed using {} syntax."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:413
+msgid "Use @username inside this text to send notification to this RhodeCode user"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:414
+msgid "and"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:415
+msgid "Start typing with / for certain actions to be triggered via text box."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:416
+msgid "actions supported."
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset_range.mako:5
 #, python-format
 msgid "%s Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_range.mako:32
+#: rhodecode/templates/changeset/changeset_range.mako:33
 msgid "Commit Range"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_range.mako:41
+#: rhodecode/templates/changeset/changeset_range.mako:42
 msgid "Range"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_range.mako:59
+#: rhodecode/templates/changeset/changeset_range.mako:60
 msgid "Diff Option"
 msgstr ""
 
@@ -9266,8 +9436,8 b' msgstr ""'
 #: 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:126
-#: rhodecode/templates/codeblocks/diffs.mako:183
+#: rhodecode/templates/codeblocks/diffs.mako:204
+#: rhodecode/templates/codeblocks/diffs.mako:268
 msgid "Showing a big diff might take some time and resources, continue?"
 msgstr ""
 
@@ -9275,8 +9445,8 b' msgstr ""'
 #: 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:126
-#: rhodecode/templates/codeblocks/diffs.mako:183
+#: rhodecode/templates/codeblocks/diffs.mako:204
+#: rhodecode/templates/codeblocks/diffs.mako:268
 msgid "Show full diff"
 msgstr ""
 
@@ -9289,152 +9459,181 b' msgstr ""'
 msgid "Diff was truncated. File content available only in full diff."
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:113
-msgid "Browse Files at revision {}"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:114
-msgid "Browse Files"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:124
+#: 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
+msgid "not available in this view"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:146
+msgid "{} unresolved"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:149
+msgid "0 unresolved"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:152
+msgid "{} Resolved"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:166
+msgid "0 General"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:174
+msgid "0 Inline"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:185
+#: rhodecode/templates/codeblocks/diffs.mako:190
+msgid "{} Outdated"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:187
+msgid "show outdated"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:188
+msgid "hide outdated"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:203
 msgid "The requested changes are too big and content was truncated."
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:135
-msgid "File Changes"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:142
+#: rhodecode/templates/codeblocks/diffs.mako:227
 msgid "Some changes may be hidden"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:144
+#: rhodecode/templates/codeblocks/diffs.mako:229
 msgid "No files"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:183
+#: rhodecode/templates/codeblocks/diffs.mako:268
 msgid "The requested commit or file is too big and content was truncated."
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:190
+#: rhodecode/templates/codeblocks/diffs.mako:275
 #, python-format
 msgid "This diff has been collapsed as it changes many lines, (%i lines changed)"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:192
+#: rhodecode/templates/codeblocks/diffs.mako:277
 msgid "Show them"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:195
+#: rhodecode/templates/codeblocks/diffs.mako:280
 msgid "Hide them"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:231
-#: rhodecode/templates/codeblocks/diffs.mako:250
-msgid "Unmatched inline comments below"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:256
-msgid "Unmatched comments below"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:321
+#: rhodecode/templates/codeblocks/diffs.mako:316
+#: rhodecode/templates/codeblocks/diffs.mako:335
+msgid "Unmatched/outdated inline comments below"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:341
+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:387
+#: rhodecode/templates/codeblocks/diffs.mako:476
 msgid "Copy the full path"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:454
-#: rhodecode/templates/codeblocks/diffs.mako:472
+#: rhodecode/templates/codeblocks/diffs.mako:543
+#: rhodecode/templates/codeblocks/diffs.mako:561
 #, python-format
 msgid "Show file at commit: %(commit_id)s"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:456
-#: rhodecode/templates/codeblocks/diffs.mako:463
+#: rhodecode/templates/codeblocks/diffs.mako:545
+#: rhodecode/templates/codeblocks/diffs.mako:552
 msgid "Show file before"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:461
-#: rhodecode/templates/codeblocks/diffs.mako:479
+#: rhodecode/templates/codeblocks/diffs.mako:550
+#: rhodecode/templates/codeblocks/diffs.mako:568
 #, python-format
 msgid "File not present at commit: %(commit_id)s"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:474
-#: rhodecode/templates/codeblocks/diffs.mako:481
+#: rhodecode/templates/codeblocks/diffs.mako:563
+#: rhodecode/templates/codeblocks/diffs.mako:570
 msgid "Show file after"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:488
+#: rhodecode/templates/codeblocks/diffs.mako:577
 msgid "Show comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:488
+#: rhodecode/templates/codeblocks/diffs.mako:577
 msgid "Hide comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:559
-#: rhodecode/templates/codeblocks/diffs.mako:602
-#: rhodecode/templates/codeblocks/diffs.mako:658
+#: rhodecode/templates/codeblocks/diffs.mako:646
+#: rhodecode/templates/codeblocks/diffs.mako:689
+#: rhodecode/templates/codeblocks/diffs.mako:745
 msgid "comments including outdated"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:561
-#: rhodecode/templates/codeblocks/diffs.mako:604
-#: rhodecode/templates/codeblocks/diffs.mako:660
+#: rhodecode/templates/codeblocks/diffs.mako:648
+#: rhodecode/templates/codeblocks/diffs.mako:691
+#: rhodecode/templates/codeblocks/diffs.mako:747
 msgid "comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:736
-msgid "View side by side"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:738
+#: rhodecode/templates/codeblocks/diffs.mako:816
+msgid "Toggle wide diff"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:824
+msgid "View diff as side by side"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:826
 msgid "Side by Side"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:743
-msgid "View unified"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:744
+#: rhodecode/templates/codeblocks/diffs.mako:831
+msgid "View diff as unified"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:832
 msgid "Unified"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:749
+#: rhodecode/templates/codeblocks/diffs.mako:837
 msgid "Turn off: Show the diff as commit range"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:752
-#: rhodecode/templates/codeblocks/diffs.mako:759
+#: rhodecode/templates/codeblocks/diffs.mako:840
+#: rhodecode/templates/codeblocks/diffs.mako:847
 msgid "Range Diff"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:756
+#: rhodecode/templates/codeblocks/diffs.mako:844
 msgid "Show the diff as commit range"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:772
-msgid "Expand All Files"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:776
-msgid "Collapse All Files"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:799
+#: rhodecode/templates/codeblocks/diffs.mako:888
 msgid "Disabled on range diff"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:1017
-msgid "Diff Options"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/source.mako:25
+#: rhodecode/templates/codeblocks/diffs.mako:1119
+msgid "..."
+msgstr ""
+
+#: rhodecode/templates/codeblocks/source.mako:22
 msgid "view annotation from before this change"
 msgstr ""
 
@@ -9536,11 +9735,32 b' msgstr ""'
 
 #: rhodecode/templates/commits/changelog_elements.mako:80
 #: rhodecode/templates/compare/compare_commits.mako:48
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:515
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:582
 #: 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/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/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/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"
@@ -9571,11 +9791,11 b' msgid "Compare was calculated based on t'
 msgstr ""
 
 #: rhodecode/templates/compare/compare_commits.mako:17
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:476
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:543
 msgid "Time"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_commits.mako:67
+#: rhodecode/templates/compare/compare_commits.mako:66
 msgid "No commits in this compare"
 msgstr ""
 
@@ -9597,16 +9817,11 b' msgid "for file"'
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:56
-#: rhodecode/templates/email_templates/pull_request_review.mako:74
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:104
 msgid "Target"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:70
-#: rhodecode/templates/email_templates/pull_request_comment.mako:90
-#: rhodecode/templates/email_templates/pull_request_review.mako:73
-#: rhodecode/templates/files/files_source.mako:86
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:68
+#: rhodecode/templates/files/files_source.mako:100
 msgid "Source"
 msgstr ""
 
@@ -9633,94 +9848,93 b' msgstr ""'
 msgid "Compare commits, branches, bookmarks or tags."
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:61
-#: rhodecode/templates/data_table/_dt_elements.mako:62
+#: 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:83
+#: rhodecode/templates/data_table/_dt_elements.mako:95
 msgid "Mercurial repository"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:85
+#: rhodecode/templates/data_table/_dt_elements.mako:97
 msgid "Git repository"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:87
+#: rhodecode/templates/data_table/_dt_elements.mako:99
 msgid "Subversion repository"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:94
+#: rhodecode/templates/data_table/_dt_elements.mako:106
 msgid "Public repository"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:104
+#: 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:105
+#: rhodecode/templates/data_table/_dt_elements.mako:117
 msgid "creating..."
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:137
+#: rhodecode/templates/data_table/_dt_elements.mako:149
 msgid "No commits yet"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:144
-#: rhodecode/templates/data_table/_dt_elements.mako:146
+#: 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:152
-#: rhodecode/templates/data_table/_dt_elements.mako:154
+#: 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:182
+#: rhodecode/templates/data_table/_dt_elements.mako:189
 msgid "Creating"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:184
+#: rhodecode/templates/data_table/_dt_elements.mako:191
+#: rhodecode/templates/hovercards/hovercard_pull_request.mako:10
 msgid "Created"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:226
+#: rhodecode/templates/data_table/_dt_elements.mako:234
 msgid "personal"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:272
+#: 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:288
+#: rhodecode/templates/data_table/_dt_elements.mako:297
 #: rhodecode/templates/user_group/user_group.mako:4
-#: rhodecode/templates/user_group/user_group.mako:11
 msgid "User group"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:333
-#: rhodecode/templates/forks/fork.mako:91
-msgid "Private"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.mako:366
-#, python-format
-msgid "Pull request #%(pr_number)s"
+#: 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
-msgid "Copy the full url"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.mako:398
+msgid "Work in progress"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.mako:421
+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:431
+#: rhodecode/templates/data_table/_dt_elements.mako:460
 #, python-format
 msgid "Parsed using %s syntax"
 msgstr ""
@@ -9778,71 +9992,71 b' msgstr ""'
 msgid "Index"
 msgstr ""
 
-#: rhodecode/templates/debug_style/index.html:55
+#: rhodecode/templates/debug_style/index.html:56
 msgid "Typography"
 msgstr ""
 
-#: rhodecode/templates/debug_style/index.html:56
-msgid "Forms"
-msgstr ""
-
 #: rhodecode/templates/debug_style/index.html:57
-msgid "Buttons"
+msgid "Forms"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:58
-msgid "Labels"
+msgid "Buttons"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:59
-msgid "Alerts"
+msgid "Labels"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:60
-msgid "Tables"
+msgid "Alerts"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:61
-msgid "Tables wide"
+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:64
-msgid "Layout form with sidebar"
-msgstr ""
-
 #: rhodecode/templates/debug_style/index.html:65
-msgid "Login"
+msgid "Layout form with sidebar"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:66
-msgid "Login 2"
+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:70
+#: rhodecode/templates/debug_style/index.html:71
 msgid "Panels"
 msgstr ""
 
-#: rhodecode/templates/debug_style/index.html:73
-msgid "Form elements"
-msgstr ""
-
 #: rhodecode/templates/debug_style/index.html:74
-msgid "Form elements small"
+msgid "Form elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:75
-msgid "Form inline elements"
+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 ""
 
@@ -9858,165 +10072,238 b' msgstr ""'
 msgid "Don't have an account ?"
 msgstr ""
 
-#: rhodecode/templates/email_templates/base.mako:39
-#, python-format
-msgid "This is a notification from RhodeCode. %(instance_url)s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/base.mako:122
+#: rhodecode/templates/email_templates/base.mako:75
+#: rhodecode/templates/email_templates/base.mako:519
+msgid "This is a notification from RhodeCode."
+msgstr ""
+
+#: rhodecode/templates/email_templates/base.mako:501
 msgid "RhodeCode"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:18
-#: rhodecode/templates/email_templates/pull_request_comment.mako:19
+#: 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:21
-#: rhodecode/templates/email_templates/commit_comment.mako:82
+#: 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:21
-#: rhodecode/templates/email_templates/commit_comment.mako:24
+#: rhodecode/templates/email_templates/commit_comment.mako:23
 #: rhodecode/templates/email_templates/commit_comment.mako:26
-msgid "in the {repo_name} repository"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:24
-msgid "[status: {status}] {user} left a {comment_type} on commit `{commit_id}`"
+#: rhodecode/templates/email_templates/commit_comment.mako:28
+msgid "in the `{repo_name}` repository"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:26
-#: rhodecode/templates/email_templates/commit_comment.mako:84
+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:47
-#: rhodecode/templates/email_templates/pull_request_comment.mako:47
+#: 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:52
-#: rhodecode/templates/email_templates/pull_request_comment.mako:52
-msgid "File: {comment_file} on line {comment_line}"
+#: 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
-msgid "Commit status was changed to"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:82
-#: rhodecode/templates/email_templates/commit_comment.mako:84
-msgid "in the {repo} repository"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:93
-#: rhodecode/templates/email_templates/pull_request_comment.mako:94
-msgid "Status"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:95
-msgid "The commit status was changed to"
+#: 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
-#: rhodecode/templates/email_templates/pull_request_comment.mako:107
-msgid "TODO comment on line: {comment_line}"
+msgid "{comment_type} on file `{comment_file}` in commit."
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:104
-#: rhodecode/templates/email_templates/pull_request_comment.mako:109
-msgid "Note comment on line: {comment_line}"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:104
-#: rhodecode/templates/email_templates/pull_request_comment.mako:109
-msgid "Note comment"
-msgstr ""
-
-#: rhodecode/templates/email_templates/password_reset.mako:31
-msgid "Generate new password here"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:22
-#: rhodecode/templates/email_templates/pull_request_comment.mako:84
-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:25
-msgid "[status: {status}] {user} left a {comment_type} on pull request #{pr_id} \"{pr_title}\""
+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
-#: rhodecode/templates/email_templates/pull_request_comment.mako:86
-msgid "{user} left a {comment_type} on pull request #{pr_id} \"{pr_title}\""
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:49
-#: rhodecode/templates/pullrequests/pullrequest.mako:67
-msgid "Source repository"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:58
-msgid "{user} submitted pull request #{pr_id} status: *{status}*"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:60
-msgid "{user} submitted pull request #{pr_id} status: *{status} and closed*"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:97
+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:99
+#: rhodecode/templates/email_templates/pull_request_comment.mako:153
 msgid "Submitted review status"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_review.mako:14
-#, python-format
-msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\""
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_review.mako:34
-#, python-format
-msgid "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s into %(target_ref_type)s:%(target_ref_name)s"
+#: 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
-msgid "Link"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_review.mako:71
-#, python-format
-msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"."
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_review.mako:73
-#, python-format
-msgid "%(source_ref_type)s of %(source_repo_url)s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_review.mako:74
-#, python-format
-msgid "%(target_ref_type)s of %(target_repo_url)s"
+#: 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:21
-msgid "Translation"
-msgstr ""
-
-#: rhodecode/templates/email_templates/user_registration.mako:22
-#, python-format
-msgid "New user %(user)s has registered on %(date)s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/user_registration.mako:24
+#: 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 ""
 
@@ -10038,11 +10325,11 b' msgstr ""'
 msgid "Commit was too big and was cut off..."
 msgstr ""
 
-#: rhodecode/templates/files/file_authors_box.mako:16
+#: rhodecode/templates/files/file_authors_box.mako:18
 msgid "Load All Authors"
 msgstr ""
 
-#: rhodecode/templates/files/file_authors_box.mako:18
+#: rhodecode/templates/files/file_authors_box.mako:20
 msgid "last author"
 msgstr ""
 
@@ -10105,16 +10392,22 b' msgstr ""'
 msgid "Download this tree ZIP"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser_tree.mako:12
-#: rhodecode/templates/search/search_path.mako:9
-msgid "Size"
-msgstr ""
-
-#: rhodecode/templates/files/files_browser_tree.mako:13
-msgid "Modified"
+#: 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 ""
 
@@ -10127,13 +10420,12 b' msgid "Delete file"'
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:53
-#: rhodecode/templates/files/files_source.mako:104
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:58
-#: rhodecode/templates/files/files_source.mako:133
+#: rhodecode/templates/files/files_source.mako:125
 msgid "File size {} is bigger then allowed limit {}. "
 msgstr ""
 
@@ -10169,27 +10461,35 b' msgstr ""'
 msgid "Deleting files allowed only when on branch head commit"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:67
+#: 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:67
+#: rhodecode/templates/files/files_source.mako:73
 msgid "LargeFile"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:82
+#: rhodecode/templates/files/files_source.mako:96
 msgid "History"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:88
+#: rhodecode/templates/files/files_source.mako:102
 msgid "Annotation"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:90
+#: rhodecode/templates/files/files_source.mako:104
 msgid "Raw"
 msgstr ""
 
-#: rhodecode/templates/files/files_source_header.mako:31
+#: rhodecode/templates/files/files_source.mako:120
+msgid "Binary file ({})"
+msgstr ""
+
+#: rhodecode/templates/files/files_source_header.mako:33
 msgid "File last commit"
 msgstr ""
 
@@ -10209,14 +10509,6 b' msgstr ""'
 msgid "Upload new file"
 msgstr ""
 
-#: rhodecode/templates/files/files_upload.mako:86
-msgid "Drag'n Drop files here or"
-msgstr ""
-
-#: rhodecode/templates/files/files_upload.mako:86
-msgid "Choose your files"
-msgstr ""
-
 #: rhodecode/templates/files/files_upload.mako:109
 msgid "Commiting..."
 msgstr ""
@@ -10235,15 +10527,19 b' msgstr ""'
 msgid "Fork name"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.mako:81
+#: rhodecode/templates/forks/fork.mako:71
 msgid "Copy permissions"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.mako:85
+#: rhodecode/templates/forks/fork.mako:75
 msgid "Copy permissions from parent repository."
 msgstr ""
 
-#: rhodecode/templates/forks/fork.mako:100
+#: rhodecode/templates/forks/fork.mako:81
+msgid "Private"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.mako:90
 msgid "Fork this Repository"
 msgstr ""
 
@@ -10268,7 +10564,7 b' msgstr ""'
 msgid "RSS journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal_data.mako:51
+#: rhodecode/templates/journal/journal_data.mako:45
 msgid "No entries yet"
 msgstr ""
 
@@ -10286,65 +10582,69 b' msgid "RSS public journal feed"'
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:5
-#: rhodecode/templates/pullrequests/pullrequest.mako:22
+#: rhodecode/templates/pullrequests/pullrequest.mako:28
 msgid "New pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:59
+#: rhodecode/templates/pullrequests/pullrequest.mako:60
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:118
 msgid "Commit flow"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:85
+#: 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:96
+#: rhodecode/templates/pullrequests/pullrequest.mako:97
 msgid "Submit Pull Request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:110
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:313
+#: rhodecode/templates/pullrequests/pullrequest.mako:111
 msgid "Author of this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:124
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:327
+#: rhodecode/templates/pullrequests/pullrequest.mako:125
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:286
 msgid "Reviewer rules"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:134
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:341
+#: rhodecode/templates/pullrequests/pullrequest.mako:135
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:300
 msgid "Pull request reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:145
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:384
+#: 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:301
-#: rhodecode/templates/pullrequests/pullrequest.mako:518
+#: rhodecode/templates/pullrequests/pullrequest.mako:302
+#: rhodecode/templates/pullrequests/pullrequest.mako:519
 msgid "Please select source and target"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:307
+#: rhodecode/templates/pullrequests/pullrequest.mako:308
 msgid "Loading compare ..."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:366
+#: rhodecode/templates/pullrequests/pullrequest.mako:367
 msgid "Show detailed compare."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:373
+#: rhodecode/templates/pullrequests/pullrequest.mako:374
 msgid "There are no commits to merge."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:423
-#: rhodecode/templates/pullrequests/pullrequest.mako:449
+#: rhodecode/templates/pullrequests/pullrequest.mako:424
+#: rhodecode/templates/pullrequests/pullrequest.mako:450
 msgid "Select commit reference"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:439
+#: rhodecode/templates/pullrequests/pullrequest.mako:440
 msgid "Target repository"
 msgstr ""
 
@@ -10356,216 +10656,237 b' msgstr ""'
 msgid "Merge is not currently possible because of below failed checks."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:55
-#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60
-msgid "refresh checks"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:56
-#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:61
-msgid "Merge Pull Request"
-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:63
+#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:78
 msgid "Login to Merge this Pull Request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:72
-#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:76
-msgid "Close with status {}"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:6
-#, python-format
-msgid "%s Pull Request #%s"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:48
-msgid "From"
+msgid "{} Pull Request !{}"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:53
+msgid "Last updated on"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:54
+msgid "by"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:63
+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"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:85
+#: 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:97
+#: 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:126
-msgid "Merge"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:137
+#: 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:141
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:185
 msgid "Shadow repository data not available"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:149
-msgid "Review"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:165
-msgid "Rendered using {} renderer"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:179
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:201
 msgid "Versions"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:191
-msgid "Hide all versions of this pull request"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:216
-msgid "Your review status at this version"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:222
-msgid "Comment from pull request version v{0}, general:{1} inline:{2}"
+#: 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
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:243
+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:240
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:263
 msgid "show changes between versions"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:241
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:264
 msgid "show pull request for this version"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:256
-msgid "Comments at this version"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:260
-msgid "Comments for this pull request"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:265
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:267
-#, python-format
-msgid "%d General "
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:271
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:273
-#, python-format
-msgid "%d Inline"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:277
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:281
-#, python-format
-msgid "%d Outdated"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:278
-msgid "show outdated comments"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:279
-msgid "hide outdated comments"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:290
 msgid "Pull request versions not available"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:304
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:389
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:349
 msgid "Save Changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:406
+#: 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
 msgid "Missing requirements:"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:407
-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:415
-msgid "Missing commits"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:416
-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:417
-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:418
-msgid "Consider doing a {force_refresh_url} in case you think this is an error."
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:429
-#, python-format
-msgid "Showing changes at v%d, commenting is disabled."
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:452
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:454
-msgid "Update commits"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:454
-msgid "Update is disabled for current view"
+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
+msgid "Missing commits"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:463
+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
+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
+msgid "Consider doing a {force_refresh_url} in case you think this is an error."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:476
+#, 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
+msgid "Update commits"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:502
+msgid "more update options"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:510
+msgid "Force update commits"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:513
+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:469
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:536
 msgid "commits added: {}, removed: {}"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:487
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:554
 msgid "Commit added in displayed changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:489
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:556
 msgid "Commit removed in displayed changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:578
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:664
 msgid "there is {num} general comment from older versions"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:579
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:665
 msgid "show it"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:581
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:667
 msgid "there are {num} general comments from older versions"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:582
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:668
 msgid "show them"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:4
-#, python-format
-msgid "%s Pull Requests"
+msgid "{} Pull Requests"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:27
@@ -10607,35 +10928,30 b' msgstr ""'
 msgid "Search inside all accessible repositories"
 msgstr ""
 
-#: rhodecode/templates/search/search.mako:85
+#: rhodecode/templates/search/search.mako:99
 msgid "File path"
 msgstr ""
 
-#: rhodecode/templates/search/search.mako:88
+#: rhodecode/templates/search/search.mako:102
 msgid "Search"
 msgstr ""
 
-#: rhodecode/templates/search/search.mako:94
-#: rhodecode/templates/search/search.mako:96
-#: rhodecode/templates/search/search.mako:98
+#: 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:133
-msgid "Query Langague examples"
-msgstr ""
-
-#: rhodecode/templates/search/search_commit.mako:11
-#: rhodecode/templates/summary/summary_commits.mako:9
-msgid "Commit message"
-msgstr ""
-
-#: rhodecode/templates/search/search_commit.mako:14
-msgid "Age (new first)"
-msgstr ""
-
-#: rhodecode/templates/search/search_commit.mako:16
-msgid "Age (old first)"
+#: 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
@@ -10654,11 +10970,7 b' msgstr ""'
 msgid "Narrow to this repository"
 msgstr ""
 
-#: rhodecode/templates/search/search_path.mako:8
-msgid "File"
-msgstr ""
-
-#: rhodecode/templates/search/search_path.mako:10
+#: rhodecode/templates/search/search_path.mako:15
 msgid "Lines"
 msgstr ""
 
@@ -10718,14 +11030,8 b' msgstr ""'
 msgid "Quick start"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.mako:36
-#, python-format
-msgid "Readme file from commit %s:%s"
-msgstr ""
-
 #: rhodecode/templates/summary/summary_base.mako:5
-#, python-format
-msgid "%s Summary"
+msgid "{} Summary"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_base.mako:13
@@ -10771,23 +11077,19 b' msgstr ""'
 msgid "tags"
 msgstr ""
 
-#: rhodecode/templates/user_group/profile.mako:5
-msgid "User group profile"
-msgstr ""
-
-#: rhodecode/templates/user_group/profile.mako:14
+#: 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/user_group/user_group.mako:29
-msgid "User Group Profile"
-msgstr ""
-
-#: rhodecode/templates/users/user_profile.mako:38
+#: rhodecode/templates/users/user_profile.mako:39
 msgid "First name"
 msgstr ""
 
-#: rhodecode/templates/users/user_profile.mako:48
+#: rhodecode/templates/users/user_profile.mako:49
 msgid "Last name"
 msgstr ""
 

rhodecode/lib/audit_logger.py

@@ -151,20 +151,22 b' def _store_log(action_name, action_data,'
 
 
 def store_web(*args, **kwargs):
-    if 'action_data' not in kwargs:
-        kwargs['action_data'] = {}
-    kwargs['action_data'].update({
-        'source': SOURCE_WEB
-    })
+    action_data = {}
+    org_action_data = kwargs.pop('action_data', {})
+    action_data.update(org_action_data)
+    action_data['source'] = SOURCE_WEB
+    kwargs['action_data'] = action_data
+
     return store(*args, **kwargs)
 
 
 def store_api(*args, **kwargs):
-    if 'action_data' not in kwargs:
-        kwargs['action_data'] = {}
-    kwargs['action_data'].update({
-        'source': SOURCE_API
-    })
+    action_data = {}
+    org_action_data = kwargs.pop('action_data', {})
+    action_data.update(org_action_data)
+    action_data['source'] = SOURCE_API
+    kwargs['action_data'] = action_data
+
     return store(*args, **kwargs)
 
 

rhodecode/lib/auth.py

@@ -24,7 +24,6 b' authentication and permission libraries'
 
 import os
 import time
-import inspect
 import collections
 import fnmatch
 import hashlib
@@ -2013,6 +2012,7 b' class PermsFunction(object):'
         self.user_group_name = None
 
     def __bool__(self):
+        import inspect
         frame = inspect.currentframe()
         stack_trace = traceback.format_stack(frame)
         log.error('Checking bool value on a class instance of perm '

rhodecode/lib/base.py

@@ -211,8 +211,9 b' def vcs_operation_context('
 class BasicAuth(AuthBasicAuthenticator):
 
     def __init__(self, realm, authfunc, registry, auth_http_code=None,
-                 initial_call_detection=False, acl_repo_name=None):
+                 initial_call_detection=False, acl_repo_name=None, rc_realm=''):
         self.realm = realm
+        self.rc_realm = rc_realm
         self.initial_call = initial_call_detection
         self.authfunc = authfunc
         self.registry = registry
@@ -227,7 +228,7 b' class BasicAuth(AuthBasicAuthenticator):'
             return HTTPForbidden
 
     def get_rc_realm(self):
-        return safe_str(self.registry.rhodecode_settings.get('rhodecode_realm'))
+        return safe_str(self.rc_realm)
 
     def build_authentication(self):
         head = WWW_AUTHENTICATE.tuples('Basic realm="%s"' % self.realm)
@@ -288,7 +289,7 b' def attach_context_attributes(context, r'
     """
     config = request.registry.settings
 
-    rc_config = SettingsModel().get_all_settings(cache=True)
+    rc_config = SettingsModel().get_all_settings(cache=True, from_request=False)
     context.rc_config = rc_config
     context.rhodecode_version = rhodecode.__version__
     context.rhodecode_edition = config.get('rhodecode.edition')

rhodecode/lib/bleach_whitelist.py

@@ -66,11 +66,12 b' markdown_tags = ['
 markdown_attrs = {
     "*": ["class", "style", "align"],
     "img": ["src", "alt", "title"],
-    "a": ["href", "alt", "title", "name"],
+    "a": ["href", "alt", "title", "name", "data-hovercard-alt", "data-hovercard-url"],
     "abbr": ["title"],
     "acronym": ["title"],
     "pre": ["lang"],
-    "input": ["type", "disabled", "checked"]
+    "input": ["type", "disabled", "checked"],
+    "strong": ["title", "data-hovercard-alt", "data-hovercard-url"],
 }
 
 standard_styles = [

rhodecode/lib/db_manage.py

@@ -421,9 +421,20 b' class DbManage(object):'
 
         :param skip_existing:
         """
+        defaults = [
+            ('auth_plugins',
+             'egg:rhodecode-enterprise-ce#token,egg:rhodecode-enterprise-ce#rhodecode',
+             'list'),
 
-        for k, v, t in [('auth_plugins', 'egg:rhodecode-enterprise-ce#rhodecode', 'list'),
-                        ('auth_rhodecode_enabled', 'True', 'bool')]:
+            ('auth_authtoken_enabled',
+             'True',
+             'bool'),
+
+            ('auth_rhodecode_enabled',
+             'True',
+             'bool'),
+        ]
+        for k, v, t in defaults:
             if (skip_existing and
                     SettingsModel().get_setting_by_name(k) is not None):
                 log.debug('Skipping option %s', k)
@@ -568,19 +579,32 b' class DbManage(object):'
             ('title', '', 'unicode'),
             ('pre_code', '', 'unicode'),
             ('post_code', '', 'unicode'),
+
+            # Visual
             ('show_public_icon', True, 'bool'),
             ('show_private_icon', True, 'bool'),
             ('stylify_metatags', False, 'bool'),
             ('dashboard_items', 100, 'int'),
             ('admin_grid_items', 25, 'int'),
+
+            ('markup_renderer', 'markdown', 'unicode'),
+
             ('show_version', True, 'bool'),
+            ('show_revision_number', True, 'bool'),
+            ('show_sha_length', 12, 'int'),
+
             ('use_gravatar', False, 'bool'),
             ('gravatar_url', User.DEFAULT_GRAVATAR_URL, 'unicode'),
+
             ('clone_uri_tmpl', Repository.DEFAULT_CLONE_URI, 'unicode'),
+            ('clone_uri_ssh_tmpl', Repository.DEFAULT_CLONE_URI_SSH, 'unicode'),
             ('support_url', '', 'unicode'),
             ('update_url', RhodeCodeSetting.DEFAULT_UPDATE_URL, 'unicode'),
-            ('show_revision_number', True, 'bool'),
-            ('show_sha_length', 12, 'int'),
+
+            # VCS Settings
+            ('pr_merge_enabled', True, 'bool'),
+            ('use_outdated_comments', True, 'bool'),
+            ('diff_cache', True, 'bool'),
         ]
 
         for key, val, type_ in settings:

rhodecode/lib/helpers.py

@@ -598,9 +598,10 b' class _Message(object):'
     * ``category``: the category specified when the message was created.
     """
 
-    def __init__(self, category, message):
+    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
@@ -663,7 +664,17 b' class Flash(object):'
         # of strings.
         for cat in self.categories:
             for msg in session.pop_flash(queue=cat):
-                messages.append(_Message(cat, msg))
+                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))
@@ -673,23 +684,14 b' class Flash(object):'
 
     def json_alerts(self, session=None, request=None):
         payloads = []
-        messages = flash.pop_messages(session=session, request=request)
-        if messages:
+        messages = flash.pop_messages(session=session, request=request) or []
             for message in messages:
-                subdata = {}
-                if hasattr(message.message, 'rsplit'):
-                    flash_data = message.message.rsplit('|DELIM|', 1)
-                    org_message = flash_data[0]
-                    if len(flash_data) > 1:
-                        subdata = json.loads(flash_data[1])
-                else:
-                    org_message = message.message
                 payloads.append({
                     'message': {
-                        'message': u'{}'.format(org_message),
+                    'message': u'{}'.format(message.message),
                         'level': message.category,
                         'force': True,
-                        'subdata': subdata
+                    'subdata': message.sub_data
                     }
                 })
         return json.dumps(payloads)
@@ -1514,6 +1516,9 b' def get_active_pattern_entries(repo_name'
     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',
@@ -1522,7 +1527,10 b' def process_patterns(text_string, repo_n'
         raise ValueError('Link format can be only one of:{} got {}'.format(
                          allowed_formats, link_format))
 
-    active_entries = active_entries or get_active_pattern_entries(repo_name)
+    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
 
@@ -1537,6 +1545,9 b' def process_patterns(text_string, repo_n'
         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:
@@ -1569,7 +1580,7 b' def process_patterns(text_string, repo_n'
     pr_url_func = partial(
         _process_url_func, repo_name=repo_name, entry=pr_entry, uid=None,
         link_format=link_format+'+hovercard')
-    new_text = re.compile(r'(?:(?:^!)|(?: !))(\d+)').sub(pr_url_func, new_text)
+    new_text = pr_pattern_re.sub(pr_url_func, new_text)
     log.debug('processed !pr pattern')
 
     return new_text, issues_data
@@ -1580,6 +1591,7 b' def urlify_commit_message(commit_text, r'
     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;')
 
@@ -1636,7 +1648,7 b' def renderer_from_filename(filename, exc'
 
 
 def render(source, renderer='rst', mentions=False, relative_urls=None,
-           repo_name=None):
+           repo_name=None, active_pattern_entries=None):
 
     def maybe_convert_relative_links(html_source):
         if relative_urls:
@@ -1651,7 +1663,8 b" def render(source, renderer='rst', menti"
         if repo_name:
             # process patterns on comments if we pass in repo name
             source, issues = process_patterns(
-                source, repo_name, link_format='rst')
+                source, repo_name, link_format='rst',
+                active_entries=active_pattern_entries)
 
         return literal(
             '<div class="rst-block">%s</div>' %
@@ -1662,7 +1675,8 b" def render(source, renderer='rst', menti"
         if repo_name:
             # process patterns on comments if we pass in repo name
             source, issues = process_patterns(
-                source, repo_name, link_format='markdown')
+                source, repo_name, link_format='markdown',
+                active_entries=active_pattern_entries)
 
         return literal(
             '<div class="markdown-block">%s</div>' %

rhodecode/lib/markup_renderer.py

@@ -47,6 +47,14 b' log = logging.getLogger(__name__)'
 # default renderer used to generate automated comments
 DEFAULT_COMMENTS_RENDERER = 'rst'
 
+try:
+    from lxml.html import fromstring
+    from lxml.html import tostring
+except ImportError:
+    log.exception('Failed to import lxml')
+    fromstring = None
+    tostring = None
+
 
 class CustomHTMLTranslator(writers.html4css1.HTMLTranslator):
     """
@@ -81,11 +89,7 b' def relative_links(html_source, server_p'
     if not html_source:
         return html_source
 
-    try:
-        from lxml.html import fromstring
-        from lxml.html import tostring
-    except ImportError:
-        log.exception('Failed to import lxml')
+    if not fromstring and tostring:
         return html_source
 
     try:
@@ -210,6 +214,8 b' class MarkupRenderer(object):'
     URL_PAT = re.compile(r'(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]'
                          r'|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)')
 
+    MENTION_PAT = re.compile(MENTIONS_REGEX)
+
     extensions = ['markdown.extensions.codehilite', 'markdown.extensions.extra',
                   'markdown.extensions.def_list', 'markdown.extensions.sane_lists']
 
@@ -348,6 +354,26 b' class MarkupRenderer(object):'
         return cls.URL_PAT.sub(url_func, text)
 
     @classmethod
+    def convert_mentions(cls, text, mode):
+        mention_pat = cls.MENTION_PAT
+
+        def wrapp(match_obj):
+            uname = match_obj.groups()[0]
+            hovercard_url = "pyroutes.url('hovercard_username', {'username': '%s'});" % uname
+
+            if mode == 'markdown':
+                tmpl = '<strong class="tooltip-hovercard" data-hovercard-alt="{uname}" data-hovercard-url="{hovercard_url}">@{uname}</strong>'
+            elif mode == 'rst':
+                tmpl = ' **@{uname}** '
+            else:
+                raise ValueError('mode must be rst or markdown')
+
+            return tmpl.format(**{'uname': uname,
+                                  'hovercard_url': hovercard_url})
+
+        return mention_pat.sub(wrapp, text).strip()
+
+    @classmethod
     def plain(cls, source, universal_newline=True, leading_newline=True):
         source = safe_unicode(source)
         if universal_newline:
@@ -378,12 +404,7 b' class MarkupRenderer(object):'
                 cls.extensions, cls.output_format)
 
         if mentions:
-            mention_pat = re.compile(MENTIONS_REGEX)
-
-            def wrapp(match_obj):
-                uname = match_obj.groups()[0]
-                return ' **@%(uname)s** ' % {'uname': uname}
-            mention_hl = mention_pat.sub(wrapp, source).strip()
+            mention_hl = cls.convert_mentions(source, mode='markdown')
             # we extracted mentions render with this using Mentions false
             return cls.markdown(mention_hl, safe=safe, flavored=flavored,
                                 mentions=False)
@@ -409,12 +430,7 b' class MarkupRenderer(object):'
     @classmethod
     def rst(cls, source, safe=True, mentions=False, clean_html=False):
         if mentions:
-            mention_pat = re.compile(MENTIONS_REGEX)
-
-            def wrapp(match_obj):
-                uname = match_obj.groups()[0]
-                return ' **@%(uname)s** ' % {'uname': uname}
-            mention_hl = mention_pat.sub(wrapp, source).strip()
+            mention_hl = cls.convert_mentions(source, mode='rst')
             # we extracted mentions render with this using Mentions false
             return cls.rst(mention_hl, safe=safe, mentions=False)
 
@@ -443,7 +459,7 b' class MarkupRenderer(object):'
         except Exception:
             log.exception('Error when rendering RST')
             if safe:
-                log.debug('Fallbacking to render in plain mode')
+                log.debug('Fallback to render in plain mode')
                 return cls.plain(source)
             else:
                 raise

rhodecode/lib/middleware/simplevcs.py

@@ -133,15 +133,16 b' class SimpleVCS(object):'
         self.config = config
         # re-populated by specialized middleware
         self.repo_vcs_config = base.Config()
-        self.rhodecode_settings = SettingsModel().get_all_settings(cache=True)
 
-        registry.rhodecode_settings = self.rhodecode_settings
+        rc_settings = SettingsModel().get_all_settings(cache=True, from_request=False)
+        realm = rc_settings.get('rhodecode_realm') or 'RhodeCode AUTH'
+
         # authenticate this VCS request using authfunc
         auth_ret_code_detection = \
             str2bool(self.config.get('auth_ret_code_detection', False))
         self.authenticate = BasicAuth(
             '', authenticate, registry, config.get('auth_ret_code'),
-            auth_ret_code_detection)
+            auth_ret_code_detection, rc_realm=realm)
         self.ip_addr = '0.0.0.0'
 
     @LazyProperty

rhodecode/lib/rc_beaker.py

@@ -32,10 +32,14 b' def BeakerSessionFactoryConfig(**options'
 
             def session_callback(request, response):
                 exception = getattr(request, 'exception', None)
-                if (exception is None or self._cookie_on_exception) and self.accessed():
+                file_response = getattr(request, '_file_response', None)
+
+                if file_response is None \
+                        and (exception is None or self._cookie_on_exception) \
+                        and self.accessed():
                     self.persist()
                     headers = self.__dict__['_headers']
-                    if headers['set_cookie'] and headers['cookie_out']:
+                    if headers.get('set_cookie') and headers.get('cookie_out'):
                         response.headerlist.append(('Set-Cookie', headers['cookie_out']))
             request.add_response_callback(session_callback)
 

rhodecode/lib/repo_maintenance.py

@@ -148,6 +148,15 b' class HGUpdateCaches(MaintenanceTask):'
         return res
 
 
+class HGRebuildFnCaches(MaintenanceTask):
+    human_name = 'HG rebuild fn caches'
+
+    def run(self):
+        instance = self.db_repo.scm_instance()
+        res = instance.hg_rebuild_fn_cache()
+        return res
+
+
 class SVNVerify(MaintenanceTask):
     human_name = 'SVN Verify repo'
 
@@ -162,7 +171,7 b' class RepoMaintenance(object):'
     Performs maintenance of repository based on it's type
     """
     tasks = {
-        'hg': [HGVerify, HGUpdateCaches],
+        'hg': [HGVerify, HGUpdateCaches, HGRebuildFnCaches],
         'git': [GitFSCK, GitGC, GitRepack],
         'svn': [SVNVerify],
     }

rhodecode/lib/vcs/backends/git/commit.py

@@ -432,8 +432,11 b' class GitCommit(base.BaseCommit):'
         """
         if not self.parents:
             return list(self._get_file_nodes())
-        return AddedFileNodesGenerator(
-            [n for n in self._get_paths_for_status('added')], self)
+        return AddedFileNodesGenerator(self.added_paths, self)
+
+    @LazyProperty
+    def added_paths(self):
+        return [n for n in self._get_paths_for_status('added')]
 
     @LazyProperty
     def changed(self):
@@ -442,8 +445,11 b' class GitCommit(base.BaseCommit):'
         """
         if not self.parents:
             return []
-        return ChangedFileNodesGenerator(
-            [n for n in self._get_paths_for_status('modified')], self)
+        return ChangedFileNodesGenerator(self.changed_paths, self)
+
+    @LazyProperty
+    def changed_paths(self):
+        return [n for n in self._get_paths_for_status('modified')]
 
     @LazyProperty
     def removed(self):
@@ -452,8 +458,11 b' class GitCommit(base.BaseCommit):'
         """
         if not self.parents:
             return []
-        return RemovedFileNodesGenerator(
-            [n for n in self._get_paths_for_status('deleted')], self)
+        return RemovedFileNodesGenerator(self.removed_paths, self)
+
+    @LazyProperty
+    def removed_paths(self):
+        return [n for n in self._get_paths_for_status('deleted')]
 
     def _get_submodule_url(self, submodule_path):
         git_modules_path = '.gitmodules'
@@ -472,7 +481,7 b' class GitCommit(base.BaseCommit):'
                 for line in _content.splitlines():
                     yield line
 
-            parser = configparser.ConfigParser()
+            parser = configparser.RawConfigParser()
             parser.read_file(iter_content(submodules_node.content))
 
             for section in parser.sections():

rhodecode/lib/vcs/backends/hg/commit.py

@@ -372,18 +372,30 b' class MercurialCommit(base.BaseCommit):'
         """
         Returns list of added ``FileNode`` objects.
         """
-        return AddedFileNodesGenerator([n for n in self.status[1]], self)
+        return AddedFileNodesGenerator(self.added_paths, self)
+
+    @LazyProperty
+    def added_paths(self):
+        return [n for n in self.status[1]]
 
     @property
     def changed(self):
         """
         Returns list of modified ``FileNode`` objects.
         """
-        return ChangedFileNodesGenerator([n for n in self.status[0]], self)
+        return ChangedFileNodesGenerator(self.changed_paths, self)
+
+    @LazyProperty
+    def changed_paths(self):
+        return [n for n in self.status[0]]
 
     @property
     def removed(self):
         """
         Returns list of removed ``FileNode`` objects.
         """
-        return RemovedFileNodesGenerator([n for n in self.status[2]], self)
+        return RemovedFileNodesGenerator(self.removed_paths, self)
+
+    @LazyProperty
+    def removed_paths(self):
+        return [n for n in self.status[2]]

rhodecode/lib/vcs/backends/hg/repository.py

@@ -290,6 +290,12 b' class MercurialRepository(BaseRepository'
         self._remote.invalidate_vcs_cache()
         return update_cache
 
+    def hg_rebuild_fn_cache(self):
+        update_cache = self._remote.hg_rebuild_fn_cache()
+
+        self._remote.invalidate_vcs_cache()
+        return update_cache
+
     def get_common_ancestor(self, commit_id1, commit_id2, repo2):
         if commit_id1 == commit_id2:
             return commit_id1

rhodecode/lib/vcs/backends/svn/commit.py

@@ -218,18 +218,27 b' class SubversionCommit(base.BaseCommit):'
 
     @property
     def added(self):
-        return nodes.AddedFileNodesGenerator(
-            self._changes_cache['added'], self)
+        return nodes.AddedFileNodesGenerator(self.added_paths, self)
+
+    @LazyProperty
+    def added_paths(self):
+        return [n for n in self._changes_cache['added']]
 
     @property
     def changed(self):
-        return nodes.ChangedFileNodesGenerator(
-            self._changes_cache['changed'], self)
+        return nodes.ChangedFileNodesGenerator(self.changed_paths, self)
+
+    @LazyProperty
+    def changed_paths(self):
+        return [n for n in self._changes_cache['changed']]
 
     @property
     def removed(self):
-        return nodes.RemovedFileNodesGenerator(
-            self._changes_cache['removed'], self)
+        return nodes.RemovedFileNodesGenerator(self.removed_paths, self)
+
+    @LazyProperty
+    def removed_paths(self):
+        return [n for n in self._changes_cache['removed']]
 
 
 def _date_from_svn_properties(properties):

rhodecode/lib/vcs/conf/mtypes.py

@@ -18,6 +18,19 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+DEFAULTS = {
+ 'encodings_map': {'.gz': 'gzip',
+                   '.Z': 'compress',
+                   '.bz2': 'bzip2',
+                   '.xz': 'xz'},
+ 'suffix_map': {'.svgz': '.svg.gz',
+                '.tgz': '.tar.gz',
+                '.taz': '.tar.gz',
+                '.tz': '.tar.gz',
+                '.tbz2': '.tar.bz2',
+                '.txz': '.tar.xz'},
+}
+
 TYPES_MAP = [
  {'.jpg': 'image/jpg',
   '.mid': 'audio/midi',
@@ -1203,4 +1216,6 b' def get_mimetypes_db(extra_types=None):'
         types_map[1].update(extra_types)
     db = mimetypes.MimeTypes()
     db.types_map = types_map
+    db.encodings_map.update(DEFAULTS['encodings_map'])
+    db.suffix_map.update(DEFAULTS['suffix_map'])
     return db

rhodecode/model/db.py

@@ -1025,6 +1025,17 b' class User(Base, BaseModel):'
         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:
@@ -3890,8 +3901,8 b' class _SetState(object):'
         self._current_state = None
 
     def __enter__(self):
-        log.debug('StateLock: entering set state context, setting state to: `%s`',
-                  self._pr_state)
+        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
 
@@ -3901,8 +3912,9 b' class _SetState(object):'
             return None
 
         self.set_pr_state(self._org_state)
-        log.debug('StateLock: exiting set state context, setting state to: `%s`',
-                  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
@@ -4285,6 +4297,7 b' class PullRequest(Base, _PullRequestBase'
     def __json__(self):
         return {
             'revisions': self.revisions,
+            'versions': self.versions_count
         }
 
     def calculated_review_status(self):
@@ -4307,6 +4320,14 b' class PullRequest(Base, _PullRequestBase'
             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'

rhodecode/model/permission.py

@@ -21,8 +21,7 b''
 """
 permissions model for RhodeCode
 """
-
-
+import collections
 import logging
 import traceback
 
@@ -557,6 +556,27 b' class PermissionModel(BaseModel):'
             self.sa.rollback()
             raise
 
+    def get_users_with_repo_write(self, db_repo):
+        write_plus = ['repository.write', 'repository.admin']
+        default_user_id = User.get_default_user().user_id
+        user_write_permissions = collections.OrderedDict()
+
+        # write+ and DEFAULT user for inheritance
+        for perm in db_repo.permissions():
+            if perm.permission in write_plus or perm.user_id == default_user_id:
+                user_write_permissions[perm.user_id] = perm
+        return user_write_permissions
+
+    def get_user_groups_with_repo_write(self, db_repo):
+        write_plus = ['repository.write', 'repository.admin']
+        user_group_write_permissions = collections.OrderedDict()
+
+        # write+ and DEFAULT user for inheritance
+        for p in db_repo.permission_user_groups():
+            if p.permission in write_plus:
+                user_group_write_permissions[p.users_group_id] = p
+        return user_group_write_permissions
+
     def trigger_permission_flush(self, affected_user_ids):
         events.trigger(events.UserPermissionsChange(affected_user_ids))
 

rhodecode/model/pull_request.py

@@ -26,6 +26,8 b' pull request model for RhodeCode'
 
 import json
 import logging
+import os
+
 import datetime
 import urllib
 import collections
@@ -632,6 +634,7 b' class PullRequestModel(BaseModel):'
         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)
@@ -647,7 +650,6 b' class PullRequestModel(BaseModel):'
             target_vcs.config.set(
                 'rhodecode', 'RC_SCM_DATA', json.dumps(extras))
 
-            user_name = user.short_contact
             merge_state = target_vcs.merge(
                 repo_id, workspace_id, target_ref, source_vcs,
                 pull_request.source_ref_parts,
@@ -1664,6 +1666,16 b' class PullRequestModel(BaseModel):'
 
         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':

rhodecode/model/repo.py

@@ -38,8 +38,7 b' from rhodecode.lib.user_log_filter impor'
 from rhodecode.lib.utils import make_db_config
 from rhodecode.lib.utils2 import (
     safe_str, safe_unicode, remove_prefix, obfuscate_url_pw,
-    get_current_rhodecode_user, safe_int, datetime_to_time,
-    action_logger_generic)
+    get_current_rhodecode_user, safe_int, action_logger_generic)
 from rhodecode.lib.vcs.backends import get_backend
 from rhodecode.model import BaseModel
 from rhodecode.model.db import (
@@ -199,9 +198,11 b' class RepoModel(BaseModel):'
 
     def get_repos_as_dict(self, repo_list=None, admin=False,
                           super_user_actions=False, short_name=None):
+
         _render = get_current_request().get_partial_renderer(
             'rhodecode:templates/data_table/_dt_elements.mako')
         c = _render.get_call_context()
+        h = _render.get_helpers()
 
         def quick_menu(repo_name):
             return _render('quick_menu', repo_name)
@@ -258,7 +259,7 b' class RepoModel(BaseModel):'
                 "name": repo_lnk(repo.repo_name, repo.repo_type, repo.repo_state,
                                  repo.private, repo.archived, repo.fork),
 
-                "desc": desc(repo.description),
+                "desc": desc(h.escape(repo.description)),
 
                 "last_change": last_change(repo.updated_on),
 
@@ -619,13 +620,26 b' class RepoModel(BaseModel):'
         changes = {
             'added': [],
             'updated': [],
-            'deleted': []
+            'deleted': [],
+            'default_user_changed': None
         }
+
+        repo = self._get_repo(repo)
+
         # update permissions
         for member_id, perm, member_type in perm_updates:
             member_id = int(member_id)
             if member_type == 'user':
                 member_name = User.get(member_id).username
+                if member_name == User.DEFAULT_USER:
+                    # NOTE(dan): detect if we changed permissions for default user
+                    perm_obj = self.sa.query(UserRepoToPerm) \
+                        .filter(UserRepoToPerm.user_id == member_id) \
+                        .filter(UserRepoToPerm.repository == repo) \
+                        .scalar()
+                    if perm_obj and perm_obj.permission.permission_name != perm:
+                        changes['default_user_changed'] = True
+
                 # this updates also current one if found
                 self.grant_user_permission(
                     repo=repo, user=member_id, perm=perm)

rhodecode/model/repo_group.py

@@ -41,7 +41,7 b' from rhodecode.model.db import (_hash_ke'
     UserGroup, Repository)
 from rhodecode.model.settings import VcsSettingsModel, SettingsModel
 from rhodecode.lib.caching_query import FromCache
-from rhodecode.lib.utils2 import action_logger_generic, datetime_to_time
+from rhodecode.lib.utils2 import action_logger_generic
 
 log = logging.getLogger(__name__)
 
@@ -353,7 +353,8 b' class RepoGroupModel(BaseModel):'
         changes = {
             'added': [],
             'updated': [],
-            'deleted': []
+            'deleted': [],
+            'default_user_changed': None
         }
 
         def _set_perm_user(obj, user, perm):
@@ -430,6 +431,15 b' class RepoGroupModel(BaseModel):'
                 member_id = int(member_id)
                 if member_type == 'user':
                     member_name = User.get(member_id).username
+                    if isinstance(obj, RepoGroup) and obj == repo_group and member_name == User.DEFAULT_USER:
+                        # NOTE(dan): detect if we changed permissions for default user
+                        perm_obj = self.sa.query(UserRepoGroupToPerm) \
+                            .filter(UserRepoGroupToPerm.user_id == member_id) \
+                            .filter(UserRepoGroupToPerm.group == repo_group) \
+                            .scalar()
+                        if perm_obj and perm_obj.permission.permission_name != perm:
+                            changes['default_user_changed'] = True
+
                     # this updates also current one if found
                     _set_perm_user(obj, user=member_id, perm=perm)
                 elif member_type == 'user_group':
@@ -698,8 +708,6 b' class RepoGroupModel(BaseModel):'
         for repo_group in repo_groups:
             repo_group.update_commit_cache()
 
-
-
     def get_repo_groups_as_dict(self, repo_group_list=None, admin=False,
                                 super_user_actions=False):
 
@@ -753,7 +761,7 b' class RepoGroupModel(BaseModel):'
                 "last_changeset": "",
                 "last_changeset_raw": "",
 
-                "desc": desc(group.group_description, group.personal),
+                "desc": desc(h.escape(group.group_description), group.personal),
                 "top_level_repos": 0,
                 "owner": user_profile(group.User.username)
             }

rhodecode/model/settings.py

@@ -21,9 +21,11 b''
 import os
 import hashlib
 import logging
+import re
 from collections import namedtuple
 from functools import wraps
 import bleach
+from pyramid.threadlocal import get_current_request, get_current_registry
 
 from rhodecode.lib import rc_cache
 from rhodecode.lib.utils2 import (
@@ -210,7 +212,23 b' class SettingsModel(BaseModel):'
         invalidation_namespace = CacheKey.SETTINGS_INVALIDATION_NAMESPACE
         CacheKey.set_invalidate(invalidation_namespace)
 
-    def get_all_settings(self, cache=False):
+    def get_all_settings(self, cache=False, from_request=True):
+        from rhodecode.authentication.base import get_authn_registry
+
+        # defines if we use GLOBAL, or PER_REPO
+        repo = self._get_repo(self.repo) if self.repo else None
+        key = "settings_repo.{}".format(repo.repo_id) if repo else "settings_app"
+
+        # initially try the requests context, this is the fastest
+        # we only fetch global config
+        if from_request:
+            request = get_current_request()
+
+            if request and not repo and hasattr(request, 'call_context') and hasattr(request.call_context, 'rc_config'):
+                rc_config = request.call_context.rc_config
+                if rc_config:
+                    return rc_config
+
         region = rc_cache.get_or_create_region('sql_cache_short')
         invalidation_namespace = CacheKey.SETTINGS_INVALIDATION_NAMESPACE
 
@@ -226,9 +244,6 b' class SettingsModel(BaseModel):'
             }
             return settings
 
-        repo = self._get_repo(self.repo) if self.repo else None
-        key = "settings_repo.{}".format(repo.repo_id) if repo else "settings_app"
-
         inv_context_manager = rc_cache.InvalidationContext(
             uid='cache_settings', invalidation_namespace=invalidation_namespace)
         with inv_context_manager as invalidation_context:
@@ -240,6 +255,11 b' class SettingsModel(BaseModel):'
                 # are anyway very short lived and it's a safest way.
                 region = rc_cache.get_or_create_region('sql_cache_short')
                 region.invalidate()
+                registry = get_current_registry()
+                if registry:
+                    authn_registry = get_authn_registry(registry)
+                    if authn_registry:
+                        authn_registry.invalidate_plugins_for_auth()
 
             result = _get_all_settings('rhodecode_settings', key)
             log.debug('Fetching app settings for key: %s took: %.4fs', key,
@@ -360,9 +380,15 b' class IssueTrackerSettingsModel(object):'
         for uid in issuetracker_entries:
             url_data = qs.get(self._get_keyname('url', uid, 'rhodecode_'))
 
+            pat = qs.get(self._get_keyname('pat', uid, 'rhodecode_'))
+            try:
+                pat_compiled = re.compile(r'%s' % pat)
+            except re.error:
+                pat_compiled = None
+
             issuetracker_entries[uid] = AttributeDict({
-                'pat': qs.get(
-                    self._get_keyname('pat', uid, 'rhodecode_')),
+                'pat': pat,
+                'pat_compiled': pat_compiled,
                 'url': url_cleaner(
                     qs.get(self._get_keyname('url', uid, 'rhodecode_')) or ''),
                 'pref': bleach.clean(

rhodecode/model/ssh_key.py

@@ -38,6 +38,7 b' log = logging.getLogger(__name__)'
 
 class SshKeyModel(BaseModel):
     cls = UserSshKeys
+    DEFAULT_PRIVATE_KEY_FORMAT = 'pkcs8'
 
     def parse_key(self, key_data):
         """
@@ -66,16 +67,23 b' class SshKeyModel(BaseModel):'
             log.error("Key Parse error: %s", err)
             raise
 
-    def generate_keypair(self, comment=None):
+    def generate_keypair(self, comment=None, private_format=DEFAULT_PRIVATE_KEY_FORMAT):
 
         key = rsa.generate_private_key(
             backend=crypto_default_backend(),
             public_exponent=65537,
             key_size=2048
         )
+        if private_format == self.DEFAULT_PRIVATE_KEY_FORMAT:
+            private_format = crypto_serialization.PrivateFormat.PKCS8
+        else:
+            # legacy format that can be used by older systems, use if pkcs8 have
+            # problems
+            private_format = crypto_serialization.PrivateFormat.TraditionalOpenSSL
+
         private_key = key.private_bytes(
             crypto_serialization.Encoding.PEM,
-            crypto_serialization.PrivateFormat.PKCS8,
+            private_format,
             crypto_serialization.NoEncryption())
         public_key = key.public_key().public_bytes(
             crypto_serialization.Encoding.OpenSSH,

rhodecode/public/css/legacy_code_styles.less

@@ -134,14 +134,11 b' div.markdown-block h2 {'
 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 {
@@ -174,6 +171,21 b' div.markdown-block hr {'
     margin-bottom: 13px;
 }
 
+div.markdown-block blockquote {
+  color: #424242 !important;
+  padding: 8px 21px;
+  margin: 12px 0;
+  border-left: 4px solid @grey6;
+}
+
+div.markdown-block blockquote p {
+  color: #424242 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  line-height: 1.5;
+}
+
+
 div.markdown-block ol,
 div.markdown-block ul,
 div.markdown-block p,
@@ -181,13 +193,11 b' div.markdown-block blockquote,'
 div.markdown-block dl,
 div.markdown-block li,
 div.markdown-block table {
-    margin: 3px 0px 13px 0px !important;
     color: #424242 !important;
     font-size: 13px !important;
     font-family: @text-regular;
     font-weight: normal  !important;
     overflow: visible !important;
-    line-height: 140% !important;
 }
 
 div.markdown-block pre {
@@ -245,14 +255,6 b' div.markdown-block ol li {'
     list-style: decimal !important;
 }
 
-/*
-div.markdown-block a,
-div.markdown-block a:visited {
-    color: #4183C4 !important;
-    background-color: inherit;
-    text-decoration: none;
-}
-*/
 
 div.markdown-block #message {
     .border-radius(@border-radius);

rhodecode/public/css/main.less

@@ -87,6 +87,10 b' body {'
 	border-left: @border-thickness solid @border-default-color;
 }
 
+.cursor-pointer {
+  cursor: pointer;
+}
+
 input + .action-link, .action-link.first{
 	border-left: none;
 }

rhodecode/public/css/readme-box.less

@@ -3,9 +3,13 b''
 .readme-title {
     border: 1px solid @grey6;
     padding: 10px 5px;
-    font-weight: 600;
     margin-top: 30px;
     margin-bottom: -1px;
+
+    a {
+        font-weight: 600;
+        font-size: 13px
+    }
 }
 
 div.readme_box {
@@ -34,14 +38,11 b' div.readme_box h2 {'
 div.readme_box h1 {
     font-size: 32px;
     margin: 15px 0 15px 0 !important;
-    padding-bottom: 5px !important;
 }
 
 div.readme_box h2 {
     font-size: 24px !important;
     margin: 34px 0 10px 0 !important;
-    padding-top: 15px !important;
-    padding-bottom: 8px !important;
 }
 
 div.readme_box h3 {
@@ -74,6 +75,20 b' div.readme_box hr {'
     margin-bottom: 13px;
 }
 
+div.readme_box blockquote {
+  color: #424242 !important;
+  padding: 8px 21px;
+  margin: 12px 0;
+  border-left: 4px solid @grey6;
+}
+
+div.readme_box blockquote p {
+  color: #424242 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  line-height: 1.5;
+}
+
 div.readme_box ol,
 div.readme_box ul,
 div.readme_box p,
@@ -81,13 +96,11 b' div.readme_box blockquote,'
 div.readme_box dl,
 div.readme_box li,
 div.readme_box table {
-    margin: 3px 0px 13px 0px !important;
     color: #424242 !important;
     font-size: 13px !important;
     font-family: @text-regular;
     font-weight: normal  !important;
     overflow: visible !important;
-    line-height: 140% !important;
 }
 
 div.readme_box pre {

rhodecode/public/css/tables.less

@@ -373,6 +373,17 b' table#repo_list_table {'
     min-width: 600px;
 }
 
+#no_grid_data {
+    text-align: center;
+}
+
+#grid_data_loading {
+    text-align: center;
+    font-weight: 600;
+    font-size: 16px;
+    padding: 80px 20px;
+}
+
 // Keyboard mappings
 table.keyboard-mappings {
     th {
@@ -538,5 +549,12 b' table.compare_view_commits {'
         img{
             vertical-align: middle;
         }
+
+        &.td-expire {
+            width: 200px;
+        }
+        &.td-gist-type {
+            width: 100px;
     }
 }
+}

rhodecode/public/css/type.less

@@ -593,7 +593,7 b' address {'
 }
 
 .help-block-inline {
-  margin: 0;
+  margin: 0 !important;
 }
 
 // help block text

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

@@ -11,28 +11,38 b' var _TM = {'
     '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.',
     '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 this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    '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.',
     '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 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.',
@@ -41,7 +51,9 b' var _TM = {'
     '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.',
@@ -125,9 +137,11 b' var _TM = {'
     '{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',

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

@@ -11,28 +11,38 b' var _TM = {'
     '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.',
     '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 this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    '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.',
     '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 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.',
@@ -41,7 +51,9 b' var _TM = {'
     '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.',
@@ -125,9 +137,11 b' var _TM = {'
     '{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',

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

@@ -11,28 +11,38 b' var _TM = {'
     '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.',
     '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 this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    '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.',
     '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 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.',
@@ -41,7 +51,9 b' var _TM = {'
     '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.',
@@ -125,9 +137,11 b' var _TM = {'
     '{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',

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

@@ -11,28 +11,38 b' var _TM = {'
     '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.',
     '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 this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    '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.',
     '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 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.',
@@ -41,7 +51,9 b' var _TM = {'
     '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.',
@@ -125,9 +137,11 b' var _TM = {'
     '{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',

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

@@ -11,28 +11,38 b' var _TM = {'
     '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.',
     '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 this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    '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.',
     '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 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.',
@@ -41,7 +51,9 b' var _TM = {'
     '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.',
@@ -125,9 +137,11 b' var _TM = {'
     '{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',

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

@@ -11,28 +11,38 b' var _TM = {'
     '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.',
     '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 this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    '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.',
     '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 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.',
@@ -41,7 +51,9 b' var _TM = {'
     '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.',
@@ -125,9 +137,11 b' var _TM = {'
     '{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',

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

@@ -11,28 +11,38 b' var _TM = {'
     '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.',
     '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 this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    '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.',
     '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 failed': '読み込み失敗',
     'Loading more results...': '結果を読み込み中...',
+    'Loading...': 'Loading...',
     'No bookmarks available yet.': 'まだブックマークがありません。',
     'No branches available yet.': 'まだブランチがありません。',
     'No forks available yet.': 'No forks available yet.',
@@ -41,7 +51,9 b' var _TM = {'
     '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.': 'まだタグがありません。',
@@ -125,9 +137,11 b' var _TM = {'
     '{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} 秒',

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

@@ -5,28 +5,38 b''
 _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('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 this comment?');
 _gettext('Diff to Commit ');
+_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('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 failed');
 _gettext('Loading more results...');
+_gettext('Loading...');
 _gettext('No bookmarks available yet.');
 _gettext('No branches available yet.');
 _gettext('No forks available yet.');
@@ -35,7 +45,9 b''
 _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.');
@@ -119,9 +131,11 b''
 _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');

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

@@ -11,28 +11,38 b' var _TM = {'
     '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.',
     '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 this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    '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.',
     '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 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.',
@@ -41,7 +51,9 b' var _TM = {'
     '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.',
@@ -125,9 +137,11 b' var _TM = {'
     '{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',

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

@@ -11,28 +11,38 b' var _TM = {'
     '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.',
     '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 this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    '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.',
     '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 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.',
@@ -41,7 +51,9 b' var _TM = {'
     '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.',
@@ -125,9 +137,11 b' var _TM = {'
     '{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',

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

@@ -11,28 +11,38 b' var _TM = {'
     '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.',
     '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 this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    '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.',
     '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 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.',
@@ -41,7 +51,9 b' var _TM = {'
     '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.',
@@ -125,9 +137,11 b' var _TM = {'
     '{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',

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

@@ -11,28 +11,38 b' var _TM = {'
     '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.',
     '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 this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
+    '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.',
     '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 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.',
@@ -41,7 +51,9 b' var _TM = {'
     '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.',
@@ -125,9 +137,11 b' var _TM = {'
     '{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',

rhodecode/public/js/rhodecode/routes.js

@@ -31,6 +31,7 b' function registerRCRoutes() {'
     pyroutes.register('repo_integrations_create', '/%(repo_name)s/settings/integrations/%(integration)s/new', ['repo_name', 'integration']);
     pyroutes.register('repo_integrations_edit', '/%(repo_name)s/settings/integrations/%(integration)s/%(integration_id)s', ['repo_name', 'integration', 'integration_id']);
     pyroutes.register('hovercard_user', '/_hovercard/user/%(user_id)s', ['user_id']);
+    pyroutes.register('hovercard_username', '/_hovercard/username/%(username)s', ['username']);
     pyroutes.register('hovercard_user_group', '/_hovercard/user_group/%(user_group_id)s', ['user_group_id']);
     pyroutes.register('hovercard_pull_request', '/_hovercard/pull_request/%(pull_request_id)s', ['pull_request_id']);
     pyroutes.register('hovercard_repo_commit', '/_hovercard/commit/%(repo_name)s/%(commit_id)s', ['repo_name', 'commit_id']);

rhodecode/public/js/src/rhodecode.js

@@ -299,6 +299,10 b' var tooltipActivate = function () {'
                 var altHovercard =$origin.data('hovercardAlt');
 
                 if (hovercardUrl !== undefined && hovercardUrl !== "") {
+                    if (hovercardUrl.substr(0,12) === 'pyroutes.url'){
+                        hovercardUrl = eval(hovercardUrl)
+                    }
+
                     var loaded = loadHoverCard(hovercardUrl, altHovercard, function (data) {
                         instance.content(data);
                     })

rhodecode/templates/admin/gists/gist_index.mako

@@ -102,7 +102,7 b''
          { data: {"_": "author",
                   "sort": "author_raw"}, title: "${_("Author")}", width: "250px", className: "td-user" },
          { data: {"_": "type",
-                  "sort": "type"}, title: "${_("Type")}", width: "70px", className: "td-tags" },
+                  "sort": "type"}, title: "${_("Type")}", width: "100px", className: "td-gist-type" },
          { data: {"_": "access_id",
                   "sort": "access_id"}, title: "${_("Name")}", width:"150px", className: "td-componentname" },
          { data: {"_": "description",
@@ -110,7 +110,7 b''
          { data: {"_": "created_on",
                   "sort": "created_on_raw"}, title: "${_("Created on")}", className: "td-time" },
          { data: {"_": "expires",
-                  "sort": "expires"}, title: "${_("Expires")}", className: "td-exp" }
+                  "sort": "expires"}, title: "${_("Expires")}", width: "200px", className: "td-expire" }
       ],
       language: {
           paginate: DEFAULT_GRID_PAGINATION,

rhodecode/templates/admin/my_account/my_account_auth_tokens.mako

@@ -71,7 +71,7 b''
                     <div class="input">
                         ${h.text('description', class_='medium', placeholder=_('Description'))}
                         ${h.hidden('lifetime')}
-                        ${h.select('role', '', c.role_options)}
+                        ${h.select('role', request.GET.get('token_role', ''), c.role_options)}
 
                         % if c.allow_scoped_tokens:
                             ${h.hidden('scope_repo_id')}

rhodecode/templates/admin/my_account/my_account_password.mako

@@ -4,6 +4,8 b''
 
 % if c.extern_type != 'rhodecode':
     <p>${_('Your user account details are managed by an external source. Details cannot be managed here.')}
+    <br/>${_('For VCS access please generate')}
+        <a href="${h.route_path('my_account_auth_tokens', _query={'token_role':'token_role_vcs'})}">Authentication Token</a> or <a href="${h.route_path('my_account_ssh_keys_generate')}">SSH Key</a>.
        <br/>${_('Source type')}: <strong>${c.extern_type}</strong>
     </p>
 % else:

rhodecode/templates/admin/my_account/my_account_profile.mako

@@ -8,6 +8,17 b''
     </div>
 
     <div class="panel-body fields">
+        %if c.extern_type != 'rhodecode':
+            <% readonly = "readonly" %>
+            <% disabled = " disabled" %>
+            <div class="alert-warning" style="margin:0px 0px 20px 0px; padding: 10px">
+                <strong>${_('This user was created from external source (%s). Editing some of the settings is limited.' % c.extern_type)}</strong>
+            </div>
+            <div style="margin:-10px 0px 20px 0px;">
+                ${_('For VCS access please generate')}
+                <a href="${h.route_path('my_account_auth_tokens', _query={'token_role':'token_role_vcs'})}">Authentication Token</a> or <a href="${h.route_path('my_account_ssh_keys_generate')}">SSH Key</a>.
+            </div>
+        %endif
         <div class="field">
             <div class="label">
                 ${_('Photo')}:

rhodecode/templates/admin/my_account/my_account_profile_edit.mako

@@ -12,12 +12,18 b''
     %if c.extern_type != 'rhodecode':
         <% readonly = "readonly" %>
         <% disabled = "disabled" %>
+        <div class="alert-warning" style="margin:0px 0px 20px 0px; padding: 10px">
+            <strong>${_('This user was created from external source (%s). Editing some of the settings is limited.' % c.extern_type)}</strong>
+        </div>
+        <div style="margin:-10px 0px 20px 0px;">
+            ${_('For VCS access please generate')}
+            <a href="${h.route_path('my_account_auth_tokens', _query={'token_role':'token_role_vcs'})}">Authentication Token</a> or <a href="${h.route_path('my_account_ssh_keys_generate')}">SSH Key</a>.
+        </div>
+    %endif
+
+    %if c.extern_type != 'rhodecode':
         <div class="infoform">
           <div class="fields">
-            <p>${_('Your user account details are managed by an external source. Details cannot be managed here.')}
-               <br/>${_('Source type')}: <strong>${c.extern_type}</strong>
-            </p>
-
             <div class="field">
                <div class="label">
                    <label for="username">${_('Username')}:</label>

rhodecode/templates/admin/repo_groups/repo_group_add.mako

@@ -55,7 +55,13 b''
                 <div class="textarea editor">
                     ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
                     <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
-                    <span class="help-block">${_('Plain text format with support of {metatags}').format(metatags=metatags_url)|n}</span>
+                    <span class="help-block">
+                        % if c.visual.stylify_metatags:
+                            ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
+                        % else:
+                            ${_('Plain text format.')}
+                        % endif
+                    </span>
                     <span id="meta-tags-desc" style="display: none">
                         <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
                         ${dt.metatags_help()}

rhodecode/templates/admin/repo_groups/repo_group_edit.mako

@@ -28,7 +28,7 b''
     <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
           <li class="${h.is_active('settings', c.active)}"><a href="${h.route_path('edit_repo_group', repo_group_name=c.repo_group.group_name)}">${_('Settings')}</a></li>
-          <li class="${h.is_active('permissions', c.active)}"><a href="${h.route_path('edit_repo_group_perms', repo_group_name=c.repo_group.group_name)}">${_('Permissions')}</a></li>
+          <li class="${h.is_active('permissions', c.active)}"><a href="${h.route_path('edit_repo_group_perms', repo_group_name=c.repo_group.group_name)}">${_('Access Permissions')}</a></li>
           <li class="${h.is_active('advanced', c.active)}"><a href="${h.route_path('edit_repo_group_advanced', repo_group_name=c.repo_group.group_name)}">${_('Advanced')}</a></li>
           <li class="${h.is_active('integrations', c.active)}"><a href="${h.route_path('repo_group_integrations_home', repo_group_name=c.repo_group.group_name)}">${_('Integrations')}</a></li>
         </ul>

rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako

@@ -61,7 +61,12 b''
                             ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
                             <span class="user">
                                 % if _user.username == h.DEFAULT_USER:
-                                    ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
+                                    ${h.DEFAULT_USER}
+                                    % if _user.active:
+                                        <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
+                                    % else:
+                                        <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
+                                    % endif
                                 % else:
                                     ${h.link_to_user(_user.username)}
                                     %if getattr(_user, 'duplicate_perm', None):
@@ -104,7 +109,12 b''
                                 ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
                                 <span class="user">
                                     % if _user.username == h.DEFAULT_USER:
-                                        ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
+                                        ${h.DEFAULT_USER}
+                                        % if _user.active:
+                                            <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
+                                        % else:
+                                            <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
+                                        % endif
                                     % else:
                                         ${h.link_to_user(_user.username)}
                                         %if getattr(_user, 'duplicate_perm', None):

rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako

@@ -59,7 +59,13 b''
                         ${c.form.render_error(request, c.form['repo_group_description'])|n}
 
                         <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
-                        <span class="help-block">${_('Plain text format with support of {metatags}').format(metatags=metatags_url)|n}</span>
+                        <span class="help-block">
+                            % if c.visual.stylify_metatags:
+                                ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
+                            % else:
+                                ${_('Plain text format.')}
+                            % endif
+                        </span>
                         <span id="meta-tags-desc" style="display: none">
                             <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
                             ${dt.metatags_help()}

rhodecode/templates/admin/repos/repo_add_base.mako

@@ -68,7 +68,14 b''
             <div class="textarea editor">
                 ${h.textarea('repo_description',cols=23,rows=5,class_="medium")}
                 <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
-                <span class="help-block">${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n}</span>
+                <span class="help-block">
+                    % if c.visual.stylify_metatags:
+                        ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
+                    % else:
+                        ${_('Plain text format.')}
+                    % endif
+                    ${_('Add a README file for longer descriptions')}
+                </span>
                 <span id="meta-tags-desc" style="display: none">
                     <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
                     ${dt.metatags_help()}

rhodecode/templates/admin/repos/repo_edit_issuetracker.mako

@@ -23,6 +23,7 b''
             <div class="panel-heading">
                 <h3 class="panel-title">${_('Inherited Issue Tracker Patterns')}</h3>
             </div>
+
             <div class="panel-body">
                 <table class="rctable issuetracker readonly">
           <tr>
@@ -32,6 +33,7 b''
               <th>${_('Prefix')}</th>
               <th ></th>
           </tr>
+
               %for uid, entry in c.global_patterns.items():
             <tr id="${uid}">
                 <td class="td-description issuetracker_desc">
@@ -60,6 +62,9 b''
           %endfor
 
           </table>
+                  <div class="buttons">
+                      <button type="submit" class="btn btn-primary save-inheritance" id="save">${_('Save')}</button>
+                  </div>
             </div>
         </div>
       </div>
@@ -77,7 +82,6 b''
                     )}
                   <div class="buttons">
                       <button type="submit" class="btn btn-primary save-inheritance" id="save">${_('Save')}</button>
-                      <button type="reset" class="btn reset-inheritance">${_('Reset')}</button>
                   </div>
             </div>
         </div>

rhodecode/templates/admin/repos/repo_edit_permissions.mako

@@ -58,7 +58,11 b''
                         <td class="private_repo_msg">
                             ${base.gravatar(h.DEFAULT_USER_EMAIL, 16)}
                             ${h.DEFAULT_USER} - ${_('only users/user groups explicitly added here will have access')}</td>
-                        <td></td>
+                        <td class="td-action">
+                            <span class="tooltip btn btn-link btn-default" onclick="setPrivateRepo(false); return false" title="${_('Private repositories are only visible to people explicitly added as collaborators. Default permissions wont apply')}">
+                            ${_('un-set private mode')}
+                            </span>
+                        </td>
                         <td class="quick_repo_menu">
                             % if c.rhodecode_user.is_admin:
                                 <i class="icon-more"></i>
@@ -83,7 +87,12 b''
                             ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
                             <span class="user">
                                 % if _user.username == h.DEFAULT_USER:
-                                    ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
+                                    ${h.DEFAULT_USER}
+                                    % if _user.active:
+                                        <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
+                                    % else:
+                                        <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
+                                    % endif
                                 % else:
                                     ${h.link_to_user(_user.username)}
                                     %if getattr(_user, 'duplicate_perm', None):
@@ -106,7 +115,7 b''
                             ${_('Remove')}
                             </span>
                           %elif _user.username == h.DEFAULT_USER:
-                            <span class="tooltip btn btn-link btn-default" onclick="enablePrivateRepo(); return false" title="${_('Private repositories are only visible to people explicitly added as collaborators.')}">
+                            <span class="tooltip btn btn-link btn-default" onclick="setPrivateRepo(true); return false" title="${_('Private repositories are only visible to people explicitly added as collaborators. Default permissions wont apply')}">
                             ${_('set private mode')}
                             </span>
                           %endif
@@ -204,9 +213,10 b''
     });
     quick_repo_menu();
 
-    var enablePrivateRepo = function () {
+    var setPrivateRepo = function (private) {
         var postData = {
-            'csrf_token': CSRF_TOKEN
+            'csrf_token': CSRF_TOKEN,
+            'private': private
         };
 
         var success = function(o) {

rhodecode/templates/admin/repos/repo_edit_settings.mako

@@ -174,7 +174,14 b''
                     ${c.form.render_error(request, c.form['repo_description'])|n}
 
                     <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
-                    <span class="help-block">${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n}</span>
+                    <span class="help-block">
+                        % if c.visual.stylify_metatags:
+                            ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
+                        % else:
+                            ${_('Plain text format.')}
+                        % endif
+                        ${_('Add a README file for longer descriptions')}
+                    </span>
                     <span id="meta-tags-desc" style="display: none">
                         <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
                         ${dt.metatags_help()}

rhodecode/templates/admin/settings/settings_system.mako

@@ -1,5 +1,5 b''
 
-<div id="update_notice" style="display: none; margin: -40px 0px 20px 0px">
+<div id="update_notice" style="display: none; margin: 0px 0px 30px 0px">
     <div>${_('Checking for updates...')}</div>
 </div>
 

rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako

@@ -18,7 +18,11 b''
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('User Group: %s') % c.user_group.users_group_name}</h3>
+        <h3 class="panel-title">
+            <i class="icon-user-group" title="${_('User group')}"></i>
+            ${h.link_to_group(c.user_group.users_group_name)}
+            - ${_('Advanced')}
+        </h3>
     </div>
     <div class="panel-body">
         ${base.dt_info_panel(elems)}

rhodecode/templates/admin/user_groups/user_group_edit_perms.mako

@@ -2,7 +2,11 b''
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('User Group Permissions')}</h3>
+        <h3 class="panel-title">
+            <i class="icon-user-group" title="${_('User group')}"></i>
+            ${h.link_to_group(c.user_group.users_group_name)}
+            - ${_('Access Permissions')}
+        </h3>
     </div>
     <div class="panel-body">
         ${h.secure_form(h.route_path('edit_user_group_perms_update', user_group_id=c.user_group.users_group_id), request=request)}
@@ -63,7 +67,12 b''
                             ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
                             <span class="user">
                                 % if _user.username == h.DEFAULT_USER:
-                                    ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
+                                    ${h.DEFAULT_USER}
+                                    % if _user.active:
+                                        <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
+                                    % else:
+                                        <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
+                                    % endif
                                 % else:
                                     ${h.link_to_user(_user.username)}
                                     %if getattr(_user, 'duplicate_perm', None):
@@ -106,7 +115,12 b''
                             ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
                             <span class="user">
                                 % if _user.username == h.DEFAULT_USER:
-                                    ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
+                                    ${h.DEFAULT_USER}
+                                    % if _user.active:
+                                        <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
+                                    % else:
+                                        <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
+                                    % endif
                                 % else:
                                     ${h.link_to_user(_user.username)}
                                     %if getattr(_user, 'duplicate_perm', None):

rhodecode/templates/admin/user_groups/user_group_edit_settings.mako

@@ -3,7 +3,11 b''
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('User Group: %s') % c.user_group.users_group_name}</h3>
+        <h3 class="panel-title">
+            <i class="icon-user-group" title="${_('User group')}"></i>
+            ${h.link_to_group(c.user_group.users_group_name)}
+            - ${_('Settings')}
+        </h3>
     </div>
     <div class="panel-body">
     ${h.secure_form(h.route_path('user_groups_update', user_group_id=c.user_group.users_group_id), id='edit_user_group', request=request)}

rhodecode/templates/admin/users/user_edit_advanced.mako

@@ -25,7 +25,10 b''
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('User: {}').format(c.user.username)}</h3>
+        <h3 class="panel-title">
+            ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+            &nbsp;- ${_('Access Permissions')}
+        </h3>
     </div>
     <div class="panel-body">
         <table class="rctable">

rhodecode/templates/admin/users/user_edit_audit.mako

@@ -4,8 +4,10 b''
 
 <div class="panel panel-default">
     <div class="panel-heading">
-      <h3 class="panel-title">${_('User Audit Logs')} -
-      ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
+      <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('Audit Logs')}
+          (${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)})
       </h3>
       <a href="${h.route_path('edit_user_audit_logs_download', user_id=c.user.user_id)}" class="panel-edit">${_('Download as JSON')}</a>
     </div>

rhodecode/templates/admin/users/user_edit_auth_tokens.mako

@@ -1,6 +1,11 b''
+<%namespace name="base" file="/base/base.mako"/>
+
 <div class="panel panel-default">
     <div class="panel-heading">
-      <h3 class="panel-title">${_('Authentication Tokens')}</h3>
+      <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('Authentication Tokens')}
+      </h3>
     </div>
     <div class="panel-body">
         <div class="apikeys_wrap">

rhodecode/templates/admin/users/user_edit_caches.mako

@@ -2,7 +2,10 b''
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Caches')}</h3>
+        <h3 class="panel-title">
+            ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+            &nbsp;- ${_('Caches')}
+        </h3>
     </div>
     <div class="panel-body">
     <p>

rhodecode/templates/admin/users/user_edit_emails.mako

@@ -2,7 +2,10 b''
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Additional Email Addresses')}</h3>
+        <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('Additional Email Addresses')}
+        </h3>
     </div>
     <div class="panel-body">
         <div class="emails_wrap">

rhodecode/templates/admin/users/user_edit_groups.mako

@@ -1,9 +1,12 b''
 ## -*- coding: utf-8 -*-
-
+<%namespace name="base" file="/base/base.mako"/>
 
 <div class="panel panel-default">
     <div class="panel-heading">
-      <h3 class="panel-title">${_('User groups administration')}</h3>
+      <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('User groups administration')}
+      </h3>
     </div>
     <div class="panel-body">
         <div class="fields">

rhodecode/templates/admin/users/user_edit_ips.mako

@@ -1,6 +1,11 b''
+<%namespace name="base" file="/base/base.mako"/>
+
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Custom IP Whitelist')}</h3>
+        <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('Custom IP Whitelist')}
+        </h3>
     </div>
     <div class="panel-body">
         <div class="ips_wrap">

rhodecode/templates/admin/users/user_edit_profile.mako

@@ -2,7 +2,10 b''
 
 <div class="panel panel-default user-profile">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('User Profile')}</h3>
+        <h3 class="panel-title">
+            ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+            &nbsp;- ${_('User Profile')}
+        </h3>
     </div>
     <div class="panel-body">
         <div class="user-profile-content">
@@ -73,7 +76,13 b''
                <div class="input textarea editor">
                    ${h.textarea('description', rows=10, class_="medium")}
                     <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
-                    <span class="help-block">${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n}</span>
+                    <span class="help-block">
+                        % if c.visual.stylify_metatags:
+                            ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
+                        % else:
+                            ${_('Plain text format.')}
+                        % endif
+                    </span>
                     <span id="meta-tags-desc" style="display: none">
                         <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
                         ${dt.metatags_help()}

rhodecode/templates/admin/users/user_edit_ssh_keys.mako

@@ -1,6 +1,11 b''
+<%namespace name="base" file="/base/base.mako"/>
+
 <div class="panel panel-default">
     <div class="panel-heading">
-      <h3 class="panel-title">${_('SSH Keys')}</h3>
+      <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('SSH Keys')}
+      </h3>
     </div>
     <div class="panel-body">
         <div class="sshkeys_wrap">

rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako

@@ -1,11 +1,16 b''
+<%namespace name="base" file="/base/base.mako"/>
+
 <div class="panel panel-default">
     <div class="panel-heading">
-         <h3 class="panel-title">${_('New SSH Key generation')}</h3>
+         <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('New SSH Key generation')}
+         </h3>
     </div>
     <div class="panel-body">
         %if c.ssh_enabled and c.ssh_key_generator_enabled:
             <p>
-                ${_('Below is a 2048 bit generated SSH RSA key.')}<br/>
+                ${_('Below is a 2048 bit generated SSH RSA key.')}<br/>${_('If you use older systems please try to generate a')} <a href="${h.current_route_path(request, private_format='legacy')}">${_('legacy format')}</a> ssh key.<br/>
                 ${_('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.')}
             </p>
             <h4>${_('Private key')}</h4>

rhodecode/templates/base/base.mako

@@ -230,13 +230,13 b''
 </%def>
 
 
-<%def name="gravatar_with_user(contact, size=16, show_disabled=False, tooltip=False)">
+<%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="rc-user">
+  <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>
@@ -405,10 +405,6 b''
                     %endif
                 %endif
             </ul>
-          % else:
-            <a class="menulink disabled">
-              <div class="menulabel">${_('Options')}<div class="show_more"></div></div>
-            </a>
           % endif
         </li>
 

rhodecode/templates/base/issue_tracker_settings.mako

@@ -59,14 +59,14 b' examples = ['
 
     (
     'Pivotal Tracker',
-    '(?:pivot-)(?<project_id>\d+)-(?<story>\d+)',
+    '(?:pivot-)(?P<project_id>\d+)-(?P<story>\d+)',
     'https://www.pivotaltracker.com/s/projects/${project_id}/stories/${story}',
     'PIV-',
     ),
 
     (
     'Trello',
-    '(?:trello-)(?<card_id>[a-zA-Z0-9]+)',
+    '(?:trello-)(?P<card_id>[a-zA-Z0-9]+)',
     'https://trello.com/example.com/${card_id}',
     'TRELLO-',
     ),

rhodecode/templates/changeset/changeset_file_comment.mako

@@ -5,7 +5,7 b''
 ##
 <%namespace name="base" file="/base/base.mako"/>
 
-<%def name="comment_block(comment, inline=False)">
+<%def name="comment_block(comment, inline=False, active_pattern_entries=None)">
   <% pr_index_ver = comment.get_index_version(getattr(c, 'versions', [])) %>
   <% latest_ver = len(getattr(c, 'versions', [])) %>
   % if inline:
@@ -156,7 +156,7 b''
           </div>
       </div>
       <div class="text">
-          ${h.render(comment.text, renderer=comment.renderer, mentions=True, repo_name=getattr(c, 'repo_name', None))}
+          ${h.render(comment.text, renderer=comment.renderer, mentions=True, repo_name=getattr(c, 'repo_name', None), active_pattern_entries=active_pattern_entries)}
       </div>
 
   </div>
@@ -164,13 +164,17 b''
 
 ## generate main comments
 <%def name="generate_comments(comments, include_pull_request=False, is_pull_request=False)">
+  <%
+    active_pattern_entries = h.get_active_pattern_entries(getattr(c, 'repo_name', None))
+  %>
+
   <div class="general-comments" id="comments">
     %for comment in comments:
         <div id="comment-tr-${comment.comment_id}">
           ## only render comments that are not from pull request, or from
           ## pull request and a status change
           %if not comment.pull_request or (comment.pull_request and comment.status_change) or include_pull_request:
-          ${comment_block(comment)}
+          ${comment_block(comment, active_pattern_entries=active_pattern_entries)}
           %endif
         </div>
     %endfor

rhodecode/templates/codeblocks/diffs.mako

@@ -60,12 +60,16 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
 <%
     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([], inline_comments)}
+  ${inline_comments_container([])}
 </div>
+
 <div class="js-template" id="cb-comment-inline-form-template">
     <div class="comment-inline-form ac">
 
@@ -259,7 +263,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
         ## 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)}
+            ${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:
@@ -299,7 +303,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
                     ${hunk.section_header}
                 </td>
             </tr>
-            ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], hunk, use_comments=use_comments, inline_comments=inline_comments)}
+            ${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'], {}) %>
@@ -323,7 +327,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
                     <td class="cb-lineno cb-context"></td>
                     <td class="cb-lineno cb-context"></td>
                     <td class="cb-content cb-context">
-                        ${inline_comments_container(comments, inline_comments)}
+                        ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
                     </td>
                 </tr>
             %elif c.user_session_attrs["diffmode"] == 'sideside':
@@ -348,7 +352,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
                     <td class="cb-lineno cb-context"></td>
                     <td class="cb-content cb-context">
                         % if lineno.startswith('o'):
-                            ${inline_comments_container(comments, inline_comments)}
+                            ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
                         % endif
                     </td>
 
@@ -356,7 +360,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
                     <td class="cb-lineno cb-context"></td>
                     <td class="cb-content cb-context">
                         % if lineno.startswith('n'):
-                            ${inline_comments_container(comments, inline_comments)}
+                            ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
                         % endif
                     </td>
                 </tr>
@@ -415,7 +419,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
                         <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'], inline_comments)}
+                            ${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)}
                         </td>
                     </tr>
                     %elif c.user_session_attrs["diffmode"] == 'sideside':
@@ -427,7 +431,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
                         <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'], inline_comments)}
+                            ${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)}
                         </td>
                     </tr>
                     %endif
@@ -584,10 +588,11 b' from rhodecode.lib.diffs import NEW_FILE'
 </%def>
 
 
-<%def name="inline_comments_container(comments, inline_comments)">
+<%def name="inline_comments_container(comments, active_pattern_entries=None)">
+
 <div class="inline-comments">
     %for comment in comments:
-        ${commentblock.comment_block(comment, inline=True)}
+        ${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;}">
@@ -619,7 +624,7 b' def get_comments_for(diff_type, comments'
             return data
 %>
 
-<%def name="render_hunk_lines_sideside(filediff, hunk, use_comments=False, inline_comments=None)">
+<%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
@@ -669,7 +674,7 b' def get_comments_for(diff_type, comments'
             <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, inline_comments)}
+                ${inline_comments_container(line_old_comments, active_pattern_entries=active_pattern_entries)}
             %endif
 
         </td>
@@ -711,7 +716,7 b' def get_comments_for(diff_type, comments'
             %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, inline_comments)}
+            ${inline_comments_container(line_new_comments, active_pattern_entries=active_pattern_entries)}
             %endif
         </td>
     </tr>
@@ -719,7 +724,7 b' def get_comments_for(diff_type, comments'
 </%def>
 
 
-<%def name="render_hunk_lines_unified(filediff, hunk, use_comments=False,  inline_comments=None)">
+<%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:
 
     <%
@@ -777,7 +782,7 b' def get_comments_for(diff_type, comments'
             %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, inline_comments)}
+            ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
             %endif
         </td>
     </tr>
@@ -785,11 +790,11 b' def get_comments_for(diff_type, comments'
 </%def>
 
 
-<%def name="render_hunk_lines(filediff, diff_mode, hunk, use_comments, inline_comments)">
+<%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)}
+        ${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)}
+        ${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>

rhodecode/templates/data_table/_dt_elements.mako

@@ -310,9 +310,9 b''
 
 <%def name="gist_access_id(gist_access_id, full_contact)">
     <div>
-      <b>
-        <a href="${h.route_path('gist_show', gist_id=gist_access_id)}">gist: ${gist_access_id}</a>
-      </b>
+      <code>
+        <a href="${h.route_path('gist_show', gist_id=gist_access_id)}">${gist_access_id}</a>
+      </code>
     </div>
 </%def>
 

rhodecode/templates/debug_style/emails.html

@@ -21,7 +21,7 b''
         <ul>
           % for elem in sorted(c.email_types.keys()):
                <li>
-                    <a href="${request.route_path('debug_style_email', email_id=elem, _query={'user':c.rhodecode_user.username})}">${elem}</a>
+                    <a href="${request.route_path('debug_style_email', email_id=elem, _query={'user':c.rhodecode_user.username, 'email': ''})}">${elem}</a>
                     |
                     <a href="${request.route_path('debug_style_email_plain_rendered', email_id=elem, _query={'user':c.rhodecode_user.username})}">plain rendered</a>
                </li>

rhodecode/templates/email_templates/base.mako

@@ -63,8 +63,8 b" css_style = ';'.join(["
 
 ## Constants
 <%
-text_regular = "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;"
-text_monospace = "'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;"
+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"
 
 %>
 
@@ -100,7 +100,7 b' text_monospace = "\'Menlo\', \'Liberation M'
             -ms-text-size-adjust: 100%;
             margin: 0;
             padding: 0;
-            font-family: ${text_regular|n}
+            font-family: ${text_regular|n};
         }
 
         /* Prevent Webkit and Windows Mobile platforms from changing default font sizes.*/
@@ -184,6 +184,13 b' text_monospace = "\'Menlo\', \'Liberation M'
             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;
@@ -202,6 +209,10 b' text_monospace = "\'Menlo\', \'Liberation M'
             outline: 1px solid #979797
         }
 
+        code {
+            font-family: ${text_monospace|n};
+        }
+
         @media only screen and (-webkit-min-device-pixel-ratio: 2) {
             /* Put your iPhone 4g styles in here */
         }
@@ -283,7 +294,7 b' text_monospace = "\'Menlo\', \'Liberation M'
             margin: 3px 0 13px 0 !important;
             color: #424242 !important;
             font-size: 13px !important;
-            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+            font-family: ${text_regular|n};
             font-weight: normal !important;
             overflow: visible !important;
             line-height: 140% !important
@@ -361,7 +372,7 b' text_monospace = "\'Menlo\', \'Liberation M'
         }
 
         div.markdown-block code, div.markdown-block pre, div.markdown-block #ws, div.markdown-block #message {
-            font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
+            font-family: ${text_monospace|n};
             font-size: 11px;
             -webkit-border-radius: 2px;
             -moz-border-radius: 2px;
@@ -490,8 +501,10 b' text_monospace = "\'Menlo\', \'Liberation M'
     <![endif]-->
 </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:sans-serif;font-weight:100;border:1px solid #dbd9da">
+<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%">
@@ -513,11 +526,13 b' text_monospace = "\'Menlo\', \'Liberation M'
     </tr>
 </table>  
 <!-- End of wrapper table -->
+</div>
 
-<div style="clear: both"></div>
-<div style="margin-left:1%;font-weight:100;font-size:11px;color:#666666;text-decoration:none;font-family:${text_monospace}">
+<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}">
+    <a style="font-weight:100;font-size:11px;color:#666666;text-decoration:none;font-family:${text_monospace};" href="${instance_url}">
         ${instance_url}
     </a>
 </div>

rhodecode/templates/forks/fork.mako

@@ -58,7 +58,14 b''
                 <div class="textarea editor">
                     ${h.textarea('description',cols=23,rows=5,class_="medium")}
                     <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
-                    <span class="help-block">${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n}</span>
+                    <span class="help-block">
+                        % if c.visual.stylify_metatags:
+                            ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
+                        % else:
+                            ${_('Plain text format.')}
+                        % endif
+                        ${_('Add a README file for longer descriptions')}
+                    </span>
                     <span id="meta-tags-desc" style="display: none">
                         <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
                         ${dt.metatags_help()}

rhodecode/templates/index_base.mako

@@ -14,32 +14,50 b''
         <div class="title">
 
         </div>
+
         <!-- end box / title -->
         <div id="no_grid_data" class="table" style="display: none">
-            <h2 class="no-object-border">
+            <h2>
                  ${_('No repositories or repositories groups exists here.')}
             </h2>
         </div>
 
+        <div id="grid_data_loading" class="table" style="display: none">
+            <i class="icon-spin animate-spin"></i>
+            ${_('loading...')}
+        </div>
+
         <div class="table">
-            <div id="groups_list_wrap" style="min-height: 200px;">
+            <div id="groups_list_wrap" style="min-height: 200px;display: none">
                 <table id="group_list_table" class="display" style="width: 100%;"></table>
             </div>
         </div>
 
         <div class="table">
-            <div id="repos_list_wrap" style="min-height: 200px;">
+            <div id="repos_list_wrap" style="min-height: 200px;display: none">
                 <table id="repo_list_table" class="display" style="width: 100%;"></table>
             </div>
         </div>
 
     </div>
+
     <script>
     $(document).ready(function () {
+        var noRepoData = null;
+        var noGroupData = null;
+        var $gridDataLoading = $('#grid_data_loading');
 
-        // repo group list
+        // global show loading of hidden grids
+        $(document).on('preInit.dt', function (e, settings) {
+            $gridDataLoading.show();
+        });
+
+        ## repo group list
         var $groupListTable = $('#group_list_table');
 
+        $groupListTable.on('xhr.dt', function (e, settings, json, xhr) {
+            $gridDataLoading.hide();
+        });
         $groupListTable.DataTable({
             processing: true,
             serverSide: true,
@@ -97,11 +115,12 b''
                 emptyTable: _gettext("No repository groups present.")
             },
             "drawCallback": function (settings, json) {
+
                 // hide grid if it's empty
                 if (settings.fnRecordsDisplay() === 0) {
-                    $('#groups_list_wrap').hide();
+                    noGroupData = true;
                     // both hidden, show no-data
-                    if ($('#repos_list_wrap').is(':hidden')) {
+                    if (noRepoData === true) {
                         $('#no_grid_data').show();
                     }
                 } else {
@@ -119,18 +138,13 b''
             },
         });
 
-        $groupListTable.on('xhr.dt', function (e, settings, json, xhr) {
-            $groupListTable.css('opacity', 1);
-        });
 
-        $groupListTable.on('preXhr.dt', function (e, settings, data) {
-            $groupListTable.css('opacity', 0.3);
-        });
-
-
-        ##  // repo list
+        ##  repo list
         var $repoListTable = $('#repo_list_table');
 
+        $repoListTable.on('xhr.dt', function (e, settings, json, xhr) {
+            $gridDataLoading.hide();
+        });
         $repoListTable.DataTable({
             processing: true,
             serverSide: true,
@@ -188,11 +202,13 b''
                 emptyTable: _gettext("No repositories present.")
             },
             "drawCallback": function (settings, json) {
+
                 // hide grid if it's empty
                 if (settings.fnRecordsDisplay() == 0) {
-                    $('#repos_list_wrap').hide()
+                    noRepoData = true;
+
                     // both hidden, show no-data
-                    if ($('#groups_list_wrap').is(':hidden')) {
+                    if (noGroupData === true) {
                         $('#no_grid_data').show()
                     }
                 } else {
@@ -210,14 +226,6 b''
             },
         });
 
-        $repoListTable.on('xhr.dt', function (e, settings, json, xhr) {
-            $repoListTable.css('opacity', 1);
-        });
-
-        $repoListTable.on('preXhr.dt', function (e, settings, data) {
-            $repoListTable.css('opacity', 0.3);
-        });
-
     });
     </script>
 </%def>

rhodecode/templates/pullrequests/pullrequest.mako

@@ -514,6 +514,7 b''
         // Flush changes into textarea
         codeMirrorInstance.save();
         prButtonLock(true, null, 'all');
+        $pullRequestSubmit.val(_gettext('Please wait creating pull request...'));
     });
 
    prButtonLock(true, "${_('Please select source and target')}", 'all');

rhodecode/templates/pullrequests/pullrequest_show.mako

@@ -438,6 +438,11 b''
 
     <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:

rhodecode/tests/fixture.py

@@ -29,6 +29,7 b' import shutil'
 
 import configobj
 
+from rhodecode.model.settings import SettingsModel
 from rhodecode.tests import *
 from rhodecode.model.db import Repository, User, RepoGroup, UserGroup, Gist, UserEmailMap
 from rhodecode.model.meta import Session
@@ -122,7 +123,7 b' class Fixture(object):'
 
         return context()
 
-    def auth_restriction(self, auth_restriction):
+    def auth_restriction(self, registry, auth_restriction):
         """
         Context process for changing the builtin rhodecode plugin auth restrictions.
         Use like:
@@ -135,26 +136,26 b' class Fixture(object):'
 
         class context(object):
             def _get_pluing(self):
-                plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(
-                    RhodeCodeAuthPlugin.uid)
+                plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(RhodeCodeAuthPlugin.uid)
                 plugin = RhodeCodeAuthPlugin(plugin_id)
                 return plugin
 
             def __enter__(self):
                 plugin = self._get_pluing()
-                plugin.create_or_update_setting(
-                    'auth_restriction', auth_restriction)
+                plugin.create_or_update_setting('auth_restriction', auth_restriction)
                 Session().commit()
+                SettingsModel().invalidate_settings_cache()
 
             def __exit__(self, exc_type, exc_val, exc_tb):
                 plugin = self._get_pluing()
                 plugin.create_or_update_setting(
                     'auth_restriction', RhodeCodeAuthPlugin.AUTH_RESTRICTION_NONE)
                 Session().commit()
+                SettingsModel().invalidate_settings_cache()
 
         return context()
 
-    def scope_restriction(self, scope_restriction):
+    def scope_restriction(self, registry, scope_restriction):
         """
         Context process for changing the builtin rhodecode plugin scope restrictions.
         Use like:
@@ -167,22 +168,22 b' class Fixture(object):'
 
         class context(object):
             def _get_pluing(self):
-                plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(
-                    RhodeCodeAuthPlugin.uid)
+                plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(RhodeCodeAuthPlugin.uid)
                 plugin = RhodeCodeAuthPlugin(plugin_id)
                 return plugin
 
             def __enter__(self):
                 plugin = self._get_pluing()
-                plugin.create_or_update_setting(
-                    'scope_restriction', scope_restriction)
+                plugin.create_or_update_setting('scope_restriction', scope_restriction)
                 Session().commit()
+                SettingsModel().invalidate_settings_cache()
 
             def __exit__(self, exc_type, exc_val, exc_tb):
                 plugin = self._get_pluing()
                 plugin.create_or_update_setting(
                     'scope_restriction', RhodeCodeAuthPlugin.AUTH_RESTRICTION_SCOPE_ALL)
                 Session().commit()
+                SettingsModel().invalidate_settings_cache()
 
         return context()
 

rhodecode/tests/models/settings/test_issue_tracker.py

@@ -43,6 +43,9 b' class TestIssueTrackerSettingsModel(obje'
             settings_mock.return_value = input_settings
             result = model.get_global_settings(cache=True)
         get_settings.assert_called_once_with(cache=True)
+        for k, v in result.items():
+            v.pop('pat_compiled', None)
+
         assert expected_result == result
 
     def test_get_repo_settings_raise_exception_when_repo_is_not_set(self):
@@ -68,6 +71,8 b' class TestIssueTrackerSettingsModel(obje'
             settings_mock.return_value = input_settings
             result = model.get_repo_settings(cache=True)
         get_settings.assert_called_once_with(cache=True)
+        for k, v in result.items():
+            v.pop('pat_compiled', None)
         assert expected_result == result
 
     @pytest.mark.parametrize("inherit_settings, method", [

rhodecode/tests/vcs_operations/conftest.py

@@ -209,6 +209,8 b' def enable_auth_plugins(request, baseapp'
                 Session().add(setting)
             Session().commit()
 
+        SettingsModel().invalidate_settings_cache()
+
     def cleanup():
         _enable_plugins(['egg:rhodecode-enterprise-ce#rhodecode'])