release: merge back stable branch into default

docs/release-notes/release-notes-4.17.1.rst

@@ -0,0 +1,41 b''
+|RCE| 4.17.1 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2019-07-04
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+
+
+Security
+^^^^^^^^
+
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+Fixes
+^^^^^
+
+- Database: fixed mysql migration issues.
+- Artifacts: fixed problem with non-ascii file uploads.
+- Artifacts: increase timeout, and allow setting custom time via ?timeout=N GET flag
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Un-scheduled release addressing problems in 4.17.X releases.

docs/release-notes/release-notes-4.17.2.rst

@@ -0,0 +1,40 b''
+|RCE| 4.17.2 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2019-07-05
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+
+
+Security
+^^^^^^^^
+
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+Fixes
+^^^^^
+
+- UI: fixed missing icons on some cases.
+- Commits: hide links icon of message that don't expand.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Un-scheduled release addressing problems in 4.17.X releases.

rhodecode/tests/load/pages.txt

@@ -0,0 +1,2 b''
+big/CPython
+big/CPython/commits

.hgignore

@@ -41,6 +41,7 b' syntax: regexp'
 ^result$
 ^rhodecode/public/css/style.css$
 ^rhodecode/public/css/style-polymer.css$
+^rhodecode/public/css/style-ipython.css$
 ^rhodecode/public/js/rhodecode-components.html$
 ^rhodecode/public/js/rhodecode-components.js$
 ^rhodecode/public/js/scripts.js$

.hgtags

@@ -52,3 +52,6 b' 4aaa40b605b01af78a9f6882eca561c54b525ef0'
 797744642eca86640ed20bef2cd77445780abaec v4.16.0
 6c3452c7c25ed35ff269690929e11960ed6ad7d3 v4.16.1
 5d8057df561c4b6b81b6401aed7d2f911e6e77f7 v4.16.2
+13acfc008896ef4c62546bab5074e8f6f89b4fa7 v4.17.0
+45b9b610976f483877142fe75321808ce9ebac59 v4.17.1
+ad5bd0c4bd322fdbd04bb825a3d027e08f7a3901 v4.17.2

docs/release-notes/release-notes.rst

@@ -9,6 +9,8 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.17.2.rst
+   release-notes-4.17.1.rst
    release-notes-4.17.0.rst
    release-notes-4.16.2.rst
    release-notes-4.16.1.rst

pkgs/python-packages.nix

@@ -1718,7 +1718,7 b' self: super: {'
     };
   };
   "rhodecode-enterprise-ce" = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.17.0";
+    name = "rhodecode-enterprise-ce-4.17.2";
     buildInputs = [
       self."pytest"
       self."py"

rhodecode/apps/repository/__init__.py

@@ -369,6 +369,10 b' def includeme(config):'
         name='edit_repo_perms',
         pattern='/{repo_name:.*?[^/]}/settings/permissions', repo_route=True)
 
+    config.add_route(
+        name='edit_repo_perms_set_private',
+        pattern='/{repo_name:.*?[^/]}/settings/permissions/set_private', repo_route=True)
+
     # Permissions Branch (EE feature)
     config.add_route(
         name='edit_repo_perms_branch',
@@ -481,13 +485,21 b' def includeme(config):'
         name='edit_repo_audit_logs',
         pattern='/{repo_name:.*?[^/]}/settings/audit_logs', repo_route=True)
 
-    # ATOM/RSS Feed
+    # ATOM/RSS Feed, shouldn't contain slashes for outlook compatibility
     config.add_route(
         name='rss_feed_home',
+        pattern='/{repo_name:.*?[^/]}/feed-rss', repo_route=True)
+
+    config.add_route(
+        name='atom_feed_home',
+        pattern='/{repo_name:.*?[^/]}/feed-atom', repo_route=True)
+
+    config.add_route(
+        name='rss_feed_home_old',
         pattern='/{repo_name:.*?[^/]}/feed/rss', repo_route=True)
 
     config.add_route(
-        name='atom_feed_home',
+        name='atom_feed_home_old',
         pattern='/{repo_name:.*?[^/]}/feed/atom', repo_route=True)
 
     # NOTE(marcink): needs to be at the end for catch-all

rhodecode/apps/repository/tests/test_repo_feed.py

@@ -27,8 +27,10 b' def route_path(name, params=None, **kwar'
     import urllib
 
     base_url = {
-        'rss_feed_home': '/{repo_name}/feed/rss',
-        'atom_feed_home': '/{repo_name}/feed/atom',
+        'rss_feed_home': '/{repo_name}/feed-rss',
+        'atom_feed_home': '/{repo_name}/feed-atom',
+        'rss_feed_home_old': '/{repo_name}/feed/rss',
+        'atom_feed_home_old': '/{repo_name}/feed/atom',
     }[name].format(**kwargs)
 
     if params:
@@ -73,6 +75,42 b' class TestFeedView(TestController):'
 
         assert response.content_type == content_type
 
+    @pytest.mark.parametrize("feed_type, content_type", [
+        ('rss', "application/rss+xml"),
+        ('atom', "application/atom+xml")
+    ])
+    def test_feed_with_auth_token_by_uid(
+            self, backend, user_admin, feed_type, content_type):
+        auth_token = user_admin.feed_token
+        assert auth_token != ''
+
+        response = self.app.get(
+            route_path(
+                '{}_feed_home'.format(feed_type),
+                repo_name='_{}'.format(backend.repo.repo_id),
+                params=dict(auth_token=auth_token)),
+            status=200)
+
+        assert response.content_type == content_type
+
+    @pytest.mark.parametrize("feed_type, content_type", [
+        ('rss', "application/rss+xml"),
+        ('atom', "application/atom+xml")
+    ])
+    def test_feed_old_urls_with_auth_token(
+            self, backend, user_admin, feed_type, content_type):
+        auth_token = user_admin.feed_token
+        assert auth_token != ''
+
+        response = self.app.get(
+            route_path(
+                '{}_feed_home_old'.format(feed_type),
+                repo_name=backend.repo_name,
+                params=dict(auth_token=auth_token)),
+            status=200)
+
+        assert response.content_type == content_type
+
     @pytest.mark.parametrize("feed_type", ['rss', 'atom'])
     def test_feed_with_auth_token_of_wrong_type(
             self, backend, user_util, feed_type):

rhodecode/apps/repository/views/repo_feed.py

@@ -40,8 +40,6 b' log = logging.getLogger(__name__)'
 class RepoFeedView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-
-
         self._load_defaults()
         return c
 
@@ -117,6 +115,9 b' class RepoFeedView(RepoAppView):'
     @view_config(
         route_name='atom_feed_home', request_method='GET',
         renderer=None)
+    @view_config(
+        route_name='atom_feed_home_old', request_method='GET',
+        renderer=None)
     def atom(self):
         """
         Produce an atom-1.0 feed via feedgenerator module
@@ -181,6 +182,9 b' class RepoFeedView(RepoAppView):'
     @view_config(
         route_name='rss_feed_home', request_method='GET',
         renderer=None)
+    @view_config(
+        route_name='rss_feed_home_old', request_method='GET',
+        renderer=None)
     def rss(self):
         """
         Produce an rss2 feed via feedgenerator module

rhodecode/apps/repository/views/repo_permissions.py

@@ -105,3 +105,30 b' class RepoSettingsPermissionsView(RepoAp'
 
         raise HTTPFound(
             h.route_path('edit_repo_perms', repo_name=self.db_repo_name))
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='edit_repo_perms_set_private', request_method='POST',
+        renderer='json_ext')
+    def edit_permissions_set_private_repo(self):
+        _ = self.request.translate
+        self.load_default_context()
+
+        try:
+            RepoModel().update(
+                self.db_repo, **{'repo_private': True, 'repo_name': self.db_repo_name})
+            Session().commit()
+
+            h.flash(_('Repository `{}` private mode set successfully').format(self.db_repo_name),
+                    category='success')
+        except Exception:
+            log.exception("Exception during update of repository")
+            h.flash(_('Error occurred during update of repository {}').format(
+                self.db_repo_name), category='error')
+
+        return {
+            'redirect_url': h.route_path('edit_repo_perms', repo_name=self.db_repo_name),
+            'private': True
+        }

rhodecode/i18n/rhodecode.pot

@@ -6,9 +6,9 b''
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rhodecode-enterprise-ce 4.16.0\n"
+"Project-Id-Version: rhodecode-enterprise-ce 4.17.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-02-23 21:51+0000\n"
+"POT-Creation-Date: 2019-07-03 14:48+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"
@@ -25,11 +25,11 b' msgstr ""'
 msgid "Error occurred during update of default values"
 msgstr ""
 
-#: rhodecode/apps/admin/views/exception_tracker.py:142
+#: rhodecode/apps/admin/views/exception_tracker.py:156
 msgid "Removed {} Exceptions"
 msgstr ""
 
-#: rhodecode/apps/admin/views/exception_tracker.py:159
+#: rhodecode/apps/admin/views/exception_tracker.py:173
 msgid "Removed Exception {}"
 msgstr ""
 
@@ -53,7 +53,7 b' msgstr ""'
 
 #: rhodecode/apps/admin/views/permissions.py:484
 #: rhodecode/templates/admin/gists/show.mako:63
-#: rhodecode/templates/admin/integrations/list.mako:174
+#: 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
@@ -62,12 +62,12 b' msgstr ""'
 #: rhodecode/templates/data_table/_dt_elements.mako:255
 #: rhodecode/templates/data_table/_dt_elements.mako:267
 #: rhodecode/templates/debug_style/buttons.html:128
-#: rhodecode/templates/files/files_add.mako:208
-#: rhodecode/templates/files/files_edit.mako:168
-#: rhodecode/templates/files/files_source.mako:58
-#: rhodecode/templates/files/files_source.mako:61
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:64
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:347
+#: 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
 msgid "Edit"
@@ -81,12 +81,12 b' msgstr ""'
 msgid "SSH key support is disabled in .ini file"
 msgstr ""
 
-#: rhodecode/apps/admin/views/repo_groups.py:183
+#: rhodecode/apps/admin/views/repo_groups.py:329
 #, python-format
 msgid "Created repository group %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/repo_groups.py:201
+#: rhodecode/apps/admin/views/repo_groups.py:347
 #, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr ""
@@ -345,12 +345,12 b' msgstr ""'
 msgid "SVN"
 msgstr ""
 
-#: rhodecode/apps/admin/views/user_groups.py:231
+#: rhodecode/apps/admin/views/user_groups.py:243
 #, python-format
 msgid "Created user group %(user_group_link)s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/user_groups.py:253
+#: rhodecode/apps/admin/views/user_groups.py:265
 #, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr ""
@@ -446,99 +446,99 b' msgstr ""'
 msgid "Force password change disabled for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:696
+#: rhodecode/apps/admin/views/users.py:695
 #, python-format
 msgid "Linked repository group `%s` as personal"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:702
+#: rhodecode/apps/admin/views/users.py:701
 #, python-format
 msgid "Created repository group `%s`"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:706
+#: rhodecode/apps/admin/views/users.py:705
 #, python-format
 msgid "Repository group `%s` is already taken"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:711
+#: rhodecode/apps/admin/views/users.py:710
 msgid "An error occurred during repository group creation for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:734
+#: rhodecode/apps/admin/views/users.py:733
 #: rhodecode/apps/my_account/views/my_account.py:161
 #: 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:773
+#: rhodecode/apps/admin/views/users.py:772
 #: rhodecode/apps/my_account/views/my_account.py:196
 msgid "Auth token successfully created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:802
+#: rhodecode/apps/admin/views/users.py:801
 #: rhodecode/apps/my_account/views/my_account.py:220
 msgid "Auth token successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:875
+#: rhodecode/apps/admin/views/users.py:874
 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:114
 msgid "Ssh Key successfully created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:881
-#: rhodecode/apps/admin/views/users.py:885
+#: rhodecode/apps/admin/views/users.py:880
+#: rhodecode/apps/admin/views/users.py:884
 #: 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:919
+#: rhodecode/apps/admin/views/users.py:918
 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:154
 msgid "Ssh key successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:965
+#: rhodecode/apps/admin/views/users.py:964
 #, python-format
 msgid "Added new email address `%s` for user account"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:971
+#: rhodecode/apps/admin/views/users.py:970
 msgid "Email `{}` is already registered for another user."
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:975
+#: rhodecode/apps/admin/views/users.py:974
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1002
+#: rhodecode/apps/admin/views/users.py:1001
 msgid "Removed email address from user account"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1048
+#: rhodecode/apps/admin/views/users.py:1047
 #, python-format
 msgid "An error occurred during ip saving:%s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1070
+#: rhodecode/apps/admin/views/users.py:1069
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1074
+#: rhodecode/apps/admin/views/users.py:1073
 #, python-format
 msgid "Added ips %s to user whitelist"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1104
+#: rhodecode/apps/admin/views/users.py:1103
 msgid "Removed ip address from user whitelist"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1169
+#: rhodecode/apps/admin/views/users.py:1168
 msgid "Groups successfully changed"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1263
+#: rhodecode/apps/admin/views/users.py:1262
 msgid "Deleted {} cache keys"
 msgstr ""
 
@@ -562,9 +562,9 b' msgstr ""'
 msgid "1 month"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:40932
+#: 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:509
+#: rhodecode/public/js/src/rhodecode.js:502
 msgid "Lifetime"
 msgstr ""
 
@@ -576,16 +576,16 b' msgstr ""'
 msgid "Can be accessed by anonymous users"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:214
+#: rhodecode/apps/gist/views.py:213
 msgid "Error occurred during gist creation"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:238
+#: rhodecode/apps/gist/views.py:237
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:324
+#: rhodecode/apps/gist/views.py:325
 #: rhodecode/templates/admin/gists/show.mako:74
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:36
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:36
@@ -593,41 +593,42 b' msgstr ""'
 msgid "never"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:330
+#: rhodecode/apps/gist/views.py:331
 #, python-format
 msgid "%(expiry)s - current value"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:375
+#: rhodecode/apps/gist/views.py:376
 msgid "Successfully updated gist content"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:380
+#: rhodecode/apps/gist/views.py:381
 msgid "Successfully updated gist data"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:383
+#: rhodecode/apps/gist/views.py:384
 msgid "Error occurred during update of gist {}: {}"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:387
+#: rhodecode/apps/gist/views.py:388
 #, python-format
 msgid "Error occurred during update of gist %s"
 msgstr ""
 
-#: rhodecode/apps/home/views.py:308
+#: 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/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:78 rhodecode/templates/base/base.mako:150
-#: rhodecode/templates/base/base.mako:785
+#: rhodecode/templates/base/base.mako:103
+#: rhodecode/templates/base/base.mako:122
+#: rhodecode/templates/base/base.mako:944
 msgid "Repositories"
 msgstr ""
 
-#: rhodecode/apps/home/views.py:335
+#: rhodecode/apps/home/views.py:415
 #: rhodecode/templates/admin/integrations/form.mako:17
 #: rhodecode/templates/admin/integrations/list.mako:10
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:31
@@ -695,11 +696,11 b' msgstr ""'
 msgid "Failed to update bookmarks. Make sure an unique position is used"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:626
+#: rhodecode/apps/my_account/views/my_account.py:629
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:633
+#: rhodecode/apps/my_account/views/my_account.py:636
 msgid "Error occurred during update of user"
 msgstr ""
 
@@ -746,9 +747,8 b' msgid "There are no commits yet"'
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_changelog.py:71
-#: rhodecode/apps/repository/views/repo_commits.py:111
-#: rhodecode/apps/repository/views/repo_files.py:165
 #: rhodecode/apps/repository/views/repo_files.py:185
+#: rhodecode/apps/repository/views/repo_files.py:205
 msgid "No such commit exists for this repository"
 msgstr ""
 
@@ -767,13 +767,17 b' msgstr ""'
 msgid "Created repository %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:327
+#: rhodecode/apps/repository/views/repo_commits.py:110
+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
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:372
+#: rhodecode/apps/repository/views/repo_commits.py:371
 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
 msgstr ""
 
@@ -793,11 +797,11 b' msgstr ""'
 msgid "The comparison of two different kinds of remote repos is not available"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_compare.py:231
+#: rhodecode/apps/repository/views/repo_compare.py:225
 msgid "Could not compare repos with different large file settings"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_compare.py:277
+#: rhodecode/apps/repository/views/repo_compare.py:271
 #, python-format
 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
 msgstr ""
@@ -812,122 +816,130 b' msgstr ""'
 msgid "%s %s feed"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:95
+#: rhodecode/apps/repository/views/repo_files.py:96
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:111
+#: rhodecode/apps/repository/views/repo_files.py:109
+msgid "Cannot modify file. Given commit `{}` is not head of a branch."
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_files.py:127
 msgid "Branch `{}` changes forbidden by rule {}."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:155
+#: rhodecode/apps/repository/views/repo_files.py:175
 msgid "Click here to add a new file."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:160
+#: rhodecode/apps/repository/views/repo_files.py:180
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:297
+#: rhodecode/apps/repository/views/repo_files.py:325
 msgid "Downloads disabled"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:303
+#: rhodecode/apps/repository/views/repo_files.py:331
 msgid "Unknown archive type for: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:309
+#: rhodecode/apps/repository/views/repo_files.py:337
 msgid "Unknown commit_id {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:312
+#: rhodecode/apps/repository/views/repo_files.py:340
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:344
+#: rhodecode/apps/repository/views/repo_files.py:345
+msgid "No node at path {} for this repository"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_files.py:394
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:915
+#: rhodecode/apps/repository/views/repo_files.py:963
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:936
-#: rhodecode/apps/repository/views/repo_summary.py:341
-#: rhodecode/model/pull_request.py:1431 rhodecode/model/scm.py:916
+#: 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/templates/base/vcs_settings.mako:235
+#: rhodecode/templates/summary/components.mako:10
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:940 rhodecode/model/scm.py:931
+#: rhodecode/apps/repository/views/repo_files.py:988 rhodecode/model/scm.py:933
 #: rhodecode/templates/base/vcs_settings.mako:260
+#: rhodecode/templates/summary/components.mako:34
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1039
-#: rhodecode/apps/repository/views/repo_files.py:1073
-msgid "You can only delete files with commit being a valid branch head."
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_files.py:1050
-#: rhodecode/apps/repository/views/repo_files.py:1084
+#: rhodecode/apps/repository/views/repo_files.py:1092
+#: rhodecode/apps/repository/views/repo_files.py:1120
 msgid "Deleted file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1105
+#: rhodecode/apps/repository/views/repo_files.py:1141
 msgid "Successfully deleted file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1109
-#: rhodecode/apps/repository/views/repo_files.py:1235
+#: 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
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1129
-#: rhodecode/apps/repository/views/repo_files.py:1169
-msgid "You can only edit files with commit being a valid branch head."
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_files.py:1147
-#: rhodecode/apps/repository/views/repo_files.py:1188
+#: rhodecode/apps/repository/views/repo_files.py:1177
+#: rhodecode/apps/repository/views/repo_files.py:1208
 msgid "Edited file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1206
-msgid "No changes"
-msgstr ""
-
 #: rhodecode/apps/repository/views/repo_files.py:1231
-msgid "Successfully committed changes to file `{}`"
+msgid "No changes detected on {}"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:1255
-#: rhodecode/apps/repository/views/repo_files.py:1318
+msgid "Successfully committed changes to file `{}`"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_files.py:1296
+#: rhodecode/apps/repository/views/repo_files.py:1337
 msgid "Added file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1268
-#: rhodecode/apps/repository/views/repo_files.py:1309
-msgid "You can only add files with commit being a valid branch head."
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_files.py:1351
-msgid "No filename"
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_files.py:1381
+#: rhodecode/apps/repository/views/repo_files.py:1353
+msgid "No filename specified"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_files.py:1378
 msgid "Successfully committed new file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1385
+#: rhodecode/apps/repository/views/repo_files.py:1386
+#: rhodecode/apps/repository/views/repo_files.py:1498
 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
+msgid "Uploaded file via RhodeCode Enterprise"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_files.py:1487
+msgid "Successfully committed {} new files"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_files.py:1489
+msgid "Successfully committed 1 new file"
+msgstr ""
+
 #: rhodecode/apps/repository/views/repo_forks.py:147
-#: rhodecode/templates/base/base.mako:267
 msgid "Compare fork"
 msgstr ""
 
@@ -1035,7 +1047,7 b' msgid "Repository has been %s"'
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:219
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:296
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:290
 msgid "An error occurred during unlocking"
 msgstr ""
 
@@ -1043,78 +1055,78 b' msgstr ""'
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:105
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:99
 #, python-format
 msgid "Archived repository `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:110
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:104
 #, python-format
 msgid "An error occurred during archiving of `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:148
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:142
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:150
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:144
 #, python-format
 msgid "Deleted %s forks"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:159
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:153
 #, python-format
 msgid "Deleted repository `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:166
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:160
 msgid "detach or delete"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:167
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:161
 msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:182
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:176
 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:191
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:185
 #, python-format
 msgid "An error occurred during deletion of `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:216
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:210
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:220
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:214
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:256
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:250
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:259
+#: 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:266
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:260
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:290
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:284
 msgid "Locked repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:293
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:287
 msgid "Unlocked repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:313
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:307
 msgid "installed updated hooks into this repository"
 msgstr ""
 
@@ -1142,21 +1154,23 b' msgstr ""'
 msgid "Error occurred during updating repository VCS settings"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:316
+#: rhodecode/apps/repository/views/repo_summary.py:322
 #: rhodecode/templates/admin/permissions/permissions.mako:42
-#: rhodecode/templates/files/files_add.mako:15
+#: rhodecode/templates/summary/components.mako:8
 msgid "Branch"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:317
+#: rhodecode/apps/repository/views/repo_summary.py:323
+#: rhodecode/templates/summary/components.mako:32
 msgid "Tag"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:318
+#: rhodecode/apps/repository/views/repo_summary.py:324
+#: rhodecode/templates/summary/components.mako:44
 msgid "Bookmark"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:342
+#: rhodecode/apps/repository/views/repo_summary.py:347
 msgid "Closed branches"
 msgstr ""
 
@@ -1207,7 +1221,6 b' msgid "An error occurred during synchron'
 msgstr ""
 
 #: rhodecode/authentication/routes.py:61
-#: rhodecode/templates/admin/auth/auth_settings.mako:14
 #: rhodecode/templates/admin/auth/plugin_settings.mako:14
 msgid "Authentication Plugins"
 msgstr ""
@@ -1221,7 +1234,7 b' msgstr ""'
 #: rhodecode/model/permission.py:118 rhodecode/model/permission.py:122
 #: rhodecode/model/permission.py:126 rhodecode/model/permission.py:130
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:195
-#: rhodecode/templates/admin/auth/auth_settings.mako:67
+#: rhodecode/templates/admin/auth/auth_settings.mako:64
 #: rhodecode/templates/admin/integrations/list.mako:71
 msgid "Enabled"
 msgstr ""
@@ -1375,8 +1388,8 b' msgid "Password to authenticate for give'
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:283
-#: rhodecode/integrations/types/webhook.py:89 rhodecode/templates/login.mako:49
-#: rhodecode/templates/register.mako:60
+#: 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/users/user_add.mako:44
 #: rhodecode/templates/debug_style/login.html:45
@@ -1650,14 +1663,14 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:136
+#: rhodecode/templates/admin/users/user_edit_profile.mako:135
 #: 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/templates/admin/integrations/list.mako:181
+#: 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
@@ -1680,12 +1693,13 b' msgstr ""'
 #: 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/debug_style/buttons.html:132
-#: rhodecode/templates/files/files_source.mako:55
-#: rhodecode/templates/files/files_source.mako:59
-#: rhodecode/templates/files/files_source.mako:62
+#: 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
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:61
 msgid "Delete"
 msgstr ""
 
@@ -1720,32 +1734,32 b' msgstr ""'
 msgid "Root repositories only"
 msgstr ""
 
-#: rhodecode/integrations/views.py:148
+#: rhodecode/integrations/views.py:147
 msgid "{repo_name} repository"
 msgstr ""
 
-#: rhodecode/integrations/views.py:151
+#: rhodecode/integrations/views.py:150
 msgid "{repo_group_name} repo group"
 msgstr ""
 
-#: rhodecode/integrations/views.py:154
+#: rhodecode/integrations/views.py:153
 #: rhodecode/templates/admin/permissions/permissions.mako:36
 msgid "Global"
 msgstr ""
 
-#: rhodecode/integrations/views.py:158
+#: rhodecode/integrations/views.py:157
 msgid "{name} integration"
 msgstr ""
 
-#: rhodecode/integrations/views.py:173
+#: rhodecode/integrations/views.py:172
 msgid "Integration {integration_name} deleted successfully."
 msgstr ""
 
-#: rhodecode/integrations/views.py:302
+#: rhodecode/integrations/views.py:301
 msgid "Errors exist when saving integration settings. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/integrations/views.py:327
+#: rhodecode/integrations/views.py:326
 msgid "Integration {integration_name} updated successfully."
 msgstr ""
 
@@ -1763,13 +1777,13 b' msgid "Email address"'
 msgstr ""
 
 #: rhodecode/integrations/types/email.py:174
-#: rhodecode/templates/register.mako:93
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:48
+#: rhodecode/templates/register.mako:95
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:55
 #: rhodecode/templates/admin/users/user_add.mako:86
-#: rhodecode/templates/admin/users/user_edit_profile.mako:65
-#: rhodecode/templates/admin/users/users.mako:73
+#: rhodecode/templates/admin/users/user_edit_profile.mako:64
+#: rhodecode/templates/admin/users/users.mako:76
 #: rhodecode/templates/email_templates/user_registration.mako:25
-#: rhodecode/templates/users/user_profile.mako:51
+#: rhodecode/templates/users/user_profile.mako:58
 msgid "Email"
 msgstr ""
 
@@ -1838,20 +1852,20 b' msgid "This can be setup at the <a href='
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:85
-#: rhodecode/integrations/types/webhook.py:79 rhodecode/templates/login.mako:42
-#: rhodecode/templates/register.mako:46
+#: 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:24
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:25
 #: 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:39
-#: rhodecode/templates/admin/users/users.mako:71
+#: rhodecode/templates/admin/users/user_edit_profile.mako:38
+#: 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:46
-#: rhodecode/templates/users/user_profile.mako:27
+#: rhodecode/templates/user_group/profile.mako:51
+#: rhodecode/templates/users/user_profile.mako:28
 msgid "Username"
 msgstr ""
 
@@ -2029,7 +2043,7 b' msgid "fork name %s"'
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:191
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:52
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:48
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
@@ -2079,7 +2093,7 b' msgstr ""'
 msgid "Click to select line"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1825
+#: rhodecode/lib/helpers.py:1857
 msgid ""
 "Example filter terms:\n"
 "     repository:vcs\n"
@@ -2101,7 +2115,7 b' msgid ""'
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1849
+#: rhodecode/lib/helpers.py:1881
 #, 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 ""
@@ -2138,7 +2152,7 b' msgstr ""'
 msgid "in ${val} and ${detail}"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:565 rhodecode/public/js/scripts.js:22091
+#: rhodecode/lib/utils2.py:565 rhodecode/public/js/scripts.js:25634
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:92
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
 msgid "just now"
@@ -2160,7 +2174,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:764
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:774
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:817
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:815
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816
@@ -2179,7 +2193,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:2782
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:2959
 msgid "Repository no access"
 msgstr ""
 
@@ -2199,7 +2213,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817
@@ -2218,7 +2232,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:2783
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:2960
 msgid "Repository read access"
 msgstr ""
 
@@ -2238,7 +2252,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:739
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:819
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818
@@ -2257,7 +2271,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:2784
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:2961
 msgid "Repository write access"
 msgstr ""
 
@@ -2277,7 +2291,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819
@@ -2296,7 +2310,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:2785
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:2962
 msgid "Repository admin access"
 msgstr ""
 
@@ -2356,7 +2370,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:785
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:795
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:838
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837
@@ -2375,7 +2389,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:2808
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:2985
 msgid "Repository creation disabled"
 msgstr ""
 
@@ -2395,7 +2409,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838
@@ -2414,7 +2428,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:2809
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:2986
 msgid "Repository creation enabled"
 msgstr ""
 
@@ -2434,7 +2448,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:763
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:790
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:800
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:843
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842
@@ -2453,7 +2467,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:2813
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:2990
 msgid "Repository forking disabled"
 msgstr ""
 
@@ -2473,7 +2487,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:764
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843
@@ -2492,7 +2506,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:2814
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:2991
 msgid "Repository forking enabled"
 msgstr ""
 
@@ -2533,7 +2547,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1090
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1120
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1134
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1184
@@ -2552,8 +2566,8 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:3535
-#: rhodecode/public/js/scripts.js:39894
+#: 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
 msgid "Not Reviewed"
@@ -2575,7 +2589,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1091
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185
@@ -2594,7 +2608,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:3536
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3713
 msgid "Approved"
 msgstr ""
 
@@ -2614,7 +2628,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1092
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186
@@ -2633,7 +2647,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:3537
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3714
 msgid "Rejected"
 msgstr ""
 
@@ -2653,7 +2667,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1093
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187
@@ -2672,7 +2686,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:3538
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3715
 msgid "Under Review"
 msgstr ""
 
@@ -2689,7 +2703,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:769
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:779
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:822
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821
@@ -2708,7 +2722,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:2787
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:2964
 msgid "Repository group no access"
 msgstr ""
 
@@ -2725,7 +2739,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822
@@ -2744,7 +2758,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:2788
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:2965
 msgid "Repository group read access"
 msgstr ""
 
@@ -2761,7 +2775,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:824
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823
@@ -2780,7 +2794,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:2789
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:2966
 msgid "Repository group write access"
 msgstr ""
 
@@ -2797,7 +2811,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824
@@ -2816,7 +2830,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:2790
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:2967
 msgid "Repository group admin access"
 msgstr ""
 
@@ -2832,7 +2846,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:774
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:784
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:827
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826
@@ -2851,7 +2865,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:2792
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:2969
 msgid "User group no access"
 msgstr ""
 
@@ -2867,7 +2881,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827
@@ -2886,7 +2900,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:2793
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:2970
 msgid "User group read access"
 msgstr ""
 
@@ -2902,7 +2916,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:749
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:829
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828
@@ -2921,7 +2935,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:2794
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:2971
 msgid "User group write access"
 msgstr ""
 
@@ -2937,7 +2951,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829
@@ -2956,7 +2970,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:2795
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:2972
 msgid "User group admin access"
 msgstr ""
 
@@ -2972,7 +2986,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:752
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:779
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:789
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:832
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831
@@ -2991,7 +3005,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:2802
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:2979
 msgid "Repository Group creation disabled"
 msgstr ""
 
@@ -3007,7 +3021,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832
@@ -3026,7 +3040,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:2803
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:2980
 msgid "Repository Group creation enabled"
 msgstr ""
 
@@ -3042,7 +3056,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:755
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:782
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:792
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:835
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834
@@ -3061,7 +3075,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:2805
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:2982
 msgid "User Group creation disabled"
 msgstr ""
 
@@ -3077,7 +3091,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835
@@ -3096,7 +3110,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:2806
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:2983
 msgid "User Group creation enabled"
 msgstr ""
 
@@ -3112,7 +3126,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:793
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:803
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:846
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845
@@ -3131,7 +3145,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:2816
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:2993
 msgid "Registration disabled"
 msgstr ""
 
@@ -3147,7 +3161,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:767
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846
@@ -3166,7 +3180,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:2817
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:2994
 msgid "User Registration with manual account activation"
 msgstr ""
 
@@ -3182,7 +3196,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:768
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847
@@ -3201,7 +3215,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:2818
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:2995
 msgid "User Registration with automatic account activation"
 msgstr ""
 
@@ -3217,7 +3231,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:770
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:797
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:807
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:850
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849
@@ -3236,7 +3250,7 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:2824
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3001
 #: rhodecode/model/permission.py:105
 msgid "Manual activation of external account"
 msgstr ""
@@ -3253,7 +3267,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:771
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850
@@ -3272,7 +3286,7 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:2825
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3002
 #: rhodecode/model/permission.py:106
 msgid "Automatic activation of external account"
 msgstr ""
@@ -3283,7 +3297,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:760
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:840
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839
@@ -3302,7 +3316,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:2810
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:2987
 msgid "Repository creation enabled with write permission to a repository group"
 msgstr ""
 
@@ -3312,7 +3326,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840
@@ -3331,14 +3345,14 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:2811
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:2988
 msgid "Repository creation disabled with write permission to a repository group"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:762
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:772
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:815
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:813
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:813
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:814
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:814
@@ -3357,12 +3371,12 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:2780
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:2957
 msgid "RhodeCode Super Administrator"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:810
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:853
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852
@@ -3381,12 +3395,12 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:2827
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3004
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:854
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853
@@ -3405,7 +3419,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:2828
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3005
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
@@ -3421,7 +3435,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:1121
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1134
 msgid "all"
 msgstr ""
 
@@ -3437,7 +3451,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:1122
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1135
 msgid "http/web interface"
 msgstr ""
 
@@ -3453,7 +3467,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:1123
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1136
 msgid "vcs (git/hg/svn protocol)"
 msgstr ""
 
@@ -3469,7 +3483,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:1124
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1137
 msgid "api calls"
 msgstr ""
 
@@ -3485,7 +3499,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:1125
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1138
 msgid "feed access"
 msgstr ""
 
@@ -3501,7 +3515,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:2521
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2610
 msgid "No parent"
 msgstr ""
 
@@ -3512,7 +3526,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2810
 #: 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:2820
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:2997
 msgid "Password reset enabled"
 msgstr ""
 
@@ -3523,7 +3537,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2811
 #: 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:2821
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:2998
 msgid "Password reset hidden"
 msgstr ""
 
@@ -3534,7 +3548,7 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2812
 #: 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:2822
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:2999
 msgid "Password reset disabled"
 msgstr ""
 
@@ -3542,7 +3556,7 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:2797
+#: rhodecode/model/db.py:2974
 msgid "Branch no permissions"
 msgstr ""
 
@@ -3550,7 +3564,7 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:2798
+#: rhodecode/model/db.py:2975
 msgid "Branch access by web merge"
 msgstr ""
 
@@ -3558,7 +3572,7 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:2799
+#: rhodecode/model/db.py:2976
 msgid "Branch access by push"
 msgstr ""
 
@@ -3566,7 +3580,7 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:2800
+#: rhodecode/model/db.py:2977
 msgid "Branch access by push with force"
 msgstr ""
 
@@ -3590,51 +3604,51 b' msgstr ""'
 msgid "Commit index"
 msgstr ""
 
-#: rhodecode/lib/vcs/backends/base.py:147
+#: rhodecode/lib/vcs/backends/base.py:150
 msgid "This pull request can be automatically merged."
 msgstr ""
 
-#: rhodecode/lib/vcs/backends/base.py:149
-msgid "This pull request cannot be merged because of an unhandled exception. {exception}"
-msgstr ""
-
 #: rhodecode/lib/vcs/backends/base.py:152
+msgid "This pull request cannot be merged because of an unhandled exception. {exception}"
+msgstr ""
+
+#: rhodecode/lib/vcs/backends/base.py:155
 msgid "This pull request cannot be merged because of merge conflicts."
 msgstr ""
 
-#: rhodecode/lib/vcs/backends/base.py:154
-msgid "This pull request could not be merged because push to target:`{target}@{merge_commit}` failed."
-msgstr ""
-
 #: rhodecode/lib/vcs/backends/base.py:157
-msgid "This pull request cannot be merged because the target `{target_ref.name}` is not a head."
+msgid "This pull request could not be merged because push to target:`{target}@{merge_commit}` failed."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:160
-msgid "This pull request cannot be merged because the source contains more branches than the target."
+msgid "This pull request cannot be merged because the target `{target_ref.name}` is not a head."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:163
-msgid "This pull request cannot be merged because the target has multiple heads: `{heads}`."
+msgid "This pull request cannot be merged because the source contains more branches than the target."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:166
+msgid "This pull request cannot be merged because the target `{target_ref.name}` has multiple heads: `{heads}`."
+msgstr ""
+
+#: rhodecode/lib/vcs/backends/base.py:169
 msgid "This pull request cannot be merged because the target repository is locked by {locked_by}."
 msgstr ""
 
-#: rhodecode/lib/vcs/backends/base.py:170
-msgid "This pull request cannot be merged because the target reference `{target_ref.name}` is missing."
-msgstr ""
-
 #: rhodecode/lib/vcs/backends/base.py:173
-msgid "This pull request cannot be merged because the source reference `{source_ref.name}` is missing."
+msgid "This pull request cannot be merged because the target reference `{target_ref.name}` is missing."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:176
+msgid "This pull request cannot be merged because the source reference `{source_ref.name}` is missing."
+msgstr ""
+
+#: rhodecode/lib/vcs/backends/base.py:179
 msgid "This pull request cannot be merged because of conflicts related to sub repositories."
 msgstr ""
 
-#: rhodecode/lib/vcs/backends/base.py:181
+#: rhodecode/lib/vcs/backends/base.py:184
 msgid "This pull request cannot be merged because the target or the source reference is missing."
 msgstr ""
 
@@ -3654,11 +3668,11 b' msgstr ""'
 msgid "1 month {end_date}"
 msgstr ""
 
-#: rhodecode/model/comment.py:412
+#: rhodecode/model/comment.py:422
 msgid "made a comment"
 msgstr ""
 
-#: rhodecode/model/comment.py:413
+#: rhodecode/model/comment.py:423
 msgid "Show it now"
 msgstr ""
 
@@ -3764,39 +3778,34 b' msgstr ""'
 #: 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:387
+#: rhodecode/templates/data_table/_dt_elements.mako:411
 msgid "Write"
 msgstr ""
 
 #: rhodecode/model/permission.py:74 rhodecode/model/permission.py:80
 #: rhodecode/model/permission.py:86
-#: rhodecode/templates/admin/auth/auth_settings.mako:12
 #: rhodecode/templates/admin/auth/plugin_settings.mako:12
 #: rhodecode/templates/admin/defaults/defaults.mako:12
 #: rhodecode/templates/admin/integrations/base.mako:21
 #: rhodecode/templates/admin/integrations/form.mako:15
 #: rhodecode/templates/admin/integrations/form.mako:28
+#: rhodecode/templates/admin/integrations/global.mako:12
 #: rhodecode/templates/admin/integrations/list.mako:8
 #: rhodecode/templates/admin/integrations/list.mako:14
 #: rhodecode/templates/admin/integrations/new.mako:11
 #: rhodecode/templates/admin/permissions/permissions.mako:12
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14
-#: rhodecode/templates/admin/repo_groups/repo_groups.mako:13
 #: rhodecode/templates/admin/repos/repo_add.mako:13
 #: rhodecode/templates/admin/repos/repo_add.mako:17
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:14
-#: rhodecode/templates/admin/repos/repos.mako:13
 #: rhodecode/templates/admin/settings/settings.mako:12
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:11
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:12
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:14
-#: rhodecode/templates/admin/user_groups/user_groups.mako:13
 #: rhodecode/templates/admin/users/user_add.mako:11
 #: rhodecode/templates/admin/users/user_edit.mako:12
-#: rhodecode/templates/admin/users/users.mako:13
-#: rhodecode/templates/base/base.mako:536
-#: rhodecode/templates/base/base.mako:543
+#: rhodecode/templates/base/base.mako:639
 msgid "Admin"
 msgstr ""
 
@@ -3867,77 +3876,79 b' msgstr ""'
 msgid "This pull request cannot be updated because the source reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1227
+#: rhodecode/model/pull_request.py:1240
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1229
+#: rhodecode/model/pull_request.py:1242
 msgid "This pull request is closed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1243
+#: rhodecode/model/pull_request.py:1256
 msgid "Pull request merging is not supported."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1262
+#: rhodecode/model/pull_request.py:1275
 msgid "Target repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1265
+#: rhodecode/model/pull_request.py:1278
 msgid "Source repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1430 rhodecode/model/scm.py:924
+#: 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:404
+#: rhodecode/templates/base/base.mako:469
+#: rhodecode/templates/summary/components.mako:46
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1435
+#: rhodecode/model/pull_request.py:1460
 msgid "Commit IDs"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1438
+#: rhodecode/model/pull_request.py:1463
+#: rhodecode/templates/summary/components.mako:22
 msgid "Closed Branches"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1603
+#: rhodecode/model/pull_request.py:1629
 msgid "User `{}` not allowed to perform merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1621
+#: rhodecode/model/pull_request.py:1647
 msgid "Target branch `{}` changes rejected by rule {}."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1635
+#: rhodecode/model/pull_request.py:1661
 msgid "Pull request reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1649
+#: rhodecode/model/pull_request.py:1675
 msgid "Cannot merge, {} TODO still not resolved."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1652
+#: rhodecode/model/pull_request.py:1678
 msgid "Cannot merge, {} TODOs still not resolved."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1687
+#: rhodecode/model/pull_request.py:1713
 msgid "Merge strategy: rebase"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1692
+#: rhodecode/model/pull_request.py:1718
 msgid "Merge strategy: explicit merge commit"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1700
+#: rhodecode/model/pull_request.py:1726
 msgid "Source branch will be closed after merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1702
+#: rhodecode/model/pull_request.py:1728
 msgid "Source branch will be deleted after merge."
 msgstr ""
 
-#: rhodecode/model/scm.py:902
+#: rhodecode/model/scm.py:904
 msgid "latest tip"
 msgstr ""
 
@@ -4279,400 +4290,398 b' msgstr ""'
 msgid ": , "
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:20578
+#: rhodecode/public/js/scripts.js:24109
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87
 msgid "No results"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22026
+#: rhodecode/public/js/scripts.js:25569
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:121
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109
 msgid "{0} year"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22027
+#: rhodecode/public/js/scripts.js:25570
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:113
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110
 msgid "{0} month"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22028
+#: rhodecode/public/js/scripts.js:25571
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111
 msgid "{0} day"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22029
+#: rhodecode/public/js/scripts.js:25572
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112
 msgid "{0} hour"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22030
+#: rhodecode/public/js/scripts.js:25573
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:112
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113
 msgid "{0} min"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22031
+#: rhodecode/public/js/scripts.js:25574
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:118
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114
 msgid "{0} sec"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22051
+#: rhodecode/public/js/scripts.js:25594
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134
 msgid "in {0}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22059
+#: rhodecode/public/js/scripts.js:25602
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:105
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142
 msgid "{0} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22071
+#: rhodecode/public/js/scripts.js:25614
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:123
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154
 msgid "{0}, {1} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22073
+#: rhodecode/public/js/scripts.js:25616
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:91
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156
 msgid "in {0}, {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22077
+#: rhodecode/public/js/scripts.js:25620
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:106
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160
 msgid "{0} and {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22079
+#: rhodecode/public/js/scripts.js:25622
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162
 msgid "{0} and {1} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22081
+#: rhodecode/public/js/scripts.js:25624
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:90
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164
 msgid "in {0} and {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:36140
+#: rhodecode/public/js/scripts.js:39683
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4
 msgid "Loading more results..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:36143
+#: rhodecode/public/js/scripts.js:39686
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7
 msgid "Searching..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:36146
+#: rhodecode/public/js/scripts.js:39689
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10
 msgid "No matches found"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:36149
+#: rhodecode/public/js/scripts.js:39692
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13
 msgid "Loading failed"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:36153
+#: rhodecode/public/js/scripts.js:39696
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
 #: 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:36155
+#: rhodecode/public/js/scripts.js:39698
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:117
 #: 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:36160
+#: rhodecode/public/js/scripts.js:39703
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24
 msgid "Please enter {0} or more character"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:36162
+#: rhodecode/public/js/scripts.js:39705
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26
 msgid "Please enter {0} or more characters"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:36167
+#: rhodecode/public/js/scripts.js:39710
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31
 msgid "Please delete {0} character"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:36169
+#: rhodecode/public/js/scripts.js:39712
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33
 msgid "Please delete {0} characters"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:36173
+#: rhodecode/public/js/scripts.js:39716
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:80
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37
 msgid "You can only select {0} item"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:36175
+#: rhodecode/public/js/scripts.js:39718
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39
 msgid "You can only select {0} items"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37113
+#: rhodecode/public/js/scripts.js:40656
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
 #: rhodecode/public/js/src/rhodecode/changelog.js:35
 msgid "showing {0} out of {1} commit"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37115
+#: rhodecode/public/js/scripts.js:40658
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
 #: rhodecode/public/js/src/rhodecode/changelog.js:37
 msgid "showing {0} out of {1} commits"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37627
+#: rhodecode/public/js/scripts.js:41194
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
-#: rhodecode/public/js/src/rhodecode/codemirror.js:359
+#: rhodecode/public/js/src/rhodecode/codemirror.js:364
 msgid "Set status to Approved"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37646
+#: rhodecode/public/js/scripts.js:41213
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
-#: rhodecode/public/js/src/rhodecode/codemirror.js:378
+#: rhodecode/public/js/src/rhodecode/codemirror.js:383
 msgid "Set status to Rejected"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37665
+#: rhodecode/public/js/scripts.js:41232
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
-#: rhodecode/public/js/src/rhodecode/codemirror.js:397
+#: 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:37685
+#: rhodecode/public/js/scripts.js:41252
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
-#: rhodecode/public/js/src/rhodecode/codemirror.js:417
+#: rhodecode/public/js/src/rhodecode/codemirror.js:422
 msgid "Note Comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37998 rhodecode/public/js/scripts.js:38352
+#: rhodecode/public/js/scripts.js:41553 rhodecode/public/js/scripts.js:41907
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
-#: rhodecode/public/js/src/rhodecode/codemirror.js:730
+#: 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:38013 rhodecode/public/js/scripts.js:38367
+#: rhodecode/public/js/scripts.js:41568 rhodecode/public/js/scripts.js:41922
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
-#: rhodecode/public/js/src/rhodecode/codemirror.js:745
+#: 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:38094 rhodecode/public/js/scripts.js:38562
+#: 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/src/rhodecode/codemirror.js:826
+#: rhodecode/public/js/src/rhodecode/codemirror.js:819
 #: rhodecode/public/js/src/rhodecode/comments.js:443
-#: rhodecode/templates/files/files_browser_tree.mako:51
+#: rhodecode/public/js/src/rhodecode/files.js:493
+#: rhodecode/templates/files/files_browser_tree.mako:52
 msgid "Loading ..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:38268
+#: rhodecode/public/js/scripts.js:41823
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
 #: rhodecode/public/js/src/rhodecode/comments.js:149
 msgid "resolve comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:38511
+#: rhodecode/public/js/scripts.js:42066
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
 #: rhodecode/public/js/src/rhodecode/comments.js:392
 msgid "Submitting..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:38676
+#: rhodecode/public/js/scripts.js:42231
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
 #: rhodecode/public/js/src/rhodecode/comments.js:557
 msgid "Delete this comment?"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:38748
+#: rhodecode/public/js/scripts.js:42305
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
-#: rhodecode/public/js/src/rhodecode/comments.js:629
+#: rhodecode/public/js/src/rhodecode/comments.js:631
 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:38825
+#: rhodecode/public/js/scripts.js:42382
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
-#: rhodecode/public/js/src/rhodecode/comments.js:706
+#: rhodecode/public/js/src/rhodecode/comments.js:708
 msgid "Leave a comment on line {0}."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:38950
+#: rhodecode/public/js/scripts.js:42507
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
-#: rhodecode/public/js/src/rhodecode/comments.js:831
+#: rhodecode/public/js/src/rhodecode/comments.js:833
 msgid "TODO from comment {0} was fixed."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39131
+#: rhodecode/public/js/scripts.js:42785
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:100
-#: rhodecode/public/js/src/rhodecode/files.js:151
+#: rhodecode/public/js/src/rhodecode/files.js:248
 msgid "truncated result"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39133
+#: rhodecode/public/js/scripts.js:42787
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
-#: rhodecode/public/js/src/rhodecode/files.js:153
+#: rhodecode/public/js/src/rhodecode/files.js:250
 msgid "truncated results"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39142
+#: rhodecode/public/js/scripts.js:42796
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
-#: rhodecode/public/js/src/rhodecode/files.js:162
+#: rhodecode/public/js/src/rhodecode/files.js:259
 msgid "No matching files"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39277
+#: rhodecode/public/js/scripts.js:42854
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
-#: rhodecode/public/js/src/rhodecode/files.js:297
+#: rhodecode/public/js/src/rhodecode/files.js:317
 msgid "Selection link"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39317
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
+#: rhodecode/public/js/scripts.js:42946
+#: rhodecode/public/js/src/rhodecode/files.js:409
+msgid "All Authors"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:43081
 #: rhodecode/public/js/src/rhodecode/followers.js:26
-msgid "Stop following this repository"
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:39318
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
+msgid "Stopped watching this repository"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:43082
 #: rhodecode/public/js/src/rhodecode/followers.js:27
-msgid "Unfollow"
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:39327
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
-#: rhodecode/public/js/src/rhodecode/followers.js:36
-msgid "Start following this repository"
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:39328
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
-#: rhodecode/public/js/src/rhodecode/followers.js:37
-msgid "Follow"
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:39709
+#: rhodecode/templates/base/base.mako:226
+msgid "Watch"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:43085
+#: rhodecode/public/js/src/rhodecode/followers.js:30
+msgid "Started watching this repository"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:43086
+#: rhodecode/public/js/src/rhodecode/followers.js:31
+#: rhodecode/templates/base/base.mako:224
+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:39718
+#: 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:39723
+#: rhodecode/public/js/scripts.js:43473
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148
 msgid "At least {0} reviewer must vote."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39729
+#: rhodecode/public/js/scripts.js:43479
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154
 msgid "At least {0} reviewers must vote."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39745
+#: rhodecode/public/js/scripts.js:43495
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:170
 msgid "Reviewers picked from source code changes."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39752
+#: rhodecode/public/js/scripts.js:43502
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:177
 msgid "Adding new reviewers is forbidden."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39759
+#: rhodecode/public/js/scripts.js:43509
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:184
 msgid "Author is not allowed to be a reviewer."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39773
+#: rhodecode/public/js/scripts.js:43523
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:198
 msgid "Commit Authors are not allowed to be a reviewer."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39881
+#: rhodecode/public/js/scripts.js:43631
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:306
 msgid "User `{0}` not allowed to be a reviewer"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39887
+#: rhodecode/public/js/scripts.js:43637
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:78
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:312
 msgid "User `{0}` already in reviewers"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39975
+#: rhodecode/public/js/scripts.js:43725
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:400
 msgid "added manually by \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39979
+#: rhodecode/public/js/scripts.js:43729
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:404
 msgid "member of \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40566
+#: rhodecode/public/js/scripts.js:44310
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
-#: rhodecode/public/js/src/rhodecode.js:143
+#: rhodecode/public/js/src/rhodecode.js:144
 msgid "file"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40586
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
-#: rhodecode/public/js/src/rhodecode.js:163
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:33
-msgid "Show more"
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:40968
+#: rhodecode/public/js/scripts.js:44704
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
-#: rhodecode/public/js/src/rhodecode.js:545
+#: rhodecode/public/js/src/rhodecode.js:538
 msgid "date not in future"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40976
+#: rhodecode/public/js/scripts.js:44712
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
-#: rhodecode/public/js/src/rhodecode.js:553
+#: rhodecode/public/js/src/rhodecode.js:546
 msgid "Specified expiration date"
 msgstr ""
 
@@ -4692,7 +4701,7 b' msgstr ""'
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
 #: rhodecode/public/js/src/i18n_messages.js:5
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:333
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:329
 msgid "Close"
 msgstr ""
 
@@ -4712,6 +4721,10 b' msgstr ""'
 msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page."
 msgstr ""
 
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
+msgid "Follow"
+msgstr ""
+
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
 msgid "Hide full context diff"
 msgstr ""
@@ -4770,7 +4783,7 b' msgid "No users available yet."'
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
-#: rhodecode/templates/changelog/changelog.mako:59
+#: rhodecode/templates/commits/changelog.mako:78
 msgid "Open new pull request"
 msgstr ""
 
@@ -4796,6 +4809,11 b' msgstr ""'
 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"
+msgstr ""
+
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
 msgid "Show selected commit __S"
 msgstr ""
@@ -4808,6 +4826,14 b' msgstr ""'
 msgid "Show whitespace changes"
 msgstr ""
 
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
+msgid "Start following this repository"
+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"
@@ -4826,12 +4852,16 b' msgstr ""'
 msgid "Toggle Wide Mode diff"
 msgstr ""
 
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
+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:72
+#: rhodecode/templates/admin/auth/auth_settings.mako:69
 msgid "activated"
 msgstr ""
 
@@ -4848,12 +4878,12 b' msgid "files"'
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:93
-#: rhodecode/templates/pullrequests/pullrequest.mako:141
+#: 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:72
+#: rhodecode/templates/admin/auth/auth_settings.mako:69
 msgid "not active"
 msgstr ""
 
@@ -4917,65 +4947,68 b' msgstr ""'
 msgid "Dashboard"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:37
+#: 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:27
-#: rhodecode/templates/base/base.mako:350
+#: rhodecode/templates/admin/repos/repos.mako:31
+#: rhodecode/templates/base/base.mako:410
 msgid "Add Repository"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:41
+#: 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:27
+#: 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:64
+#: rhodecode/templates/index_base.mako:47
 msgid "No repositories or repositories groups exists here."
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:82
-#: rhodecode/templates/index_base.mako:112
-#: rhodecode/templates/admin/gists/index.mako:112
+#: rhodecode/templates/index_base.mako:65
+#: rhodecode/templates/index_base.mako:98
+#: rhodecode/templates/admin/gists/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_user_group_membership.mako:39
 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31
-#: rhodecode/templates/admin/repo_groups/repo_groups.mako:53
+#: rhodecode/templates/admin/repo_groups/repo_groups.mako:74
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16
-#: rhodecode/templates/admin/repos/repos.mako:54
-#: rhodecode/templates/admin/user_groups/user_groups.mako:73
+#: rhodecode/templates/admin/repos/repos.mako:58
+#: 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:59
-#: rhodecode/templates/branches/branches.mako:58
-#: rhodecode/templates/files/files_browser_tree.mako:5
-#: rhodecode/templates/pullrequests/pullrequests.mako:110
-#: rhodecode/templates/tags/tags.mako:59
+#: 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/tags/tags.mako:57
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:85
-#: rhodecode/templates/index_base.mako:115
-#: rhodecode/templates/admin/gists/index.mako:114
+#: rhodecode/templates/index_base.mako:68
+#: rhodecode/templates/index_base.mako:101
+#: rhodecode/templates/admin/gists/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_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
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:54
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:53
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55
-#: rhodecode/templates/admin/repo_groups/repo_groups.mako:56
+#: rhodecode/templates/admin/repo_groups/repo_groups.mako:77
 #: rhodecode/templates/admin/repos/repo_add_base.mako:66
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:170
-#: rhodecode/templates/admin/repos/repos.mako:57
-#: rhodecode/templates/admin/user_groups/user_group_add.mako:43
+#: rhodecode/templates/admin/repos/repos.mako:61
+#: 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:75
+#: rhodecode/templates/admin/user_groups/user_groups.mako:78
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:72
 #: rhodecode/templates/admin/users/user_edit_groups.mako:59
@@ -4988,59 +5021,58 b' msgstr ""'
 #: 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/files/file_tree_detail.mako:5
-#: rhodecode/templates/files/file_tree_detail.mako:12
-#: rhodecode/templates/forks/fork.mako:60
-#: rhodecode/templates/forks/forks.mako:64
-#: rhodecode/templates/pullrequests/pullrequest.mako:55
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:170
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:484
-#: rhodecode/templates/summary/components.mako:151
+#: 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/summary/components.mako:159
 msgid "Description"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:88
-#: rhodecode/templates/index_base.mako:118
-#: rhodecode/templates/admin/repo_groups/repo_groups.mako:59
-#: rhodecode/templates/admin/repos/repos.mako:60
+#: rhodecode/templates/index_base.mako:71
+#: rhodecode/templates/index_base.mako:104
+#: rhodecode/templates/admin/repo_groups/repo_groups.mako:80
+#: rhodecode/templates/admin/repos/repos.mako:64
 msgid "Last Change"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:90
-#: rhodecode/templates/index_base.mako:123
+#: rhodecode/templates/index_base.mako:76
+#: rhodecode/templates/index_base.mako:109
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6
+#: 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:63
+#: 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:65
+#: rhodecode/templates/admin/repos/repos.mako:69
 #: 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:83
+#: rhodecode/templates/admin/user_groups/user_groups.mako:86
 #: rhodecode/templates/admin/users/user_edit_groups.mako:65
-#: rhodecode/templates/forks/forks.mako:60
-#: rhodecode/templates/summary/components.mako:224
-#: rhodecode/templates/user_group/profile.mako:23
+#: rhodecode/templates/forks/forks.mako:58
+#: rhodecode/templates/summary/components.mako:148
+#: rhodecode/templates/user_group/profile.mako:24
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:121
+#: 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:63
-#: rhodecode/templates/bookmarks/bookmarks.mako:66
-#: rhodecode/templates/branches/branches.mako:65
-#: rhodecode/templates/changelog/changelog.mako:116
-#: rhodecode/templates/changeset/changeset.mako:37
+#: rhodecode/templates/admin/repos/repos.mako:67
+#: 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:31
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:482
+#: rhodecode/templates/files/file_authors_box.mako:26
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:478
 #: rhodecode/templates/search/search_commit.mako:9
+#: rhodecode/templates/summary/components.mako:117
+#: rhodecode/templates/summary/components.mako:125
 #: rhodecode/templates/summary/summary_commits.mako:8
-#: rhodecode/templates/tags/tags.mako:66
+#: rhodecode/templates/tags/tags.mako:64
 msgid "Commit"
 msgstr ""
 
@@ -5050,58 +5082,58 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
 msgid "Home"
 msgstr ""
 
-#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:89
+#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:91
 #: rhodecode/templates/debug_style/login.html:60
 msgid "Sign In"
 msgstr ""
 
-#: rhodecode/templates/login.mako:37
+#: rhodecode/templates/login.mako:39
 msgid "Sign In using username/password"
 msgstr ""
 
-#: rhodecode/templates/login.mako:51
+#: rhodecode/templates/login.mako:53
 msgid "Forgot your password?"
 msgstr ""
 
-#: rhodecode/templates/login.mako:64
-msgid "Remember my indefinitely"
-msgstr ""
-
 #: rhodecode/templates/login.mako:66
+msgid "Remember my indefinitely"
+msgstr ""
+
+#: rhodecode/templates/login.mako:68
 msgid "Remember me for {}"
 msgstr ""
 
-#: rhodecode/templates/login.mako:72
+#: rhodecode/templates/login.mako:74
 msgid "Create a new account."
 msgstr ""
 
-#: rhodecode/templates/login.mako:79
+#: rhodecode/templates/login.mako:81
 msgid "Password reset is disabled."
 msgstr ""
 
-#: rhodecode/templates/login.mako:80
+#: rhodecode/templates/login.mako:82
 msgid "Please contact "
 msgstr ""
 
-#: rhodecode/templates/login.mako:82 rhodecode/templates/password_reset.mako:37
-#: rhodecode/templates/base/base.mako:48
+#: rhodecode/templates/login.mako:84 rhodecode/templates/password_reset.mako:39
+#: rhodecode/templates/base/base.mako:50
 msgid "Support"
 msgstr ""
 
-#: rhodecode/templates/login.mako:83 rhodecode/templates/password_reset.mako:38
-#: rhodecode/templates/files/files_add.mako:54
-#: rhodecode/templates/files/files_add.mako:71
-msgid "or"
-msgstr ""
-
 #: rhodecode/templates/login.mako:85 rhodecode/templates/password_reset.mako:40
+msgid "or"
+msgstr ""
+
+#: rhodecode/templates/login.mako:87 rhodecode/templates/password_reset.mako:42
 msgid "an administrator if you need help."
 msgstr ""
 
-#: rhodecode/templates/login.mako:89
+#: rhodecode/templates/login.mako:91
 msgid "Sign in to {}"
 msgstr ""
 
@@ -5109,32 +5141,32 b' msgstr ""'
 msgid "Reset Password"
 msgstr ""
 
-#: rhodecode/templates/password_reset.mako:35
+#: rhodecode/templates/password_reset.mako:37
 msgid "Password reset is disabled. Please contact "
 msgstr ""
 
-#: rhodecode/templates/password_reset.mako:47
+#: rhodecode/templates/password_reset.mako:49
 msgid "Reset your Password"
 msgstr ""
 
-#: rhodecode/templates/password_reset.mako:48
+#: rhodecode/templates/password_reset.mako:50
 msgid "Go to the login page to sign in."
 msgstr ""
 
-#: rhodecode/templates/password_reset.mako:52
+#: rhodecode/templates/password_reset.mako:54
 msgid "Email Address"
 msgstr ""
 
-#: rhodecode/templates/password_reset.mako:58
+#: rhodecode/templates/password_reset.mako:60
 msgid "Password reset link will be sent to matching email address"
 msgstr ""
 
-#: rhodecode/templates/password_reset.mako:62
-#: rhodecode/templates/register.mako:102
+#: rhodecode/templates/password_reset.mako:64
+#: rhodecode/templates/register.mako:104
 msgid "Captcha"
 msgstr ""
 
-#: rhodecode/templates/password_reset.mako:73
+#: rhodecode/templates/password_reset.mako:75
 msgid "Send password reset email"
 msgstr ""
 
@@ -5142,49 +5174,49 b' msgstr ""'
 msgid "Create an Account"
 msgstr ""
 
-#: rhodecode/templates/register.mako:36
+#: rhodecode/templates/register.mako:38
 msgid "Create an account linked with {}"
 msgstr ""
 
-#: rhodecode/templates/register.mako:38
+#: rhodecode/templates/register.mako:40
 msgid "Create an account"
 msgstr ""
 
-#: rhodecode/templates/register.mako:41
+#: rhodecode/templates/register.mako:43
 msgid "Go to the login page to sign in with an existing account."
 msgstr ""
 
-#: rhodecode/templates/register.mako:67
+#: rhodecode/templates/register.mako:69
 msgid "Re-enter password"
 msgstr ""
 
-#: rhodecode/templates/register.mako:79
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:32
+#: rhodecode/templates/register.mako:81
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:35
 #: 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:47
-#: rhodecode/templates/admin/users/users.mako:75
+#: rhodecode/templates/admin/users/user_edit_profile.mako:46
+#: rhodecode/templates/admin/users/users.mako:78
 msgid "First Name"
 msgstr ""
 
-#: rhodecode/templates/register.mako:86
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:40
+#: rhodecode/templates/register.mako:88
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:45
 #: 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:56
-#: rhodecode/templates/admin/users/users.mako:77
+#: rhodecode/templates/admin/users/user_edit_profile.mako:55
+#: rhodecode/templates/admin/users/users.mako:80
 msgid "Last Name"
 msgstr ""
 
-#: rhodecode/templates/register.mako:114
+#: rhodecode/templates/register.mako:116
 msgid "Account activation requires admin approval."
 msgstr ""
 
-#: rhodecode/templates/register.mako:121
+#: rhodecode/templates/register.mako:123
 msgid "Create Account"
 msgstr ""
 
-#: rhodecode/templates/register.mako:121
+#: rhodecode/templates/register.mako:123
 msgid "Create Account in {}"
 msgstr ""
 
@@ -5192,93 +5224,92 b' msgstr ""'
 msgid "Admin audit log entry"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_audit_log_entry.mako:13
+#: rhodecode/templates/admin/admin_audit_log_entry.mako:26
 msgid "Audit long entry"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_audit_log_entry.mako:31
+#: rhodecode/templates/admin/admin_audit_log_entry.mako:34
 #: rhodecode/templates/users/user.mako:4 rhodecode/templates/users/user.mako:11
 msgid "User"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_audit_log_entry.mako:43
+#: rhodecode/templates/admin/admin_audit_log_entry.mako:46
 #: rhodecode/templates/admin/admin_log_base.mako:11
-#: rhodecode/templates/bookmarks/bookmarks.mako:61
-#: rhodecode/templates/branches/branches.mako:60
-#: rhodecode/templates/tags/tags.mako:61
+#: rhodecode/templates/bookmarks/bookmarks.mako:59
+#: rhodecode/templates/branches/branches.mako:58
+#: rhodecode/templates/tags/tags.mako:59
 msgid "Date"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_audit_log_entry.mako:51
+#: rhodecode/templates/admin/admin_audit_log_entry.mako:54
 #: rhodecode/templates/admin/admin_log_base.mako:12
 msgid "IP"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_audit_log_entry.mako:60
+#: 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:65
+#: rhodecode/templates/admin/repo_groups/repo_groups.mako:86
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13
-#: rhodecode/templates/admin/repos/repos.mako:69
+#: rhodecode/templates/admin/repos/repos.mako:73
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71
-#: rhodecode/templates/admin/user_groups/user_groups.mako:85
+#: rhodecode/templates/admin/user_groups/user_groups.mako:88
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:19
 #: rhodecode/templates/admin/users/user_edit_groups.mako:73
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:13
-#: rhodecode/templates/admin/users/users.mako:88
-#: rhodecode/templates/files/files_detail.mako:58
-#: rhodecode/templates/forks/forks.mako:71
+#: rhodecode/templates/admin/users/users.mako:91
+#: rhodecode/templates/forks/forks.mako:69
 msgid "Action"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_audit_log_entry.mako:78
+#: rhodecode/templates/admin/admin_audit_log_entry.mako:81
 #: rhodecode/templates/admin/admin_log_base.mako:9
 msgid "Action Data"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_audit_log_entry.mako:86
+#: rhodecode/templates/admin/admin_audit_log_entry.mako:89
 #: rhodecode/templates/admin/admin_log_base.mako:47
 msgid "data not available for v1 entries type"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_audit_log_entry.mako:92
+#: rhodecode/templates/admin/admin_audit_log_entry.mako:95
 #: rhodecode/templates/admin/admin_log_base.mako:10
-#: rhodecode/templates/admin/defaults/defaults.mako:31
+#: rhodecode/templates/admin/defaults/defaults.mako:32
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:16
-#: rhodecode/templates/base/base.mako:421
-#: rhodecode/templates/base/base.mako:423
-#: rhodecode/templates/base/base.mako:425
+#: rhodecode/templates/base/base.mako:486
+#: rhodecode/templates/base/base.mako:488
+#: rhodecode/templates/base/base.mako:490
 #: 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:77
+#: rhodecode/templates/base/base.mako:102
 msgid "Admin audit logs"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_audit_logs.mako:13
+#: rhodecode/templates/admin/admin_audit_logs.mako:25
 msgid "filter..."
 msgstr ""
 
-#: rhodecode/templates/admin/admin_audit_logs.mako:14
+#: 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/journal/journal.mako:13
 msgid "filter"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_audit_logs.mako:15
-#: rhodecode/templates/admin/repos/repo_edit.mako:95
-#: rhodecode/templates/admin/users/user_edit.mako:47
+#: rhodecode/templates/admin/admin_audit_logs.mako:27
+#: rhodecode/templates/admin/repos/repo_edit.mako:91
+#: rhodecode/templates/admin/users/user_edit.mako:48
 msgid "Audit logs"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_audit_logs.mako:17
+#: 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/journal/journal.mako:16
@@ -5297,48 +5328,75 b' msgstr ""'
 msgid "No actions yet"
 msgstr ""
 
+#: rhodecode/templates/admin/main.mako:5
+#: rhodecode/templates/admin/settings/settings.mako:5
+msgid "Settings administration"
+msgstr ""
+
+#: rhodecode/templates/admin/main.mako:26
+msgid "Administration area"
+msgstr ""
+
+#: rhodecode/templates/admin/main.mako:30
+msgid "Repositories under administration"
+msgstr ""
+
+#: rhodecode/templates/admin/main.mako:39
+msgid "Repository groups under administration"
+msgstr ""
+
+#: rhodecode/templates/admin/main.mako:48
+msgid "User groups under administration"
+msgstr ""
+
+#: rhodecode/templates/admin/main.mako:52
+#: rhodecode/templates/admin/user_groups/user_group_add.mako:15
+#: rhodecode/templates/admin/user_groups/user_groups.mako:31
+msgid "Add User Group"
+msgstr ""
+
 #: rhodecode/templates/admin/auth/auth_settings.mako:5
 #: rhodecode/templates/admin/auth/plugin_settings.mako:5
 msgid "Authentication Settings"
 msgstr ""
 
-#: rhodecode/templates/admin/auth/auth_settings.mako:45
+#: rhodecode/templates/admin/auth/auth_settings.mako:42
 msgid "Enabled and Available Plugins"
 msgstr ""
 
-#: rhodecode/templates/admin/auth/auth_settings.mako:51
+#: rhodecode/templates/admin/auth/auth_settings.mako:48
 msgid "Ordered Activated Plugins"
 msgstr ""
 
-#: rhodecode/templates/admin/auth/auth_settings.mako:56
+#: rhodecode/templates/admin/auth/auth_settings.mako:53
 msgid ""
 "List of plugins, separated by commas.\n"
 "The order of the plugins is also the order in which RhodeCode Enterprise will try to authenticate a user."
 msgstr ""
 
+#: rhodecode/templates/admin/auth/auth_settings.mako:60
+msgid "Activate"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.mako:61
+msgid "Plugin Name"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.mako:62
+msgid "Documentation"
+msgstr ""
+
 #: rhodecode/templates/admin/auth/auth_settings.mako:63
-msgid "Activate"
-msgstr ""
-
-#: rhodecode/templates/admin/auth/auth_settings.mako:64
-msgid "Plugin Name"
-msgstr ""
-
-#: rhodecode/templates/admin/auth/auth_settings.mako:65
-msgid "Documentation"
-msgstr ""
-
-#: rhodecode/templates/admin/auth/auth_settings.mako:66
 msgid "Plugin ID"
 msgstr ""
 
-#: rhodecode/templates/admin/auth/auth_settings.mako:88
-#: rhodecode/templates/admin/auth/plugin_settings.mako:95
+#: 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:105
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:108
 #: 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:78
+#: 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
@@ -5347,17 +5405,17 b' msgstr ""'
 #: 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:60
+#: 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:135
+#: rhodecode/templates/admin/users/user_edit_profile.mako:134
 #: rhodecode/templates/base/default_perms_box.mako:88
 msgid "Save"
 msgstr ""
 
-#: rhodecode/templates/admin/auth/plugin_settings.mako:45
+#: rhodecode/templates/admin/auth/plugin_settings.mako:46
 msgid "Plugin"
 msgstr ""
 
@@ -5371,7 +5429,7 b' msgid "Default Settings For New Reposito'
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14
-#: rhodecode/templates/admin/gists/index.mako:110
+#: rhodecode/templates/admin/gists/index.mako:105
 #: rhodecode/templates/admin/integrations/list.mako:73
 #: rhodecode/templates/admin/repos/repo_add_base.mako:43
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12
@@ -5386,7 +5444,7 b' msgstr ""'
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27
 #: rhodecode/templates/admin/repos/repo_add_base.mako:102
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:192
-#: rhodecode/templates/forks/fork.mako:99
+#: rhodecode/templates/forks/fork.mako:95
 msgid "Private repositories are only visible to people explicitly added as collaborators."
 msgstr ""
 
@@ -5436,8 +5494,8 b' msgstr ""'
 
 #: rhodecode/templates/admin/gists/edit.mako:56
 #: rhodecode/templates/admin/gists/new.mako:50
-#: rhodecode/templates/files/files_add.mako:80
-#: rhodecode/templates/files/files_edit.mako:81
+#: rhodecode/templates/files/files_add.mako:68
+#: rhodecode/templates/files/files_edit.mako:69
 msgid "plain"
 msgstr ""
 
@@ -5449,10 +5507,7 b' msgstr ""'
 #: rhodecode/templates/base/issue_tracker_settings.mako:73
 #: rhodecode/templates/changeset/changeset_file_comment.mako:392
 #: rhodecode/templates/codeblocks/diffs.mako:72
-#: rhodecode/templates/files/files_add.mako:108
-#: rhodecode/templates/files/files_delete.mako:69
-#: rhodecode/templates/files/files_edit.mako:108
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:65
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:61
 msgid "Cancel"
 msgstr ""
 
@@ -5462,90 +5517,77 b' msgid "Gist was updated since you starte'
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.mako:6
-#: rhodecode/templates/admin/gists/index.mako:20
-#, python-format
-msgid "Private Gists for user %s"
+msgid "Private Gists for user {}"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.mako:8
-#: rhodecode/templates/admin/gists/index.mako:22
-#, python-format
-msgid "Public Gists for user %s"
+msgid "Public Gists for user {}"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.mako:10
 msgid "Public Gists"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:18
+#: rhodecode/templates/admin/gists/index.mako:30
+msgid "All gists"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.mako:32
+msgid "All public"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.mako:34
+msgid "My gists"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.mako:35
+msgid "My private"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.mako:36
+msgid "My public"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.mako:43
+#: rhodecode/templates/admin/gists/show.mako:35
+msgid "Create New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/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
-#: rhodecode/templates/admin/repo_groups/repo_groups.mako:12
-#: rhodecode/templates/admin/repos/repos.mako:12
-#: rhodecode/templates/admin/user_groups/user_groups.mako:12
-#: rhodecode/templates/admin/users/users.mako:12
-#: rhodecode/templates/bookmarks/bookmarks.mako:12
-#: rhodecode/templates/branches/branches.mako:12
+#: rhodecode/templates/admin/repo_groups/repo_groups.mako:25
+#: rhodecode/templates/admin/repos/repos.mako:25
+#: rhodecode/templates/admin/user_groups/user_groups.mako:25
+#: rhodecode/templates/admin/users/users.mako:26
+#: rhodecode/templates/bookmarks/bookmarks.mako:33
+#: rhodecode/templates/branches/branches.mako:33
 #: rhodecode/templates/journal/journal.mako:12
-#: rhodecode/templates/tags/tags.mako:12
+#: rhodecode/templates/tags/tags.mako:33
 msgid "quick filter..."
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:24
-#, python-format
-msgid "All Gists for user %s"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.mako:26
-msgid "All Public Gists"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.mako:44
-#: rhodecode/templates/admin/gists/show.mako:35
-msgid "Create New Gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.mako:56
-msgid "All gists"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.mako:58
-msgid "All public"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.mako:60
-msgid "My gists"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.mako:61
-msgid "My private"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.mako:62
-msgid "My public"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.mako:108
+#: rhodecode/templates/admin/gists/index.mako:103
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57
-#: rhodecode/templates/bookmarks/bookmarks.mako:63
-#: rhodecode/templates/branches/branches.mako:62
-#: rhodecode/templates/changelog/changelog.mako:124
-#: rhodecode/templates/changeset/changeset.mako:199
+#: 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:9
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:481
-#: rhodecode/templates/pullrequests/pullrequests.mako:112
+#: 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/summary/summary_commits.mako:11
-#: rhodecode/templates/tags/tags.mako:63
+#: rhodecode/templates/tags/tags.mako:61
 msgid "Author"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:116
+#: rhodecode/templates/admin/gists/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:7
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:9
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:7
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:7
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:6
@@ -5553,7 +5595,7 b' msgstr ""'
 msgid "Created on"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.mako:118
+#: rhodecode/templates/admin/gists/index.mako:113
 #: rhodecode/templates/admin/gists/show.mako:72
 msgid "Expires"
 msgstr ""
@@ -5613,8 +5655,8 b' msgid "created"'
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.mako:100
-#: rhodecode/templates/files/files_delete.mako:50
-#: rhodecode/templates/files/files_source.mako:104
+#: rhodecode/templates/files/files_delete.mako:58
+#: rhodecode/templates/files/files_source.mako:133
 msgid "Show as raw"
 msgstr ""
 
@@ -5626,14 +5668,15 b' msgstr ""'
 #: rhodecode/templates/admin/integrations/form.mako:8
 #: rhodecode/templates/admin/integrations/form.mako:21
 #: rhodecode/templates/admin/integrations/form.mako:32
+#: rhodecode/templates/admin/integrations/global.mako:14
 #: rhodecode/templates/admin/integrations/list.mako:21
 #: rhodecode/templates/admin/integrations/list.mako:25
 #: rhodecode/templates/admin/integrations/list.mako:29
 #: rhodecode/templates/admin/integrations/list.mako:36
 #: rhodecode/templates/admin/integrations/new.mako:15
-#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:37
-#: rhodecode/templates/admin/repos/repo_edit.mako:78
-#: rhodecode/templates/base/base.mako:84
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:33
+#: rhodecode/templates/admin/repos/repo_edit.mako:74
+#: rhodecode/templates/base/base.mako:109
 msgid "Integrations"
 msgstr ""
 
@@ -5642,12 +5685,12 b' msgstr ""'
 #: rhodecode/templates/admin/integrations/new.mako:7
 #: rhodecode/templates/admin/integrations/new.mako:9
 #: rhodecode/templates/admin/integrations/new.mako:13
-#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:34
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:30
 #: rhodecode/templates/admin/repos/repo_edit.mako:15
-#: rhodecode/templates/admin/repos/repo_edit.mako:46
+#: rhodecode/templates/admin/repos/repo_edit.mako:42
 #: rhodecode/templates/admin/settings/settings.mako:14
-#: rhodecode/templates/admin/user_groups/user_group_edit.mako:33
-#: rhodecode/templates/base/base.mako:86
+#: rhodecode/templates/admin/user_groups/user_group_edit.mako:34
+#: rhodecode/templates/base/base.mako:111
 msgid "Settings"
 msgstr ""
 
@@ -5656,12 +5699,16 b' msgstr ""'
 msgid "Create New %(integration_type)s Integration"
 msgstr ""
 
+#: rhodecode/templates/admin/integrations/global.mako:5
+msgid "Integrations administration"
+msgstr ""
+
 #: rhodecode/templates/admin/integrations/list.mako:44
 msgid "Current Integrations for Repository: {repo_name}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:46
-msgid "Current Integrations for repository group: {repo_group_name}"
+msgid "Repository Group Integrations: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:48
@@ -5678,7 +5725,7 b' msgid "Scope"'
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:75
-#: rhodecode/templates/compare/compare_diff.mako:92
+#: rhodecode/templates/compare/compare_diff.mako:84
 msgid "Actions"
 msgstr ""
 
@@ -5698,31 +5745,31 b' msgstr ""'
 msgid "Create one"
 msgstr ""
 
-#: rhodecode/templates/admin/integrations/list.mako:134
+#: rhodecode/templates/admin/integrations/list.mako:132
 msgid "repo"
 msgstr ""
 
+#: rhodecode/templates/admin/integrations/list.mako:136
+msgid "repogroup"
+msgstr ""
+
 #: rhodecode/templates/admin/integrations/list.mako:138
-msgid "repogroup"
+msgid "child repos only"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:140
-msgid "child repos only"
-msgstr ""
-
-#: rhodecode/templates/admin/integrations/list.mako:142
 msgid "cascade to all"
 msgstr ""
 
+#: rhodecode/templates/admin/integrations/list.mako:145
+msgid "top level repos only"
+msgstr ""
+
 #: rhodecode/templates/admin/integrations/list.mako:147
-msgid "top level repos only"
-msgstr ""
-
-#: rhodecode/templates/admin/integrations/list.mako:149
 msgid "global"
 msgstr ""
 
-#: rhodecode/templates/admin/integrations/list.mako:155
+#: rhodecode/templates/admin/integrations/list.mako:153
 msgid "unknown integration"
 msgstr ""
 
@@ -5743,7 +5790,7 b' msgid "No description available"'
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:5
-#: rhodecode/templates/base/base.mako:397
+#: rhodecode/templates/base/base.mako:462
 msgid "My account"
 msgstr ""
 
@@ -5765,7 +5812,7 b' msgstr ""'
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3
 #: rhodecode/templates/admin/permissions/permissions.mako:51
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4
-#: rhodecode/templates/admin/users/user_edit.mako:40
+#: rhodecode/templates/admin/users/user_edit.mako:41
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3
 msgid "SSH Keys"
 msgstr ""
@@ -5780,7 +5827,7 b' msgid "External Identities"'
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:41
-#: rhodecode/templates/admin/users/user_edit.mako:44
+#: rhodecode/templates/admin/users/user_edit.mako:45
 msgid "Emails"
 msgstr ""
 
@@ -5789,18 +5836,18 b' msgid "Watched"'
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:44
-#: rhodecode/templates/admin/notifications/notifications_show_all.mako:43
-#: rhodecode/templates/base/base.mako:243
-#: rhodecode/templates/base/base.mako:401
+#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42
+#: rhodecode/templates/base/base.mako:303
+#: rhodecode/templates/base/base.mako:466
 msgid "Pull Requests"
 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:35
-#: rhodecode/templates/admin/repos/repo_edit.mako:49
-#: rhodecode/templates/admin/user_groups/user_group_edit.mako:34
-#: rhodecode/templates/base/base.mako:82
+#: 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"
 msgstr ""
 
@@ -5887,51 +5934,55 b' msgstr ""'
 msgid "Clear"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:30
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:29
+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
 msgid "Redirect URL"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:40
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:43
 msgid "Repository template"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:46
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:49
 msgid "Repository group template"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:52
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:55
 msgid "Template Repository or Repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:62
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:65
 msgid "Available as ${repo_url}  e.g. Redirect url: ${repo_url}/changelog"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:64
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:67
 msgid "Available as ${repo_group_url} e.g. Redirect url: ${repo_group_url}"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:66
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:69
 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:76
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:79
 msgid "Your Bookmarks"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:81
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:84
 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:83
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:86
 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:137
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:140
 msgid "repository"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:188
+#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:191
 msgid "repository group"
 msgstr ""
 
@@ -5993,15 +6044,8 b' msgstr ""'
 msgid "Photo"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:18
-#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:62
-#: rhodecode/templates/admin/users/user_edit_profile.mako:33
-#: rhodecode/templates/users/user_profile.mako:21
-msgid "Avatars are disabled"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:51
-#: rhodecode/templates/users/user_profile.mako:54
+#: rhodecode/templates/admin/my_account/my_account_profile.mako:59
+#: rhodecode/templates/users/user_profile.mako:62
 msgid "Missing email, please update your user email address."
 msgstr ""
 
@@ -6026,13 +6070,13 b' msgstr ""'
 #: 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:46
-#: rhodecode/templates/pullrequests/pullrequests.mako:114
+#: rhodecode/templates/pullrequests/pullrequest.mako:40
+#: rhodecode/templates/pullrequests/pullrequests.mako:85
 msgid "Title"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63
-#: rhodecode/templates/pullrequests/pullrequests.mako:118
+#: rhodecode/templates/pullrequests/pullrequests.mako:89
 msgid "Last Update"
 msgstr ""
 
@@ -6088,14 +6132,14 b' 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/user_groups/user_group_add.mako:52
+#: 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:81
+#: 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:90
-#: rhodecode/templates/admin/users/users.mako:82
-#: rhodecode/templates/user_group/profile.mako:33
+#: rhodecode/templates/admin/users/user_edit_profile.mako:89
+#: rhodecode/templates/admin/users/users.mako:85
+#: rhodecode/templates/user_group/profile.mako:34
 msgid "Active"
 msgstr ""
 
@@ -6122,7 +6166,7 b' 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:12
+#: rhodecode/templates/admin/notifications/notifications_show_all.mako:20
 msgid "My Notifications"
 msgstr ""
 
@@ -6130,21 +6174,21 b' msgstr ""'
 msgid "Subject"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications_show_all.mako:26
-#: rhodecode/templates/admin/notifications/notifications_show_all.mako:30
+#: rhodecode/templates/admin/notifications/notifications_show_all.mako:25
+#: rhodecode/templates/admin/notifications/notifications_show_all.mako:29
 msgid "Mark all as read"
 msgstr ""
 
+#: rhodecode/templates/admin/notifications/notifications_show_all.mako:39
+msgid "Unread"
+msgstr ""
+
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:40
-msgid "Unread"
+msgid "All"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:41
-msgid "All"
-msgstr ""
-
-#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42
-#: rhodecode/templates/changeset/changeset.mako:159
+#: rhodecode/templates/changeset/changeset.mako:158
 msgid "Comments"
 msgstr ""
 
@@ -6223,6 +6267,7 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:62
 #: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6
 #: rhodecode/templates/admin/settings/settings_automation.mako:6
+#: rhodecode/templates/artifacts/artifact_list.mako:24
 msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license."
 msgstr ""
 
@@ -6312,38 +6357,39 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:79 rhodecode/templates/base/base.mako:153
+#: rhodecode/templates/base/base.mako:104
+#: rhodecode/templates/base/base.mako:125
 msgid "Repository groups"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:36
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:35
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:15
-#: rhodecode/templates/admin/user_groups/user_group_add.mako:35
+#: rhodecode/templates/admin/user_groups/user_group_add.mako:34
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:15
 msgid "Group name"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45
+#: 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_edit_settings.mako:33
-#: rhodecode/templates/base/base.mako:434
+#: rhodecode/templates/base/base.mako:499
 #: rhodecode/templates/data_table/_dt_elements.mako:208
-#: rhodecode/templates/forks/fork.mako:45
+#: rhodecode/templates/forks/fork.mako:41
 msgid "Repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:59
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:58
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62
 msgid "Plain text format with support of {metatags}"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:68
 #: rhodecode/templates/admin/repos/repo_add_base.mako:89
 msgid "Copy Parent Group Permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:73
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72
 #: rhodecode/templates/admin/repos/repo_add_base.mako:93
 msgid "Copy permissions from parent repository group."
 msgstr ""
@@ -6353,53 +6399,66 b' msgstr ""'
 msgid "%s repository group settings"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:36
-#: rhodecode/templates/admin/repos/repo_edit.mako:55
-#: rhodecode/templates/admin/user_groups/user_group_edit.mako:35
-#: rhodecode/templates/admin/users/user_edit.mako:41
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:32
+#: rhodecode/templates/admin/repos/repo_edit.mako:51
+#: rhodecode/templates/admin/user_groups/user_group_edit.mako:36
+#: rhodecode/templates/admin/users/user_edit.mako:42
 msgid "Advanced"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:7
 msgid "Repository Group ID"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:8
-msgid "Is Personal Group"
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:10
-msgid "Total repositories"
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:8
+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"
+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"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:17
 msgid "Top level repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:13
-msgid "Children groups"
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:19
-#, python-format
-msgid "Repository Group: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:29
+msgid "Children groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:25
+msgid "Repository Group Advanced: {}"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:35
 msgid "Delete repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:58
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:64
 #, python-format
 msgid "Confirm to delete this group: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:59
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:65
 msgid "Delete this repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5
-msgid "Repository Group Permissions"
+msgid "Repository Group Permissions: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15
@@ -6476,8 +6535,7 b' msgid "Set or revoke permissions to sele'
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:6
-#, python-format
-msgid "Settings for Repository Group: %s"
+msgid "Repository Group Settings: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31
@@ -6500,11 +6558,11 b' msgstr ""'
 msgid "Repository groups administration"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_groups.mako:13
+#: rhodecode/templates/admin/repo_groups/repo_groups.mako:26
 msgid "repository groups"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_groups.mako:61
+#: rhodecode/templates/admin/repo_groups/repo_groups.mako:82
 msgid "Number of top level repositories"
 msgstr ""
 
@@ -6521,7 +6579,7 b' msgid "Import Existing Repository ?"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:23
-#: rhodecode/templates/base/base.mako:198
+#: rhodecode/templates/base/base.mako:248
 msgid "Clone from"
 msgstr ""
 
@@ -6530,31 +6588,31 b' msgid "Set the type of repository to cre'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:58
-#: rhodecode/templates/forks/fork.mako:51
+#: 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/forks/fork.mako:54
+#: 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:71
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:177
-#: rhodecode/templates/forks/fork.mako:65
+#: 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:75
+#: 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:79
+#: rhodecode/templates/forks/fork.mako:75
 msgid "The default commit for file pages, downloads, full text search index, and README generation."
 msgstr ""
 
@@ -6576,51 +6634,50 b' msgstr ""'
 msgid "%s repository settings"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:52
+#: rhodecode/templates/admin/repos/repo_edit.mako:48
 msgid "Branch Permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:58
+#: rhodecode/templates/admin/repos/repo_edit.mako:54
 msgid "VCS"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:61
+#: rhodecode/templates/admin/repos/repo_edit.mako:57
 msgid "Extra Fields"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:64
+#: rhodecode/templates/admin/repos/repo_edit.mako:60
 msgid "Issue Tracker"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.mako:63
+#: rhodecode/templates/admin/users/user_edit.mako:49
+#: rhodecode/templates/admin/users/user_edit_caches.mako:5
+msgid "Caches"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.mako:67
-#: rhodecode/templates/admin/users/user_edit.mako:48
-#: rhodecode/templates/admin/users/user_edit_caches.mako:5
-msgid "Caches"
+msgid "Remote sync"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:71
-msgid "Remote sync"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.mako:75
-#: rhodecode/templates/summary/components.mako:196
 msgid "Statistics"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.mako:78
+msgid "Reviewer Rules"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.mako:82
-msgid "Reviewer Rules"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.mako:86
 msgid "Automation"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:89
+#: rhodecode/templates/admin/repos/repo_edit.mako:85
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3
 msgid "Maintenance"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:92
+#: rhodecode/templates/admin/repos/repo_edit.mako:88
 msgid "Strip"
 msgstr ""
 
@@ -6628,180 +6685,180 b' msgstr ""'
 msgid "Repository ID"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:8
-msgid "Updated on"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9
 msgid "Cached Commit id"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:10
-msgid "Attached scoped tokens"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:11
-msgid "Pull requests source"
+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"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:18
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14
+msgid "Attached Artifacts"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:20
 #, python-format
 msgid "Repository: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:28
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30
 msgid "Fork Reference"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:34
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36
 #, python-format
 msgid "This repository is a fork of %(repo_link)s"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:40
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:42
 msgid "Set"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:43
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:45
 msgid "Manually set this repository as a fork of another from the list"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:52
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:54
 msgid "Public Journal Visibility"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:59
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:61
 msgid "Remove from Public Journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:63
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65
 msgid "Add to Public Journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:68
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:70
 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:77
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:79
 msgid "Locking state"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:86
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:88
 msgid "This Repository is not currently locked."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:93
-msgid "Confirm to unlock repository."
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:95
+msgid "Confirm to unlock repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97
 msgid "Unlock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:100
-msgid "Confirm to lock repository."
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:102
+msgid "Confirm to lock repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104
 msgid "Lock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:108
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:110
 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:118
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:120
 msgid "Hooks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:122
-msgid "Hook type"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:123
-msgid "Hook version"
-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"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:126
 msgid "Current version"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:127
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129
 msgid "PRE HOOK"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:132
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:134
 msgid "POST HOOK"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140
 msgid "Unable to read hook information from VCS Server"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:144
+#: 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:145
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:147
 msgid "Update Hooks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:152
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:154
 msgid "Archive repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:161
-#, python-format
-msgid "Confirm to archive this repository: %s"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:163
+#, python-format
+msgid "Confirm to archive this repository: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:165
 msgid "Archive this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:168
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:170
 msgid "Archiving the repository will make it entirely read-only. The repository cannot be committed to.It is hidden from the search results and dashboard. "
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:182
 msgid "Delete repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:191
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:193
 msgid "Detach forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:196
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:198
 msgid "Delete forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:206
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:208
 msgid "Consider to archive this repository instead."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:217
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:219
 #: rhodecode/templates/data_table/_dt_elements.mako:173
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:219
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:221
 msgid "Delete this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:224
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:226
 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:258
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:260
 msgid "Change repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:258
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:260
 msgid "Pick repository"
 msgstr ""
 
@@ -7133,7 +7190,7 b' msgid "Private repository"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:197
-#: rhodecode/templates/summary/components.mako:209
+#: rhodecode/templates/summary/components.mako:238
 msgid "Enable statistics"
 msgstr ""
 
@@ -7142,7 +7199,7 b' msgid "Enable statistics window on summa'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:207
-#: rhodecode/templates/summary/components.mako:177
+#: rhodecode/templates/summary/components.mako:184
 msgid "Enable downloads"
 msgstr ""
 
@@ -7250,18 +7307,14 b' msgstr ""'
 msgid "Repositories administration"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repos.mako:13
+#: rhodecode/templates/admin/repos/repos.mako:26
 msgid "repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repos.mako:67
+#: rhodecode/templates/admin/repos/repos.mako:71
 msgid "State"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.mako:5
-msgid "Settings administration"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings_automation.mako:3
 msgid "Admin Automation"
 msgstr ""
@@ -7351,22 +7404,26 b' msgid "There is {} stored exception."'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:9
-msgid "There are {} stored exceptions."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:11
+msgid "There are total {} stored exceptions."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:12
 msgid "Store directory"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:18
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:19
 msgid "Confirm to delete all exceptions"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:20
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:22
+msgid "Delete All `{}`"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:24
 msgid "Delete All"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:32
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:38
 msgid "Exceptions Tracker - Showing the last {} Exceptions"
 msgstr ""
 
@@ -7810,16 +7867,12 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:81 rhodecode/templates/base/base.mako:156
+#: rhodecode/templates/base/base.mako:106
+#: rhodecode/templates/base/base.mako:128
 msgid "User groups"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_add.mako:15
-#: rhodecode/templates/admin/user_groups/user_groups.mako:28
-msgid "Add User Group"
-msgstr ""
-
-#: rhodecode/templates/admin/user_groups/user_group_add.mako:47
+#: rhodecode/templates/admin/user_groups/user_group_add.mako:46
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:46
 msgid "Short, optional description for this user group."
 msgstr ""
@@ -7829,13 +7882,13 b' msgstr ""'
 msgid "%s user group settings"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit.mako:36
-#: rhodecode/templates/admin/users/user_edit.mako:42
-msgid "Global permissions"
-msgstr ""
-
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37
 #: rhodecode/templates/admin/users/user_edit.mako:43
+msgid "Global permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.mako:38
+#: rhodecode/templates/admin/users/user_edit.mako:44
 msgid "Permissions summary"
 msgstr ""
 
@@ -7844,9 +7897,9 b' msgid "User Group ID"'
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9
-#: rhodecode/templates/admin/user_groups/user_groups.mako:77
+#: rhodecode/templates/admin/user_groups/user_groups.mako:80
 #: rhodecode/templates/debug_style/form-elements.html:509
-#: rhodecode/templates/user_group/profile.mako:42
+#: rhodecode/templates/user_group/profile.mako:45
 msgid "Members"
 msgstr ""
 
@@ -7927,7 +7980,7 b' msgid "Add members"'
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:96
-#: rhodecode/templates/user_group/profile.mako:63
+#: rhodecode/templates/user_group/profile.mako:68
 msgid "No members yet"
 msgstr ""
 
@@ -7936,7 +7989,7 b' msgstr ""'
 msgid "User groups administration"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_groups.mako:79
+#: rhodecode/templates/admin/user_groups/user_groups.mako:82
 msgid "Sync"
 msgstr ""
 
@@ -7946,12 +7999,12 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_add.mako:13
 #: rhodecode/templates/admin/users/user_edit.mako:14
-#: rhodecode/templates/base/base.mako:80
+#: rhodecode/templates/base/base.mako:105
 msgid "Users"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:15
-#: rhodecode/templates/admin/users/users.mako:28
+#: rhodecode/templates/admin/users/users.mako:31
 msgid "Add User"
 msgstr ""
 
@@ -7994,25 +8047,25 b' msgstr ""'
 msgid "%s user settings"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.mako:19
+#: rhodecode/templates/admin/users/user_edit.mako:31
 msgid "This user is set as disabled"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.mako:38
+#: rhodecode/templates/admin/users/user_edit.mako:39
 #: rhodecode/templates/admin/users/user_edit_profile.mako:5
 #: rhodecode/templates/users/user_profile.mako:5
 msgid "User Profile"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.mako:39
+#: rhodecode/templates/admin/users/user_edit.mako:40
 msgid "Auth tokens"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.mako:45
-msgid "Ip Whitelist"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit.mako:46
+msgid "Ip Whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.mako:47
 msgid "User Groups Management"
 msgstr ""
 
@@ -8029,8 +8082,8 b' msgid "Last login"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:10
-#: rhodecode/templates/admin/users/users.mako:80
-#: rhodecode/templates/forks/forks.mako:69
+#: rhodecode/templates/admin/users/users.mako:83
+#: rhodecode/templates/forks/forks.mako:67
 msgid "Last activity"
 msgstr ""
 
@@ -8180,9 +8233,9 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_edit_ips.mako:64
 msgid ""
-"Enter comma separated list of ip addresses like 127.0.0.1,\n"
-"or use a ip address with a mask 127.0.0.1/24, to create a network range.\n"
-"To specify multiple address range use 127.0.0.1-127.0.0.10 syntax"
+"Enter comma separated list of ip addresses like 10.0.0.1,10.0.0.2.\n"
+"Use a ip address with a mask 127.0.0.1/24, to create a network match pattern.\n"
+"To specify multiple entries on an address range use 127.0.0.1-127.0.0.10 syntax"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:17
@@ -8194,35 +8247,35 b' msgstr ""'
 msgid "Change the avatar at"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:74
+#: rhodecode/templates/admin/users/user_edit_profile.mako:73
 msgid "New Password"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:82
+#: rhodecode/templates/admin/users/user_edit_profile.mako:81
 msgid "New Password Confirmation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:98
+#: rhodecode/templates/admin/users/user_edit_profile.mako:97
 msgid "Super Admin"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:106
+#: rhodecode/templates/admin/users/user_edit_profile.mako:105
 msgid "Authentication type"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:111
+#: 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:116
+#: rhodecode/templates/admin/users/user_edit_profile.mako:115
 msgid "Name in Source of Record"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:125
+#: rhodecode/templates/admin/users/user_edit_profile.mako:124
 msgid "Language"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_profile.mako:131
+#: rhodecode/templates/admin/users/user_edit_profile.mako:130
 #, python-format
 msgid "User interface language. Help translate %(rc_link)s into your language."
 msgstr ""
@@ -8268,203 +8321,212 b' msgstr ""'
 msgid "Users administration"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.mako:84
+#: rhodecode/templates/admin/users/users.mako:87
 #: rhodecode/templates/base/perms_summary.mako:145
 msgid "Super admin"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.mako:86
+#: rhodecode/templates/admin/users/users.mako:89
 msgid "Auth type"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:55
+#: rhodecode/templates/artifacts/artifact_list.mako:5
+msgid "{} Artifacts"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:57
 msgid "RhodeCode instance id: {}"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:83
+#: rhodecode/templates/base/base.mako:90
+msgid "Super Admin Panel"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:92
+msgid "Delegated Admin Panel"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:108
 msgid "Authentication"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:85
+#: rhodecode/templates/base/base.mako:110
 msgid "Defaults"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:103
-#: rhodecode/templates/files/files_pjax.mako:24
-#: rhodecode/templates/summary/components.mako:42
+#: rhodecode/templates/base/base.mako:150
+#: rhodecode/templates/files/files_source_header.mako:53
+#: rhodecode/templates/files/files_tree_header.mako:40
+#: rhodecode/templates/summary/components.mako:250
 msgid "Show More"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:190
+#: rhodecode/templates/base/base.mako:220
+#: rhodecode/templates/base/base.mako:231
+msgid "RSS Feed"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:222
+msgid "Watch this Repository and actions on it in your personalized journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:240
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:207
+#: rhodecode/templates/base/base.mako:257
 #, python-format
 msgid "Repository locked by %(user)s"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:212
+#: rhodecode/templates/base/base.mako:262
 msgid "Repository not locked. Pull repository to lock it."
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:230
+#: rhodecode/templates/base/base.mako:277
+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:36
+#: rhodecode/templates/pullrequests/pullrequest.mako:30
 msgid "Summary"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:231
+#: rhodecode/templates/base/base.mako:291
 #: rhodecode/templates/data_table/_dt_elements.mako:51
 #: rhodecode/templates/data_table/_dt_elements.mako:52
-msgid "Changelog"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:232
+#: rhodecode/templates/files/file_authors_box.mako:28
+#: rhodecode/templates/search/search.mako:85
+#: 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/files/files.mako:15
-#: rhodecode/templates/search/search.mako:90
+#: rhodecode/templates/search/search.mako:85
 msgid "Files"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:233
-#: rhodecode/templates/bookmarks/bookmarks.mako:68
-#: rhodecode/templates/branches/branches.mako:67
-#: rhodecode/templates/tags/tags.mako:68
-msgid "Compare"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:234
-#: rhodecode/templates/base/base.mako:339
-#: rhodecode/templates/base/base.mako:530
-#: rhodecode/templates/search/search.mako:93
-msgid "Search"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:239
-#, python-format
-msgid "Show Pull Requests for %s"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:250
-#: rhodecode/templates/base/base.mako:343
-msgid "Options"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:254
-msgid "Repository Settings"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:258
-#: rhodecode/templates/changelog/changelog.mako:40
-#, python-format
-msgid "Compare fork with %s"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:274
-msgid "Unlock"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:276
-msgid "Lock"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:281
-#: rhodecode/templates/data_table/_dt_elements.mako:61
-#: rhodecode/templates/data_table/_dt_elements.mako:62
-msgid "Fork"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:282
-msgid "Create Pull Request"
-msgstr ""
-
 #: rhodecode/templates/base/base.mako:293
-msgid "This repository has been archived. It is now read-only."
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:338
+#: 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
+#, 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
+msgid "Artifacts"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:313
+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
+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
+msgid "Unlock Repository"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:333
+msgid "Lock Repository"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:393
 msgid "Group Home"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:347
+#: rhodecode/templates/base/base.mako:395
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:347
+#: rhodecode/templates/base/base.mako:395
 msgid "Group Settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:353
-msgid "Add Parent Group"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:374
+#: rhodecode/templates/base/base.mako:439
 msgid "Sign in"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:399
+#: rhodecode/templates/base/base.mako:464
 msgid "My personal group"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:406
+#: rhodecode/templates/base/base.mako:471
 msgid "Manage"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:411
+#: rhodecode/templates/base/base.mako:476
 msgid "No Bookmarks yet."
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:449
+#: rhodecode/templates/base/base.mako:514
 msgid "Sign Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:487
+#: rhodecode/templates/base/base.mako:575
 msgid "search / go to..."
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:512
+#: rhodecode/templates/base/base.mako:618
 msgid "Show activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:513
+#: 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:518
+#: rhodecode/templates/base/base.mako:624
 msgid "Show Public activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:519
+#: rhodecode/templates/base/base.mako:625
 msgid "Public journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:524
+#: rhodecode/templates/base/base.mako:631
 msgid "Show Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:525
+#: rhodecode/templates/base/base.mako:632
 msgid "Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:529
-msgid "Search in repositories you have access to"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:535
+#: rhodecode/templates/base/base.mako:638
 msgid "Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:542
-msgid "Delegated Admin settings"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:555
+#: 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
@@ -8486,15 +8548,15 b' msgstr ""'
 msgid "Style"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:556
+#: rhodecode/templates/base/base.mako:650
 msgid "[Style]"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:748
+#: rhodecode/templates/base/base.mako:907
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:756
+#: rhodecode/templates/base/base.mako:915
 msgid "Site-wide shortcuts"
 msgstr ""
 
@@ -8592,11 +8654,9 b' 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:390
-#: rhodecode/templates/files/files_add.mako:84
-#: rhodecode/templates/files/files_add.mako:230
-#: rhodecode/templates/files/files_edit.mako:85
-#: rhodecode/templates/files/files_edit.mako:189
+#: rhodecode/templates/data_table/_dt_elements.mako:414
+#: rhodecode/templates/files/files_add.mako:61
+#: rhodecode/templates/files/files_edit.mako:62
 msgid "Preview"
 msgstr ""
 
@@ -8619,9 +8679,9 b' msgid "none"'
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:37
-#: rhodecode/templates/changelog/changelog_elements.mako:104
-#: rhodecode/templates/changeset/changeset.mako:109
-#: rhodecode/templates/files/base.mako:4
+#: rhodecode/templates/changeset/changeset.mako:107
+#: rhodecode/templates/commits/changelog_elements.mako:102
+#: rhodecode/templates/files/base.mako:11
 msgid "merge"
 msgstr ""
 
@@ -8709,7 +8769,7 b' msgstr ""'
 msgid "No matching permission defined"
 msgstr ""
 
-#: rhodecode/templates/base/root.mako:148
+#: rhodecode/templates/base/root.mako:149
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
@@ -8806,15 +8866,15 b' msgid "Requires hgsubversion library to '
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:136
-msgid "Enable evolve extension"
+msgid "Enable Evolve and Topic extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:140
-msgid "Enable evolve extension for all repositories."
+msgid "Enable Evolve and Topic extensions for all repositories."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:142
-msgid "Enable evolve extension for this repository."
+msgid "Enable Evolve and Topic extensions for this repository."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:153
@@ -8926,19 +8986,19 b' msgstr ""'
 msgid "%s Bookmarks"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.mako:13
+#: rhodecode/templates/bookmarks/bookmarks.mako:28
+msgid "Compare Selected Bookmarks"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.mako:34
 msgid "bookmarks"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.mako:31
-msgid "Compare Selected Bookmarks"
-msgstr ""
-
 #: rhodecode/templates/bookmarks/bookmarks_data.mako:13
-#: rhodecode/templates/changelog/changelog_elements.mako:118
-#: rhodecode/templates/changeset/changeset.mako:115
-#: rhodecode/templates/files/base.mako:10
-#: rhodecode/templates/summary/summary_commits.mako:71
+#: 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 ""
@@ -8948,229 +9008,124 b' msgstr ""'
 msgid "%s Branches"
 msgstr ""
 
-#: rhodecode/templates/branches/branches.mako:13
+#: rhodecode/templates/branches/branches.mako:28
+msgid "Compare Selected Branches"
+msgstr ""
+
+#: rhodecode/templates/branches/branches.mako:34
 msgid "branches"
 msgstr ""
 
-#: rhodecode/templates/branches/branches.mako:31
-msgid "Compare Selected Branches"
-msgstr ""
-
 #: rhodecode/templates/branches/branches_data.mako:12
-#: rhodecode/templates/changelog/changelog_elements.mako:110
-#: rhodecode/templates/changeset/changeset.mako:128
-#: rhodecode/templates/files/base.mako:23
-#: rhodecode/templates/summary/summary_commits.mako:85
+#: 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/changelog/changelog.mako:6
-#, python-format
-msgid "%s Changelog"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.mako:50
-#, python-format
-msgid "Compare fork with Parent (%s)"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.mako:65
-#: rhodecode/templates/changelog/changelog.mako:66
-msgid "Clear selection"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.mako:81
-msgid "Clear filter"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.mako:89
-msgid "Hide obsolete/hidden"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.mako:91
-msgid "Show obsolete/hidden"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.mako:94
-msgid "Show hidden"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.mako:121
-#: rhodecode/templates/files/files_add.mako:99
-#: rhodecode/templates/files/files_delete.mako:60
-#: rhodecode/templates/files/files_edit.mako:99
-msgid "Commit Message"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.mako:123
-#: rhodecode/templates/summary/summary_commits.mako:10
-msgid "Age"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.mako:126
-#: rhodecode/templates/summary/summary_commits.mako:12
-msgid "Refs"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.mako:250
-msgid "Filter changelog"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.mako:311
-msgid "There are no changes yet"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:8
-msgid "load previous"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:31
-#: rhodecode/templates/summary/summary_commits.mako:27
-#, python-format
-msgid ""
-"Commit status: %s\n"
-"Click to open associated pull request #%s"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:35
-#: rhodecode/templates/summary/summary_commits.mako:31
-msgid "Commit status: {}"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:41
-#: rhodecode/templates/summary/summary_commits.mako:37
-msgid "Commit status: Not Reviewed"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:46
-#: rhodecode/templates/summary/summary_commits.mako:42
-msgid "Commit has comments"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:57
-#: rhodecode/templates/changeset/changeset.mako:42
-#: rhodecode/templates/summary/summary_commits.mako:50
-msgid "Copy the full commit id"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:64
-#: rhodecode/templates/changeset/changeset.mako:44
-msgid "Commit phase"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:71
-#: rhodecode/templates/changelog/changelog_elements.mako:78
-#: rhodecode/templates/changeset/changeset.mako:50
-#: rhodecode/templates/changeset/changeset.mako:57
-msgid "Evolve State"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:71
-#: rhodecode/templates/changeset/changeset.mako:50
-msgid "obsolete"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:78
-#: rhodecode/templates/changeset/changeset.mako:57
-msgid "hidden"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:82
-#: rhodecode/templates/compare/compare_commits.mako:48
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:519
-#: rhodecode/templates/search/search_commit.mako:34
-msgid "Expand commit message"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:126
-#: rhodecode/templates/changeset/changeset.mako:122
-#: rhodecode/templates/files/base.mako:17
-#: rhodecode/templates/summary/summary_commits.mako:78
-#: rhodecode/templates/tags/tags_data.mako:12
-#, python-format
-msgid "Tag %s"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_elements.mako:140
-msgid "load next"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_file_history.mako:33
-msgid "Show File"
-msgstr ""
-
 #: rhodecode/templates/changeset/changeset.mako:7
 #, python-format
 msgid "%s Commit"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:65
+#: rhodecode/templates/changeset/changeset.mako:38
+#: rhodecode/templates/commits/changelog_elements.mako:56
+#: rhodecode/templates/summary/summary_commits.mako:43
+msgid "Copy the full commit id"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.mako:40
+msgid "Commit phase"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.mako:46
+#: rhodecode/templates/changeset/changeset.mako:53
+msgid "Evolve State"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.mako:46
+msgid "obsolete"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.mako:53
+msgid "hidden"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.mako:60
 msgid "Parent Commit"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:65
+#: rhodecode/templates/changeset/changeset.mako:60
 msgid "parent"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:69
+#: rhodecode/templates/changeset/changeset.mako:64
 msgid "Child Commit"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:69
+#: rhodecode/templates/changeset/changeset.mako:64
 msgid "child"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:81
+#: rhodecode/templates/changeset/changeset.mako:80
 msgid "Expand"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:89
-#: rhodecode/templates/changeset/changeset.mako:95
+#: rhodecode/templates/changeset/changeset.mako:94
 #: rhodecode/templates/changeset/changeset_file_comment.mako:83
-#: rhodecode/templates/compare/compare_diff.mako:135
+#: rhodecode/templates/compare/compare_diff.mako:139
 msgid "Commit status"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:102
-#: rhodecode/templates/files/file_tree_detail.mako:21
-#: rhodecode/templates/files/files_detail.mako:20
 msgid "References"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:138
+#: 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 "Diff options"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:142
+#: rhodecode/templates/changeset/changeset.mako:140
 msgid "Raw diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:143
+#: rhodecode/templates/changeset/changeset.mako:141
 msgid "Raw Diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:146
+#: rhodecode/templates/changeset/changeset.mako:144
 msgid "Patch diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:147
+#: rhodecode/templates/changeset/changeset.mako:145
 msgid "Patch Diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:150
+#: rhodecode/templates/changeset/changeset.mako:148
 msgid "Download diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:151
+#: rhodecode/templates/changeset/changeset.mako:149
 msgid "Download Diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:179
+#: rhodecode/templates/changeset/changeset.mako:178
 msgid "Unresolved TODOs"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:188
+#: rhodecode/templates/changeset/changeset.mako:186
 msgid "There are no unresolved TODOs"
 msgstr ""
 
@@ -9269,16 +9224,16 b' msgstr ""'
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:370
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:16
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:160
-#: rhodecode/templates/pullrequests/pullrequests.mako:52
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:156
+#: rhodecode/templates/pullrequests/pullrequests.mako:31
 msgid "Closed"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:400
-#: rhodecode/templates/compare/compare_diff.mako:104
-#: rhodecode/templates/compare/compare_diff.mako:112
-#: rhodecode/templates/compare/compare_diff.mako:120
-#: rhodecode/templates/compare/compare_diff.mako:122
+#: rhodecode/templates/compare/compare_diff.mako:108
+#: rhodecode/templates/compare/compare_diff.mako:116
+#: rhodecode/templates/compare/compare_diff.mako:124
+#: rhodecode/templates/compare/compare_diff.mako:126
 msgid "Comment"
 msgstr ""
 
@@ -9287,22 +9242,20 b' msgstr ""'
 msgid "%s Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_range.mako:16
-#: rhodecode/templates/files/file_authors_box.mako:33
-#: rhodecode/templates/search/search.mako:90
-msgid "Commits"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_range.mako:44
+#: rhodecode/templates/changeset/changeset_range.mako:32
 msgid "Commit Range"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_range.mako:54
-msgid "Diff option"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_range.mako:65
-msgid "Show combined compare"
+#: rhodecode/templates/changeset/changeset_range.mako:41
+msgid "Range"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_range.mako:59
+msgid "Diff Option"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_range.mako:71
+msgid "Show combined diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:7
@@ -9391,8 +9344,6 b' msgid "File was deleted in this version.'
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:387
-#: rhodecode/templates/files/files_source.mako:12
-#: rhodecode/templates/search/search_content.mako:79
 msgid "Copy the full path"
 msgstr ""
 
@@ -9479,7 +9430,7 b' msgstr ""'
 msgid "Disabled on range diff"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:1011
+#: rhodecode/templates/codeblocks/diffs.mako:1017
 msgid "Diff Options"
 msgstr ""
 
@@ -9487,6 +9438,130 b' msgstr ""'
 msgid "view annotation from before this change"
 msgstr ""
 
+#: rhodecode/templates/commits/changelog.mako:6
+#, python-format
+msgid "%s Changelog"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:38
+msgid "Clear filter"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:45
+msgid "Hide obsolete/hidden"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:47
+msgid "Show obsolete/hidden"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:50
+msgid "Show hidden"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:59
+#: rhodecode/templates/compare/compare_diff.mako:93
+#, python-format
+msgid "Compare fork with %s"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:69
+#, python-format
+msgid "Compare fork with Parent (%s)"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:107
+msgid "Clear selection"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:110
+msgid "Select second commit"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:116
+msgid "Commit Message"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:118
+#: rhodecode/templates/summary/summary_commits.mako:10
+msgid "Age"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:121
+#: rhodecode/templates/summary/summary_commits.mako:12
+msgid "Refs"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:262
+msgid "Branch filter"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog.mako:323
+msgid "There are no changes yet"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_elements.mako:8
+msgid "load previous"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_elements.mako:35
+#: rhodecode/templates/summary/summary_commits.mako:27
+#, python-format
+msgid ""
+"Commit status: %s\n"
+"Click to open associated pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_elements.mako:39
+#: rhodecode/templates/summary/summary_commits.mako:31
+msgid "Commit status: {}"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_elements.mako:45
+#: rhodecode/templates/summary/summary_commits.mako:37
+msgid "Commit status: Not Reviewed"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_elements.mako:63
+msgid "{} commit phase"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_elements.mako:69
+msgid "Obsolete Evolve State"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_elements.mako:74
+msgid "Hidden Evolve State"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_elements.mako:80
+#: rhodecode/templates/compare/compare_commits.mako:48
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:515
+#: rhodecode/templates/search/search_commit.mako:34
+msgid "Expand commit message"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_elements.mako:135
+#: rhodecode/templates/summary/summary_commits.mako:87
+msgid "Commit has comments"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_elements.mako:150
+msgid "load next"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_file_history.mako:33
+msgid "Show File"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_file_history.mako:38
+msgid "Diff File"
+msgstr ""
+
+#: rhodecode/templates/commits/changelog_file_history.mako:46
+msgid "Show Full History"
+msgstr ""
+
 #: rhodecode/templates/compare/compare_commits.mako:5
 msgid "Common Ancestor Commit"
 msgstr ""
@@ -9496,7 +9571,7 b' msgid "Compare was calculated based on t'
 msgstr ""
 
 #: rhodecode/templates/compare/compare_commits.mako:17
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:480
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:476
 msgid "Time"
 msgstr ""
 
@@ -9510,50 +9585,59 b' msgstr ""'
 msgid "%s Compare"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.mako:44
-#: rhodecode/templates/compare/compare_diff.mako:101
-#: rhodecode/templates/compare/compare_diff.mako:110
-#: rhodecode/templates/compare/compare_diff.mako:115
+#: rhodecode/templates/compare/compare_diff.mako:38
+#: rhodecode/templates/compare/compare_diff.mako:90
+#: rhodecode/templates/compare/compare_diff.mako:114
+#: rhodecode/templates/compare/compare_diff.mako:119
 msgid "Compare Commits"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.mako:46
+#: rhodecode/templates/compare/compare_diff.mako:40
 msgid "for file"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.mako:60
+#: rhodecode/templates/compare/compare_diff.mako:56
 #: rhodecode/templates/email_templates/pull_request_review.mako:74
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:108
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:104
 msgid "Target"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.mako:76
+#: 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:33
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:72
+#: rhodecode/templates/files/files_source.mako:86
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:68
 msgid "Source"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.mako:103
-#: rhodecode/templates/compare/compare_diff.mako:104
+#: rhodecode/templates/compare/compare_diff.mako:102
+msgid "Compare with origin"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.mako:107
+#: rhodecode/templates/compare/compare_diff.mako:108
+#: rhodecode/templates/compare/compare_diff.mako:114
+#: rhodecode/templates/compare/compare_diff.mako:115
+#: rhodecode/templates/compare/compare_diff.mako:116
+#: rhodecode/templates/compare/compare_diff.mako:126
+msgid "Action unavailable in current view"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.mako:107
+#: rhodecode/templates/compare/compare_diff.mako:115
+#: rhodecode/templates/compare/compare_diff.mako:120
+msgid "Swap"
+msgstr ""
+
 #: rhodecode/templates/compare/compare_diff.mako:110
-#: rhodecode/templates/compare/compare_diff.mako:111
-#: rhodecode/templates/compare/compare_diff.mako:112
-#: rhodecode/templates/compare/compare_diff.mako:122
-msgid "Action unavailable in current view"
-msgstr ""
-
-#: rhodecode/templates/compare/compare_diff.mako:103
-#: rhodecode/templates/compare/compare_diff.mako:111
-#: rhodecode/templates/compare/compare_diff.mako:116
-msgid "Swap"
-msgstr ""
-
-#: rhodecode/templates/compare/compare_diff.mako:106
 msgid "Compare commits, branches, bookmarks or tags."
 msgstr ""
 
+#: rhodecode/templates/data_table/_dt_elements.mako:61
+#: rhodecode/templates/data_table/_dt_elements.mako:62
+msgid "Fork"
+msgstr ""
+
 #: rhodecode/templates/data_table/_dt_elements.mako:83
 msgid "Mercurial repository"
 msgstr ""
@@ -9618,7 +9702,7 b' msgid "User group"'
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:333
-#: rhodecode/templates/forks/fork.mako:95
+#: rhodecode/templates/forks/fork.mako:91
 msgid "Private"
 msgstr ""
 
@@ -9627,7 +9711,16 b' msgstr ""'
 msgid "Pull request #%(pr_number)s"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:407
+#: rhodecode/templates/data_table/_dt_elements.mako:387
+msgid "Copy the full url"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.mako:398
+#, python-format
+msgid "Confirm to delete this artifact: %s"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.mako:431
 #, python-format
 msgid "Parsed using %s syntax"
 msgstr ""
@@ -9861,7 +9954,7 b' msgid "{user} left a {comment_type} on p'
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:49
-#: rhodecode/templates/pullrequests/pullrequest.mako:73
+#: rhodecode/templates/pullrequests/pullrequest.mako:67
 msgid "Source repository"
 msgstr ""
 
@@ -9945,93 +10038,46 b' msgstr ""'
 msgid "Commit was too big and was cut off..."
 msgstr ""
 
-#: rhodecode/templates/files/file_authors_box.mako:6
-msgid "Last Author"
-msgstr ""
-
-#: rhodecode/templates/files/file_authors_box.mako:11
-msgid "Show All"
-msgstr ""
-
-#: rhodecode/templates/files/file_authors_box.mako:25
+#: rhodecode/templates/files/file_authors_box.mako:16
+msgid "Load All Authors"
+msgstr ""
+
+#: rhodecode/templates/files/file_authors_box.mako:18
 msgid "last author"
 msgstr ""
 
-#: rhodecode/templates/files/file_tree_author_box.mako:5
-msgid "Commit Author"
-msgstr ""
-
 #: rhodecode/templates/files/files.mako:4
 #: rhodecode/templates/files/files_pjax.mako:2
-#, python-format
-msgid "%s Files"
-msgstr ""
-
-#: rhodecode/templates/files/files.mako:131
-msgid "Pick Commit"
+msgid "{} Files"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:4
-#, python-format
-msgid "%s Files Add"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.mako:15
+msgid "{} Files Add"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.mako:25
 msgid "Add new file"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:34
-#: rhodecode/templates/files/files_delete.mako:34
-#: rhodecode/templates/files/files_edit.mako:34
-msgid "Path"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.mako:39
-msgid "Specify Custom Path"
-msgstr ""
-
 #: rhodecode/templates/files/files_add.mako:44
-msgid "Remove Custom Path"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.mako:50
-#: rhodecode/templates/files/files_add.mako:59
-msgid "Filename"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.mako:54
-msgid "Upload File"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.mako:62
-msgid "No file selected"
+#: rhodecode/templates/files/files_edit.mako:45
+msgid "Filename e.g example.py, or docs/readme.md"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:65
-msgid "Upload file"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.mako:71
-msgid "Create New File"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.mako:81
-#: rhodecode/templates/files/files_edit.mako:82
-msgid "line wraps"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.mako:82
-#: rhodecode/templates/files/files_edit.mako:83
-msgid "on"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.mako:82
-#: rhodecode/templates/files/files_edit.mako:83
-msgid "off"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.mako:109
-#: rhodecode/templates/files/files_edit.mako:109
+#: rhodecode/templates/files/files_edit.mako:66
+msgid "Line wraps on"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.mako:65
+#: rhodecode/templates/files/files_edit.mako:66
+msgid "line wraps off"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.mako:88
+#: rhodecode/templates/files/files_delete.mako:72
+#: rhodecode/templates/files/files_edit.mako:89
+#: rhodecode/templates/files/files_upload.mako:102
 msgid "Commit changes"
 msgstr ""
 
@@ -10039,182 +10085,144 b' msgstr ""'
 msgid "Previous commit"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.mako:13
+#: rhodecode/templates/files/files_browser.mako:15
 msgid "Next commit"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.mako:19
-msgid "Search File List"
-msgstr ""
-
 #: rhodecode/templates/files/files_browser.mako:22
-msgid "Close File List"
+msgid "Upload File"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:25
-#: rhodecode/templates/summary/summary_commits.mako:112
-msgid "Add New File"
-msgstr ""
-
-#: rhodecode/templates/files/files_browser.mako:27
 msgid "Add File"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.mako:32
-#: rhodecode/templates/files/files_browser.mako:34
-msgid "Download tree at {}"
-msgstr ""
-
-#: rhodecode/templates/files/files_browser.mako:42
-msgid "Loading file list..."
-msgstr ""
-
-#: rhodecode/templates/files/files_browser_tree.mako:6
+#: rhodecode/templates/files/files_browser.mako:35
+msgid "Download full tree ZIP"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.mako:39
+msgid "Download this tree ZIP"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser_tree.mako:12
 #: rhodecode/templates/search/search_path.mako:9
 msgid "Size"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser_tree.mako:7
+#: rhodecode/templates/files/files_browser_tree.mako:13
 msgid "Modified"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser_tree.mako:8
+#: rhodecode/templates/files/files_browser_tree.mako:14
 msgid "Last Commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:4
-#, python-format
-msgid "%s Files Delete"
-msgstr ""
-
-#: rhodecode/templates/files/files_delete.mako:15
+msgid "{} Files Delete"
+msgstr ""
+
+#: rhodecode/templates/files/files_delete.mako:25
 msgid "Delete file"
 msgstr ""
 
-#: rhodecode/templates/files/files_delete.mako:45
-#: rhodecode/templates/files/files_source.mako:75
+#: 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:50
-#: rhodecode/templates/files/files_source.mako:104
+#: rhodecode/templates/files/files_delete.mako:58
+#: rhodecode/templates/files/files_source.mako:133
 msgid "File size {} is bigger then allowed limit {}. "
 msgstr ""
 
-#: rhodecode/templates/files/files_delete.mako:70
-msgid "Delete File"
-msgstr ""
-
-#: rhodecode/templates/files/files_detail.mako:5
-#: rhodecode/templates/files/files_detail.mako:12
-msgid "Commit Description"
-msgstr ""
-
-#: rhodecode/templates/files/files_detail.mako:32
-msgid "File last commit"
-msgstr ""
-
-#: rhodecode/templates/files/files_detail.mako:46
-msgid "Show/Diff file"
-msgstr ""
-
-#: rhodecode/templates/files/files_detail.mako:61
-msgid "Diff to Commit"
-msgstr ""
-
-#: rhodecode/templates/files/files_detail.mako:62
-msgid "Show at Commit"
-msgstr ""
-
 #: rhodecode/templates/files/files_edit.mako:4
-#, python-format
-msgid "%s File Edit"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.mako:15
+msgid "{} Files Edit"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.mako:25
 msgid "Edit file"
 msgstr ""
 
-#: rhodecode/templates/files/files_edit.mako:55
-msgid "history"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.mako:61
-msgid "source"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.mako:63
-#: rhodecode/templates/files/files_pjax.mako:19
-msgid "annotation"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.mako:67
-msgid "raw"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.mako:70
-msgid "download"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.mako:77
-msgid "Editing file"
-msgstr ""
-
-#: rhodecode/templates/files/files_pjax.mako:17
-msgid "Location"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.mako:16
-msgid "This file is a pointer to large binary file"
-msgstr ""
-
 #: rhodecode/templates/files/files_source.mako:16
+msgid "Download largefile"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.mako:20
+msgid "Download file"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.mako:29
+msgid "Editing binary files not allowed"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.mako:33
+msgid "Edit on branch: "
+msgstr ""
+
+#: rhodecode/templates/files/files_source.mako:42
+msgid "Editing files allowed only when on branch head commit"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.mako:43
+msgid "Deleting files allowed only when on branch head commit"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.mako:67
+msgid "This file is a pointer to large binary file"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.mako:67
 msgid "LargeFile"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:27
+#: rhodecode/templates/files/files_source.mako:82
 msgid "History"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:30
-#: rhodecode/templates/search/search_content.mako:86
-msgid "Show Full History"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.mako:35
-#: rhodecode/templates/search/search_content.mako:88
+#: rhodecode/templates/files/files_source.mako:88
 msgid "Annotation"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:37
-#: rhodecode/templates/search/search_content.mako:89
+#: rhodecode/templates/files/files_source.mako:90
 msgid "Raw"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:41
-msgid "Download largefile"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.mako:45
-#: rhodecode/templates/search/search_content.mako:90
-msgid "Download"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.mako:53
-msgid "Edit on Branch:{}"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.mako:58
-msgid "Editing binary files not allowed"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.mako:61
-msgid "Editing files allowed only when on branch head commit"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.mako:62
-msgid "Deleting files allowed only when on branch head commit"
+#: rhodecode/templates/files/files_source_header.mako:31
+msgid "File last commit"
+msgstr ""
+
+#: rhodecode/templates/files/files_upload.mako:4
+msgid "{} Files Upload"
+msgstr ""
+
+#: rhodecode/templates/files/files_upload.mako:36
+msgid "Uploading..."
+msgstr ""
+
+#: rhodecode/templates/files/files_upload.mako:38
+msgid "Uploaded"
+msgstr ""
+
+#: rhodecode/templates/files/files_upload.mako:52
+msgid "Upload new file"
+msgstr ""
+
+#: rhodecode/templates/files/files_upload.mako: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 ""
+
+#: rhodecode/templates/files/files_upload.mako:110
+msgid "Please wait while the files are being uploaded"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:5
@@ -10222,20 +10230,20 b' msgstr ""'
 msgid "Fork repository %s"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.mako:34
-#: rhodecode/templates/forks/forks.mako:62
+#: rhodecode/templates/forks/fork.mako:30
+#: rhodecode/templates/forks/forks.mako:60
 msgid "Fork name"
 msgstr ""
 
+#: rhodecode/templates/forks/fork.mako:81
+msgid "Copy permissions"
+msgstr ""
+
 #: rhodecode/templates/forks/fork.mako:85
-msgid "Copy permissions"
-msgstr ""
-
-#: rhodecode/templates/forks/fork.mako:89
 msgid "Copy permissions from parent repository."
 msgstr ""
 
-#: rhodecode/templates/forks/fork.mako:104
+#: rhodecode/templates/forks/fork.mako:100
 msgid "Fork this Repository"
 msgstr ""
 
@@ -10244,15 +10252,11 b' msgstr ""'
 msgid "%s Forks"
 msgstr ""
 
-#: rhodecode/templates/forks/forks.mako:12
-msgid "Forks"
-msgstr ""
-
-#: rhodecode/templates/forks/forks.mako:30
+#: rhodecode/templates/forks/forks.mako:28
 msgid "Create new fork"
 msgstr ""
 
-#: rhodecode/templates/forks/forks.mako:66
+#: rhodecode/templates/forks/forks.mako:64
 msgid "Forked"
 msgstr ""
 
@@ -10282,65 +10286,65 b' msgid "RSS public journal feed"'
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:5
-#: rhodecode/templates/pullrequests/pullrequest.mako:9
+#: rhodecode/templates/pullrequests/pullrequest.mako:22
 msgid "New pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:65
+#: rhodecode/templates/pullrequests/pullrequest.mako:59
 msgid "Commit flow"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:91
+#: rhodecode/templates/pullrequests/pullrequest.mako:85
 msgid "Loading refs..."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:102
+#: rhodecode/templates/pullrequests/pullrequest.mako:96
 msgid "Submit Pull Request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:116
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:317
+#: rhodecode/templates/pullrequests/pullrequest.mako:110
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:313
 msgid "Author of this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:130
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:331
+#: rhodecode/templates/pullrequests/pullrequest.mako:124
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:327
 msgid "Reviewer rules"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:140
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:345
+#: rhodecode/templates/pullrequests/pullrequest.mako:134
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:341
 msgid "Pull request reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:151
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:388
+#: rhodecode/templates/pullrequests/pullrequest.mako:145
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:384
 msgid "Add reviewer or reviewer group"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest.mako:301
+#: rhodecode/templates/pullrequests/pullrequest.mako:518
+msgid "Please select source and target"
+msgstr ""
+
 #: rhodecode/templates/pullrequests/pullrequest.mako:307
-#: rhodecode/templates/pullrequests/pullrequest.mako:524
-msgid "Please select source and target"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.mako:313
 msgid "Loading compare ..."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:372
+#: rhodecode/templates/pullrequests/pullrequest.mako:366
 msgid "Show detailed compare."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:379
+#: rhodecode/templates/pullrequests/pullrequest.mako:373
 msgid "There are no commits to merge."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:429
-#: rhodecode/templates/pullrequests/pullrequest.mako:455
+#: rhodecode/templates/pullrequests/pullrequest.mako:423
+#: rhodecode/templates/pullrequests/pullrequest.mako:449
 msgid "Select commit reference"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:445
+#: rhodecode/templates/pullrequests/pullrequest.mako:439
 msgid "Target repository"
 msgstr ""
 
@@ -10352,26 +10356,26 b' msgstr ""'
 msgid "Merge is not currently possible because of below failed checks."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:52
-#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57
+#: 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:53
-#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58
+#: 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:58
+#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:61
 msgid "You are not allowed to merge this pull request."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60
+#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:63
 msgid "Login to Merge this Pull Request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:69
-#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:73
+#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:72
+#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:76
 msgid "Close with status {}"
 msgstr ""
 
@@ -10380,182 +10384,182 b' msgstr ""'
 msgid "%s Pull Request #%s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:52
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:48
 msgid "From"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:58
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:54
 msgid "Confirm to delete this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:89
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:85
 msgid "Common ancestor"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:101
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:97
 msgid "Copy the pull url"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:130
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:126
 msgid "Merge"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:137
+#: rhodecode/templates/summary/components.mako:78
+msgid "Copy the clone url"
+msgstr ""
+
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:141
-#: rhodecode/templates/summary/components.mako:66
-msgid "Copy the clone url"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:145
 msgid "Shadow repository data not available"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:153
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:149
 msgid "Review"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:169
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:165
 msgid "Rendered using {} renderer"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:183
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:179
 msgid "Versions"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:195
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:191
 msgid "Hide all versions of this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:220
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:216
 msgid "Your review status at this version"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:226
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:222
 msgid "Comment from pull request version v{0}, general:{1} inline:{2}"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:239
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:243
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:247
 msgid "select versions to show changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:244
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:240
 msgid "show changes between versions"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:245
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:241
 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 at this version"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:264
 msgid "Comments for this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:269
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:271
+#: 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:275
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:277
+#: 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
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:285
 #, python-format
 msgid "%d Outdated"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:282
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:278
 msgid "show outdated comments"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:283
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:279
 msgid "hide outdated comments"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:294
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:290
 msgid "Pull request versions not available"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:308
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:393
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:304
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:389
 msgid "Save Changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:410
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:406
 msgid "Missing requirements:"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:411
+#: 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:419
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:415
 msgid "Missing commits"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:420
+#: 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:421
+#: 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:422
+#: 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:433
+#: 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:456
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:458
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:452
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:454
 msgid "Update commits"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:458
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:454
 msgid "Update is disabled for current view"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:465
+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
-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:473
 msgid "commits added: {}, removed: {}"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:491
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:487
 msgid "Commit added in displayed changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:493
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:489
 msgid "Commit removed in displayed changes"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:578
+msgid "there is {num} general comment from older versions"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:579
+msgid "show it"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:581
+msgid "there are {num} general comments from older versions"
+msgstr ""
+
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:582
-msgid "there is {num} general comment from older versions"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:583
-msgid "show it"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:585
-msgid "there are {num} general comments from older versions"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:586
 msgid "show them"
 msgstr ""
 
@@ -10564,58 +10568,28 b' msgstr ""'
 msgid "%s Pull Requests"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequests.mako:34
-msgid "Open new Pull Request"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequests.mako:48
+#: rhodecode/templates/pullrequests/pullrequests.mako:27
 msgid "Opened"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequests.mako:49
+#: rhodecode/templates/pullrequests/pullrequests.mako:28
 msgid "Opened by me"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequests.mako:50
+#: rhodecode/templates/pullrequests/pullrequests.mako:29
 msgid "Awaiting review"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequests.mako:51
+#: rhodecode/templates/pullrequests/pullrequests.mako:30
 msgid "Awaiting my review"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequests.mako:53
+#: rhodecode/templates/pullrequests/pullrequests.mako:32
 msgid "From this repo"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequests.mako:62
-#, python-format
-msgid "Pull Requests from %(repo_name)s repository"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequests.mako:64
-#, python-format
-msgid "Closed Pull Requests to repository %(repo_name)s"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequests.mako:66
-#, python-format
-msgid "Pull Requests to %(repo_name)s repository opened by me"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequests.mako:68
-#, python-format
-msgid "Pull Requests to %(repo_name)s repository awaiting review"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequests.mako:70
-#, python-format
-msgid "Pull Requests to %(repo_name)s repository awaiting my review"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequests.mako:72
-#, python-format
-msgid "Pull Requests to %(repo_name)s repository"
+#: rhodecode/templates/pullrequests/pullrequests.mako:40
+msgid "Open new Pull Request"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:6
@@ -10633,17 +10607,21 b' msgstr ""'
 msgid "Search inside all accessible repositories"
 msgstr ""
 
-#: rhodecode/templates/search/search.mako:90
+#: rhodecode/templates/search/search.mako:85
 msgid "File path"
 msgstr ""
 
-#: rhodecode/templates/search/search.mako:99
-#: rhodecode/templates/search/search.mako:101
-#: rhodecode/templates/search/search.mako:103
+#: rhodecode/templates/search/search.mako:88
+msgid "Search"
+msgstr ""
+
+#: rhodecode/templates/search/search.mako:94
+#: rhodecode/templates/search/search.mako:96
+#: rhodecode/templates/search/search.mako:98
 msgid "Global Search"
 msgstr ""
 
-#: rhodecode/templates/search/search.mako:138
+#: rhodecode/templates/search/search.mako:133
 msgid "Query Langague examples"
 msgstr ""
 
@@ -10668,11 +10646,11 b' msgstr ""'
 msgid "more matches in this file"
 msgstr ""
 
-#: rhodecode/templates/search/search_content.mako:127
+#: rhodecode/templates/search/search_content.mako:112
 msgid "Narrow to this repository group"
 msgstr ""
 
-#: rhodecode/templates/search/search_content.mako:134
+#: rhodecode/templates/search/search_content.mako:119
 msgid "Narrow to this repository"
 msgstr ""
 
@@ -10684,64 +10662,63 b' msgstr ""'
 msgid "Lines"
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:71
+#: rhodecode/templates/summary/components.mako:20
+msgid "Closed Branch"
+msgstr ""
+
+#: rhodecode/templates/summary/components.mako:83
 msgid "Copy the clone by id url"
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:76
+#: rhodecode/templates/summary/components.mako:88
 msgid "Copy the clone by ssh url"
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:80
+#: rhodecode/templates/summary/components.mako:92
 msgid "SVN Protocol is disabled. To enable it, see the"
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:80
+#: rhodecode/templates/summary/components.mako:92
 msgid "documentation here"
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:117
+#: rhodecode/templates/summary/components.mako:135
 msgid "Number of Repository Forks"
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:128
+#: rhodecode/templates/summary/components.mako:172
+msgid "Downloads"
+msgstr ""
+
+#: rhodecode/templates/summary/components.mako:177
+msgid "There are no downloads yet"
+msgstr ""
+
+#: rhodecode/templates/summary/components.mako:181
+msgid "Downloads are disabled for this repository"
+msgstr ""
+
+#: rhodecode/templates/summary/components.mako:203
 msgid "Repository size"
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:141
+#: rhodecode/templates/summary/components.mako:215
 msgid "Calculating Repository Size..."
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:164
-msgid "Downloads"
-msgstr ""
-
-#: rhodecode/templates/summary/components.mako:170
-msgid "There are no downloads yet"
-msgstr ""
-
-#: rhodecode/templates/summary/components.mako:174
-msgid "Downloads are disabled for this repository"
-msgstr ""
-
-#: rhodecode/templates/summary/components.mako:202
-msgid "Calculating Code Statistics..."
-msgstr ""
-
-#: rhodecode/templates/summary/components.mako:206
+#: rhodecode/templates/summary/components.mako:226
+msgid "Code Statistics"
+msgstr ""
+
+#: rhodecode/templates/summary/components.mako:235
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.mako:19
 #: rhodecode/templates/summary/summary.mako:21
-msgid "RSS Feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.mako:37
 msgid "Quick start"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.mako:50
+#: rhodecode/templates/summary/summary.mako:36
 #, python-format
 msgid "Readme file from commit %s:%s"
 msgstr ""
@@ -10761,15 +10738,23 b' msgstr ""'
 msgid "%s RSS feed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary_commits.mako:109
+#: rhodecode/templates/summary/summary_commits.mako:117
 msgid "Add or upload files directly via RhodeCode:"
 msgstr ""
 
-#: rhodecode/templates/summary/summary_commits.mako:120
+#: rhodecode/templates/summary/summary_commits.mako:119
+msgid "Add New File"
+msgstr ""
+
+#: rhodecode/templates/summary/summary_commits.mako:122
+msgid "Upload New File"
+msgstr ""
+
+#: rhodecode/templates/summary/summary_commits.mako:128
 msgid "Push new repo:"
 msgstr ""
 
-#: rhodecode/templates/summary/summary_commits.mako:131
+#: rhodecode/templates/summary/summary_commits.mako:151
 msgid "Existing repository?"
 msgstr ""
 
@@ -10778,19 +10763,19 b' msgstr ""'
 msgid "%s Tags"
 msgstr ""
 
-#: rhodecode/templates/tags/tags.mako:13
+#: rhodecode/templates/tags/tags.mako:28
+msgid "Compare Selected Tags"
+msgstr ""
+
+#: rhodecode/templates/tags/tags.mako:34
 msgid "tags"
 msgstr ""
 
-#: rhodecode/templates/tags/tags.mako:31
-msgid "Compare Selected Tags"
-msgstr ""
-
 #: rhodecode/templates/user_group/profile.mako:5
 msgid "User group profile"
 msgstr ""
 
-#: rhodecode/templates/user_group/profile.mako:15
+#: rhodecode/templates/user_group/profile.mako:14
 msgid "Group Name"
 msgstr ""
 
@@ -10798,11 +10783,11 b' msgstr ""'
 msgid "User Group Profile"
 msgstr ""
 
-#: rhodecode/templates/users/user_profile.mako:35
+#: rhodecode/templates/users/user_profile.mako:38
 msgid "First name"
 msgstr ""
 
-#: rhodecode/templates/users/user_profile.mako:43
+#: rhodecode/templates/users/user_profile.mako:48
 msgid "Last name"
 msgstr ""
 

rhodecode/lib/dbmigrate/versions/097_version_4_17_0.py

@@ -4,6 +4,7 b' import logging'
 
 from alembic.migration import MigrationContext
 from alembic.operations import Operations
+from sqlalchemy import String
 
 from rhodecode.lib.dbmigrate.versions import _reset_base
 from rhodecode.model import init_model_encryption
@@ -28,7 +29,7 b' def upgrade(migrate_engine):'
     repo_group = db_4_16_0_2.RepoGroup.__table__
 
     with op.batch_alter_table(repo_group.name) as batch_op:
-        batch_op.alter_column("repo_group_name_hash", nullable=False)
+        batch_op.alter_column("repo_group_name_hash", type_=String(1024), nullable=False)
 
 
 def downgrade(migrate_engine):

rhodecode/lib/vcs/client_http.py

@@ -147,7 +147,7 b' class RemoteRepo(object):'
 
     def _call_with_logging(self, name, *args, **kwargs):
         context_uid = self._wire.get('context')
-        log.debug('Calling %s@%s with args:%r. wire_context: %s',
+        log.debug('Calling %s@%s with args:%.10240r. wire_context: %s',
                   self.url, name, args, context_uid)
         return RemoteRepo._call(self, name, *args, **kwargs)
 

rhodecode/model/db.py

@@ -1841,6 +1841,10 b' class Repository(Base, BaseModel):'
         return q.all()
 
     @property
+    def repo_uid(self):
+        return '_{}'.format(self.repo_id)
+
+    @property
     def forks(self):
         """
         Return forks of this repo
@@ -4111,7 +4115,7 b' class PullRequest(Base, _PullRequestBase'
             def pull_request_version_id(self):
                 return getattr(pull_request_obj, 'pull_request_version_id', None)
 
-        attrs = StrictAttributeDict(pull_request_obj.get_api_data())
+        attrs = StrictAttributeDict(pull_request_obj.get_api_data(with_merge_state=False))
 
         attrs.author = StrictAttributeDict(
             pull_request_obj.author.get_api_data())

rhodecode/model/integration.py

@@ -33,7 +33,7 b' from rhodecode import events'
 from rhodecode.integrations.types.base import EEIntegration
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model import BaseModel
-from rhodecode.model.db import Integration, Repository, RepoGroup, true, false
+from rhodecode.model.db import Integration, Repository, RepoGroup, true, false, case
 from rhodecode.integrations import integration_type_registry
 
 log = logging.getLogger(__name__)
@@ -155,6 +155,7 b' class IntegrationModel(BaseModel):'
         """
         Get integrations that match an event
         """
+        # base query
         query = self.sa.query(
             Integration
         ).filter(
@@ -164,7 +165,7 b' class IntegrationModel(BaseModel):'
         global_integrations_filter = and_(
             Integration.repo_id == None,
             Integration.repo_group_id == None,
-            Integration.child_repos_only == False,
+            Integration.child_repos_only == false(),
         )
 
         if isinstance(event, events.RepoEvent):
@@ -177,42 +178,61 b' class IntegrationModel(BaseModel):'
             clauses = [
                 global_integrations_filter,
             ]
+            cases = [
+                (global_integrations_filter, 1),
+                (root_repos_integrations_filter, 2),
+            ]
 
-            # repo integrations
-            if event.repo.repo_id:  # pre create events dont have a repo_id yet
-                clauses.append(
-                    Integration.repo_id == event.repo.repo_id
+            # repo group integrations
+            if event.repo.group:
+                # repo group with only root level repos
+                group_child_repos_filter = and_(
+                    Integration.repo_group_id == event.repo.group.group_id,
+                    Integration.child_repos_only == true()
                 )
 
-            if event.repo.group:
-                clauses.append(
-                    and_(
-                        Integration.repo_group_id == event.repo.group.group_id,
-                        Integration.child_repos_only == true()
-                    )
+                clauses.append(group_child_repos_filter)
+                cases.append(
+                    (group_child_repos_filter, 3),
                 )
+
                 # repo group cascade to kids
-                clauses.append(
-                    and_(
-                        Integration.repo_group_id.in_(
-                            [group.group_id for group in
-                             event.repo.groups_with_parents]
-                        ),
-                        Integration.child_repos_only == false()
-                    )
+                group_recursive_repos_filter = and_(
+                    Integration.repo_group_id.in_(
+                        [group.group_id for group in event.repo.groups_with_parents]
+                    ),
+                    Integration.child_repos_only == false()
+                )
+                clauses.append(group_recursive_repos_filter)
+                cases.append(
+                    (group_recursive_repos_filter, 4),
                 )
 
             if not event.repo.group:  # root repo
                 clauses.append(root_repos_integrations_filter)
 
+            # repo integrations
+            if event.repo.repo_id:  # pre create events dont have a repo_id yet
+                specific_repo_filter = Integration.repo_id == event.repo.repo_id
+                clauses.append(specific_repo_filter)
+                cases.append(
+                    (specific_repo_filter, 5),
+                )
+
+            order_by_criterion = case(cases)
+
             query = query.filter(or_(*clauses))
+            query = query.order_by(order_by_criterion)
 
             if cache:
                 cache_key = "get_enabled_repo_integrations_%i" % event.repo.repo_id
                 query = query.options(
                     FromCache("sql_cache_short", cache_key))
         else:  # only global integrations
+            order_by_criterion = Integration.integration_id
+
             query = query.filter(global_integrations_filter)
+            query = query.order_by(order_by_criterion)
             if cache:
                 query = query.options(
                     FromCache("sql_cache_short", "get_enabled_global_integrations"))

rhodecode/model/repo.py

@@ -374,8 +374,7 b' class RepoModel(BaseModel):'
                 )
 
             # handle extra fields
-            for field in filter(lambda k: k.startswith(RepositoryField.PREFIX),
-                                kwargs):
+            for field in filter(lambda k: k.startswith(RepositoryField.PREFIX), kwargs):
                 k = RepositoryField.un_prefix_key(field)
                 ex_field = RepositoryField.get_by_key_name(
                     key=k, repo=cur_repo)

rhodecode/public/css/buttons.less

@@ -53,7 +53,7 b' input[type="button"] {'
         .border ( @border-thickness, @grey4 );
     }
 
-    .icon-remove-sign {
+    .icon-remove {
         display: none;
     }
 

rhodecode/public/css/ipython.less

@@ -536,7 +536,7 b' th {'
 .glyphicon-minus-sign:before {
   content: "\e082";
 }
-.glyphicon-remove-sign:before {
+.glyphicon-remove:before {
   content: "\e083";
 }
 .glyphicon-ok-sign:before {

rhodecode/public/css/main.less

@@ -1622,8 +1622,14 b' table.integrations {'
     margin-left: 8px;
 }
 
+#pull_request_overview {
+  div.ancestor {
+      margin: -33px 0;
+  }
+}
+
 div.ancestor {
-    margin: -30px 0px;
+    line-height: 33px;
 }
 
 .cs_icon_td input[type="checkbox"] {

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

@@ -8,6 +8,7 b' var _TM = {'
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Add another comment',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
@@ -63,6 +64,7 b' var _TM = {'
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
     'Show at Commit ': 'Show at Commit ',
+    'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
@@ -70,8 +72,10 b' var _TM = {'
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Start following this repository',
+    'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Stop following this repository',
+    'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
@@ -80,9 +84,11 b' var _TM = {'
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
+    'Unwatch': 'Unwatch',
     'Updating...': 'Updating...',
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
+    'Watch': 'Watch',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -92,6 +98,7 b' var _TM = {'
     'enabled': 'enabled',
     'file': 'file',
     'files': 'files',
+    'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
@@ -118,8 +125,10 b' var _TM = {'
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
+    '{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} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',

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

@@ -8,6 +8,7 b' var _TM = {'
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Add another comment',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
@@ -63,6 +64,7 b' var _TM = {'
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
     'Show at Commit ': 'Show at Commit ',
+    'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
@@ -70,8 +72,10 b' var _TM = {'
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Start following this repository',
+    'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Stop following this repository',
+    'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
@@ -80,9 +84,11 b' var _TM = {'
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
+    'Unwatch': 'Unwatch',
     'Updating...': 'Updating...',
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
+    'Watch': 'Watch',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -92,6 +98,7 b' var _TM = {'
     'enabled': 'enabled',
     'file': 'file',
     'files': 'files',
+    'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
@@ -118,8 +125,10 b' var _TM = {'
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
+    '{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} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',

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

@@ -8,6 +8,7 b' var _TM = {'
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Add another comment',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
@@ -63,6 +64,7 b' var _TM = {'
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
     'Show at Commit ': 'Show at Commit ',
+    'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
@@ -70,8 +72,10 b' var _TM = {'
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Start following this repository',
+    'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Stop following this repository',
+    'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
@@ -80,9 +84,11 b' var _TM = {'
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
+    'Unwatch': 'Unwatch',
     'Updating...': 'Updating...',
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
+    'Watch': 'Watch',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -92,6 +98,7 b' var _TM = {'
     'enabled': 'enabled',
     'file': 'file',
     'files': 'files',
+    'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
@@ -118,8 +125,10 b' var _TM = {'
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
+    '{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} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',

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

@@ -8,6 +8,7 b' var _TM = {'
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Add another comment',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
@@ -63,6 +64,7 b' var _TM = {'
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
     'Show at Commit ': 'Show at Commit ',
+    'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
@@ -70,8 +72,10 b' var _TM = {'
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Start following this repository',
+    'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Stop following this repository',
+    'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
@@ -80,9 +84,11 b' var _TM = {'
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
+    'Unwatch': 'Unwatch',
     'Updating...': 'Updating...',
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
+    'Watch': 'Watch',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -92,6 +98,7 b' var _TM = {'
     'enabled': 'enabled',
     'file': 'file',
     'files': 'files',
+    'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
@@ -118,8 +125,10 b' var _TM = {'
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
+    '{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} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',

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

@@ -8,6 +8,7 b' var _TM = {'
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Add another comment',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
@@ -63,6 +64,7 b' var _TM = {'
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
     'Show at Commit ': 'Show at Commit ',
+    'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
@@ -70,8 +72,10 b' var _TM = {'
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Suivre ce dépôt',
+    'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Arrêter de suivre ce dépôt',
+    'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Envoi…',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
@@ -80,9 +84,11 b' var _TM = {'
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
+    'Unwatch': 'Unwatch',
     'Updating...': 'Updating...',
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
+    'Watch': 'Watch',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -92,6 +98,7 b' var _TM = {'
     'enabled': 'Activé',
     'file': 'file',
     'files': 'Fichiers',
+    'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
@@ -118,8 +125,10 b' var _TM = {'
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} mois',
+    '{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} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',

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

@@ -8,6 +8,7 b' var _TM = {'
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Aggiungi un altro commento',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
@@ -63,6 +64,7 b' var _TM = {'
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
     'Show at Commit ': 'Show at Commit ',
+    'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Mostra ancora',
     'Show selected commit __S': 'Show selected commit __S',
@@ -70,8 +72,10 b' var _TM = {'
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Inizia a seguire il repository',
+    'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Smetti di seguire il repository',
+    'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Inoltro...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
@@ -80,9 +84,11 b' var _TM = {'
     'There are currently no open pull requests requiring your participation.': 'Al momento non ci sono richieste di PULL che richiedono il tuo intervento',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Smetti di seguire',
+    'Unwatch': 'Unwatch',
     'Updating...': 'Updating...',
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
+    'Watch': 'Watch',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -92,6 +98,7 b' var _TM = {'
     'enabled': 'abilitato',
     'file': 'file',
     'files': 'i file',
+    'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
@@ -118,8 +125,10 b' var _TM = {'
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
+    '{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} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',

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

@@ -8,6 +8,7 b' var _TM = {'
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': '別のコメントを追加',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
@@ -63,6 +64,7 b' var _TM = {'
     'Set status to Approved': 'ステータスを承認にする',
     'Set status to Rejected': 'ステータスを拒否にする',
     'Show at Commit ': 'Show at Commit ',
+    'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'もっと表示',
     'Show selected commit __S': 'Show selected commit __S',
@@ -70,8 +72,10 b' var _TM = {'
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'このリポジトリのフォローする',
+    'Started watching this repository': 'Started watching this repository',
     'Status Review': 'ステータスレビュー',
     'Stop following this repository': 'このリポジトリのフォローをやめる',
+    'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': '送信中...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
@@ -80,9 +84,11 b' var _TM = {'
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'アンフォロー',
+    'Unwatch': 'Unwatch',
     'Updating...': 'Updating...',
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
+    'Watch': 'Watch',
     'You can only select {0} item': '{0} 件のみ選択できます',
     'You can only select {0} items': '{0} 件のみ選択できます',
     'activated': 'activated',
@@ -92,6 +98,7 b' var _TM = {'
     'enabled': '有効',
     'file': 'ファイル',
     'files': 'ファイル',
+    'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
@@ -118,8 +125,10 b' var _TM = {'
     '{0} min': '{0} 分',
     '{0} month': '{0} ヶ月',
     '{0} months': '{0} months',
+    '{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} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} 件の結果があります。矢印キーの上下で選択できます。',
     '{0} sec': '{0} 秒',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',

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

@@ -2,6 +2,7 b''
 _gettext('(from usergroup {0})');
 _gettext('Add another comment');
 _gettext('Adding new reviewers is forbidden.');
+_gettext('All Authors');
 _gettext('All individual reviewers must vote.');
 _gettext('All reviewers must vote.');
 _gettext('At least {0} reviewer must vote.');
@@ -57,6 +58,7 b''
 _gettext('Set status to Approved');
 _gettext('Set status to Rejected');
 _gettext('Show at Commit ');
+_gettext('Show commit range {0} ... {1}');
 _gettext('Show full context diff');
 _gettext('Show more');
 _gettext('Show selected commit __S');
@@ -64,8 +66,10 b''
 _gettext('Show whitespace changes');
 _gettext('Specified expiration date');
 _gettext('Start following this repository');
+_gettext('Started watching this repository');
 _gettext('Status Review');
 _gettext('Stop following this repository');
+_gettext('Stopped watching this repository');
 _gettext('Submitting...');
 _gettext('Switch to chat');
 _gettext('Switch to comment');
@@ -74,9 +78,11 b''
 _gettext('There are currently no open pull requests requiring your participation.');
 _gettext('Toggle Wide Mode diff');
 _gettext('Unfollow');
+_gettext('Unwatch');
 _gettext('Updating...');
 _gettext('User `{0}` already in reviewers');
 _gettext('User `{0}` not allowed to be a reviewer');
+_gettext('Watch');
 _gettext('You can only select {0} item');
 _gettext('You can only select {0} items');
 _gettext('activated');
@@ -86,6 +92,7 b''
 _gettext('enabled');
 _gettext('file');
 _gettext('files');
+_gettext('go to numeric commit');
 _gettext('in {0}');
 _gettext('in {0} and {1}');
 _gettext('in {0}, {1}');
@@ -112,8 +119,10 b''
 _gettext('{0} min');
 _gettext('{0} month');
 _gettext('{0} months');
+_gettext('{0} of {1} repository groups');
 _gettext('{0} out of {1} ssh keys');
 _gettext('{0} out of {1} users');
+_gettext('{0} repository groups');
 _gettext('{0} results are available, use up and down arrow keys to navigate.');
 _gettext('{0} sec');
 _gettext('{0} user groups ({1} inactive)');

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

@@ -8,6 +8,7 b' var _TM = {'
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Dodaj kolejny komentarz',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
@@ -63,6 +64,7 b' var _TM = {'
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
     'Show at Commit ': 'Show at Commit ',
+    'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Pokaż więcej',
     'Show selected commit __S': 'Show selected commit __S',
@@ -70,8 +72,10 b' var _TM = {'
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Zacznij obserwację tego repozytorium',
+    'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Zakończyć obserwację tego repozytorium',
+    'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Przesyłanie...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
@@ -80,9 +84,11 b' var _TM = {'
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Nie obserwuj',
+    'Unwatch': 'Unwatch',
     'Updating...': 'Updating...',
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
+    'Watch': 'Watch',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -92,6 +98,7 b' var _TM = {'
     'enabled': 'enabled',
     'file': 'file',
     'files': 'pliki',
+    'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
@@ -118,8 +125,10 b' var _TM = {'
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
+    '{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} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',

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

@@ -8,6 +8,7 b' var _TM = {'
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Adicionar outro comentário',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
@@ -63,6 +64,7 b' var _TM = {'
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
     'Show at Commit ': 'Show at Commit ',
+    'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Mostrar mais',
     'Show selected commit __S': 'Show selected commit __S',
@@ -70,8 +72,10 b' var _TM = {'
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Passar a seguir este repositório',
+    'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Parar de seguir este repositório',
+    'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Enviando...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
@@ -80,9 +84,11 b' var _TM = {'
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Parar de seguir',
+    'Unwatch': 'Unwatch',
     'Updating...': 'Updating...',
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
+    'Watch': 'Watch',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -92,6 +98,7 b' var _TM = {'
     'enabled': 'enabled',
     'file': 'file',
     'files': 'arquivos',
+    'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
@@ -118,8 +125,10 b' var _TM = {'
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
+    '{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} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',

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

@@ -8,6 +8,7 b' var _TM = {'
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Добавить другой комментарий',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
@@ -63,6 +64,7 b' var _TM = {'
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
     'Show at Commit ': 'Show at Commit ',
+    'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Показать еще',
     'Show selected commit __S': 'Show selected commit __S',
@@ -70,8 +72,10 b' var _TM = {'
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': 'Наблюдать за репозиторием',
+    'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Отменить наблюдение за репозиторием',
+    'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Применение...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
@@ -80,9 +84,11 b' var _TM = {'
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Не наблюдать',
+    'Unwatch': 'Unwatch',
     'Updating...': 'Updating...',
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
+    'Watch': 'Watch',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -92,6 +98,7 b' var _TM = {'
     'enabled': 'enabled',
     'file': 'file',
     'files': 'файлы',
+    'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
@@ -118,8 +125,10 b' var _TM = {'
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
+    '{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} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',

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

@@ -8,6 +8,7 b' var _TM = {'
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Add another comment',
     'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All Authors': 'All Authors',
     'All individual reviewers must vote.': 'All individual reviewers must vote.',
     'All reviewers must vote.': 'All reviewers must vote.',
     'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
@@ -63,6 +64,7 b' var _TM = {'
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
     'Show at Commit ': 'Show at Commit ',
+    'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}',
     'Show full context diff': 'Show full context diff',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
@@ -70,8 +72,10 b' var _TM = {'
     'Show whitespace changes': 'Show whitespace changes',
     'Specified expiration date': 'Specified expiration date',
     'Start following this repository': '开始关注该版本库',
+    'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': '停止关注该版本库',
+    'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': '提交中……',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
@@ -80,9 +84,11 b' var _TM = {'
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
+    'Unwatch': 'Unwatch',
     'Updating...': 'Updating...',
     'User `{0}` already in reviewers': 'User `{0}` already in reviewers',
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
+    'Watch': 'Watch',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'activated': 'activated',
@@ -92,6 +98,7 b' var _TM = {'
     'enabled': 'enabled',
     'file': 'file',
     'files': '文件',
+    'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
@@ -118,8 +125,10 b' var _TM = {'
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
+    '{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} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',

rhodecode/public/js/rhodecode/routes.js

@@ -239,6 +239,7 b' function registerRCRoutes() {'
     pyroutes.register('edit_repo_advanced_hooks', '/%(repo_name)s/settings/advanced/hooks', ['repo_name']);
     pyroutes.register('edit_repo_caches', '/%(repo_name)s/settings/caches', ['repo_name']);
     pyroutes.register('edit_repo_perms', '/%(repo_name)s/settings/permissions', ['repo_name']);
+    pyroutes.register('edit_repo_perms_set_private', '/%(repo_name)s/settings/permissions/set_private', ['repo_name']);
     pyroutes.register('edit_repo_maintenance', '/%(repo_name)s/settings/maintenance', ['repo_name']);
     pyroutes.register('edit_repo_maintenance_execute', '/%(repo_name)s/settings/maintenance/execute', ['repo_name']);
     pyroutes.register('edit_repo_fields', '/%(repo_name)s/settings/fields', ['repo_name']);
@@ -262,8 +263,10 b' function registerRCRoutes() {'
     pyroutes.register('strip_check', '/%(repo_name)s/settings/strip_check', ['repo_name']);
     pyroutes.register('strip_execute', '/%(repo_name)s/settings/strip_execute', ['repo_name']);
     pyroutes.register('edit_repo_audit_logs', '/%(repo_name)s/settings/audit_logs', ['repo_name']);
-    pyroutes.register('rss_feed_home', '/%(repo_name)s/feed/rss', ['repo_name']);
-    pyroutes.register('atom_feed_home', '/%(repo_name)s/feed/atom', ['repo_name']);
+    pyroutes.register('rss_feed_home', '/%(repo_name)s/feed-rss', ['repo_name']);
+    pyroutes.register('atom_feed_home', '/%(repo_name)s/feed-atom', ['repo_name']);
+    pyroutes.register('rss_feed_home_old', '/%(repo_name)s/feed/rss', ['repo_name']);
+    pyroutes.register('atom_feed_home_old', '/%(repo_name)s/feed/atom', ['repo_name']);
     pyroutes.register('repo_summary', '/%(repo_name)s', ['repo_name']);
     pyroutes.register('repo_summary_slash', '/%(repo_name)s/', ['repo_name']);
     pyroutes.register('edit_repo_group', '/%(repo_group_name)s/_edit', ['repo_group_name']);

rhodecode/public/js/src/rhodecode/changelog.js

@@ -107,7 +107,10 b' var CommitsController = function () {'
 
         $.each($('.message.truncate'), function(idx, value) {
             if(!(value.offsetWidth < value.scrollWidth)){
-                $(this).closest('td').siblings('.expand_commit').find('i').hide();
+                var expandTd = $(this).closest('td').siblings('.expand_commit');
+                expandTd.find('i').hide();
+                expandTd.removeAttr('title');
+                expandTd.removeClass('expand_commit');
             }
         });
 

rhodecode/templates/admin/repos/repo_add_base.mako

@@ -11,7 +11,7 b''
             <div class="input">
                 ${h.text('repo_name', class_="medium")}
                 <div class="info-block">
-                    <a id="remote_clone_toggle" href="#"><i class="icon-download-alt"></i> ${_('Import Existing Repository ?')}</a>
+                    <a id="remote_clone_toggle" href="#">${_('Import Existing Repository ?')}</a>
                 </div>
                 %if not c.rhodecode_user.is_admin:
                     ${h.hidden('user_created',True)}

rhodecode/templates/admin/repos/repo_edit_advanced.mako

@@ -161,7 +161,7 b''
         <div class="field">
             <button class="btn btn-small btn-danger" type="submit"
                     onclick="return confirm('${_('Confirm to archive this repository: %s') % c.repo_name}');">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
                 ${_('Archive this repository')}
             </button>
         </div>
@@ -217,7 +217,7 b''
         <div class="field">
             <button class="btn btn-small btn-danger" type="submit"
                     onclick="return confirm('${_('Confirm to delete this repository: %s') % c.repo_name}');">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
                 ${_('Delete this repository')}
             </button>
         </div>

rhodecode/templates/admin/repos/repo_edit_permissions.mako

@@ -105,6 +105,10 b''
                                   member="${_user.user_id}" member_type="user">
                             ${_('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.')}">
+                            ${_('set private mode')}
+                            </span>
                           %endif
                         </td>
                         <td class="quick_repo_menu">
@@ -199,4 +203,20 b''
         markRevokePermInput($(this), 'repository');
     });
     quick_repo_menu();
+
+    var enablePrivateRepo = function () {
+        var postData = {
+            'csrf_token': CSRF_TOKEN
+        };
+
+        var success = function(o) {
+            var defaultUrl = pyroutes.url('edit_repo_perms', {"repo_name": templateContext.repo_name});
+            window.location = o.redirect_url || defaultUrl;
+        };
+
+        ajaxPOST(
+            pyroutes.url('edit_repo_perms_set_private', {"repo_name": templateContext.repo_name}),
+            postData,
+            success);
+    }
 </script>

rhodecode/templates/admin/repos/repo_edit_settings.mako

@@ -57,7 +57,7 b''
                     % if not c.form['repo_clone_uri'].error:
                     <div id="clone_uri_hidden" class='text-as-placeholder'>
                         <span id="clone_uri_hidden_value">${c.rhodecode_db_repo.clone_uri_hidden}</span>
-                        <span class="link" id="edit_clone_uri"><i class="icon-edit"></i>${_('edit')}</span>
+                        <span class="link" id="edit_clone_uri">${_('edit')}</span>
                     </div>
                     % endif
 
@@ -99,7 +99,7 b''
                     % if not c.form['repo_push_uri'].error:
                     <div id="push_uri_hidden" class='text-as-placeholder'>
                         <span id="push_uri_hidden_value">${c.rhodecode_db_repo.push_uri_hidden}</span>
-                        <span class="link" id="edit_push_uri"><i class="icon-edit"></i>${_('edit')}</span>
+                        <span class="link" id="edit_push_uri">${_('edit')}</span>
                     </div>
                     % endif
 

rhodecode/templates/admin/settings/settings_exceptions.mako

@@ -27,7 +27,7 b''
         <div class="field">
             <button class="btn btn-small btn-danger" type="submit"
                     onclick="return confirm('${_('Confirm to delete this exception')}');">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
                 ${_('Delete This Exception')}
             </button>
         </div>

rhodecode/templates/admin/settings/settings_exceptions_browse.mako

@@ -17,7 +17,7 b''
         <div class="field">
             <button class="btn btn-small btn-danger" type="submit"
                     onclick="return confirm('${_('Confirm to delete all exceptions')}');">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
                 % if c.type_filter:
                     ${_('Delete All `{}`').format(c.type_filter)}
                 % else:

rhodecode/templates/admin/settings/settings_global.mako

@@ -108,8 +108,8 b''
         <div style="padding: 10px 0px"></div>
         <div class="textarea text-area">
             ${h.textarea('rhodecode_pre_code',cols=23,rows=5,class_="medium")}
-            <span class="help-block">${_('Custom js/css code added at the end of the <header/> tag.')}
-                         ${_('Use <script/> or <css/> tags to define custom styling or scripting')}</span>
+            <span class="help-block">${_('Custom js/css code added at the end of the <head/> tag.')}
+                         ${_('Use <script/> or <style/> tags to define custom scripting or styling.')}</span>
         </div>
     </div>
 </div>
@@ -131,7 +131,7 b''
         <div class="textarea text-area">
             ${h.textarea('rhodecode_post_code',cols=23,rows=5, class_="medium")}
             <span class="help-block">${_('Custom js/css code added at the end of the <body> tag.')}
-                        ${_('Use <script> or <css> tags to define custom styling or scripting')}</span>
+                        ${_('Use <script> or <style> tags to define custom scripting or styling.')}</span>
         </div>
     </div>
 </div>

rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako

@@ -77,7 +77,7 b''
             ${h.hidden('force', 1)}
             <button class="btn btn-small btn-danger" type="submit"
                     onclick="return confirm('${_('Confirm to delete user group `%(ugroup)s` with all permission assignments') % {'ugroup': c.user_group.users_group_name}}');">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
                 ${_('Delete This User Group')}
             </button>
         ${h.end_form()}

rhodecode/templates/admin/user_groups/user_group_edit_settings.mako

@@ -86,7 +86,7 b''
                               </td>
                               <td class="">
                                 <div class="usergroup_member_remove action_button" onclick="removeUserGroupMember(${user.user_id}, true)" style="visibility: visible;">
-                                    <i class="icon-remove-sign"></i>
+                                    <i class="icon-remove"></i>
                                 </div>
                               </td>
                             </tr>
@@ -155,7 +155,7 b''
                           '</td>'+
                           '<td class="td-author-new-entry">'+
                             '<div class="usergroup_member_remove action_button" onclick="removeUserGroupMember({5}, true)" style="visibility: visible;">'+
-                                '<i class="icon-remove-sign"></i>'+
+                                '<i class="icon-remove"></i>'+
                             '</div>'+
                           '</td>'+
                         '</tr>').format(gravatar, userLink, username,

rhodecode/templates/base/base.mako

@@ -217,7 +217,7 b''
         ## Context Actions
         <div class="pull-right">
             %if c.rhodecode_user.username != h.DEFAULT_USER:
-                <a href="${h.route_path('atom_feed_home', repo_name=c.rhodecode_db_repo.repo_name, _query=dict(auth_token=c.rhodecode_user.feed_token))}" title="${_('RSS Feed')}" class="btn btn-sm"><i class="icon-rss-sign"></i>RSS</a>
+                <a href="${h.route_path('atom_feed_home', repo_name=c.rhodecode_db_repo.repo_uid, _query=dict(auth_token=c.rhodecode_user.feed_token))}" title="${_('RSS Feed')}" class="btn btn-sm"><i class="icon-rss-sign"></i>RSS</a>
 
                 <a href="#WatchRepo" onclick="toggleFollowingRepo(this, templateContext.repo_id); return false" title="${_('Watch this Repository and actions on it in your personalized journal')}" class="btn btn-sm ${('watching' if c.repository_is_user_following else '')}">
                     % if c.repository_is_user_following:
@@ -228,7 +228,7 b''
 
                 </a>
             %else:
-                <a href="${h.route_path('atom_feed_home', repo_name=c.rhodecode_db_repo.repo_name)}" title="${_('RSS Feed')}" class="btn btn-sm"><i class="icon-rss-sign"></i>RSS</a>
+                <a href="${h.route_path('atom_feed_home', repo_name=c.rhodecode_db_repo.repo_uid)}" title="${_('RSS Feed')}" class="btn btn-sm"><i class="icon-rss-sign"></i>RSS</a>
             %endif
         </div>
 

rhodecode/templates/codeblocks/diffs.mako

@@ -556,7 +556,7 b' def get_comments_for(diff_type, comments'
             %if line_old_comments:
                 <% has_outdated = any([x.outdated for x in line_old_comments]) %>
                 % if has_outdated:
-                    <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % else:
                     <i title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % endif
@@ -599,7 +599,7 b' def get_comments_for(diff_type, comments'
             %if line_new_comments:
                 <% has_outdated = any([x.outdated for x in line_new_comments]) %>
                 % if has_outdated:
-                    <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % else:
                     <i title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % endif
@@ -655,7 +655,7 b' def get_comments_for(diff_type, comments'
             % if comments:
                 <% has_outdated = any([x.outdated for x in comments]) %>
                 % if has_outdated:
-                    <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % else:
                     <i title="${_('comments')}: ${len(comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % endif

rhodecode/templates/data_table/_dt_elements.mako

@@ -165,7 +165,8 b''
   <div>
     <div class="grid_edit">
       <a href="${h.route_path('edit_repo',repo_name=repo_name)}" title="${_('Edit')}">
-        <i class="icon-pencil"></i>Edit</a>
+        Edit
+      </a>
     </div>
     <div class="grid_delete">
       ${h.secure_form(h.route_path('edit_repo_advanced_delete', repo_name=repo_name), request=request)}
@@ -252,7 +253,8 b''
 <%def name="user_actions(user_id, username)">
  <div class="grid_edit">
    <a href="${h.route_path('user_edit',user_id=user_id)}" title="${_('Edit')}">
-     <i class="icon-pencil"></i>${_('Edit')}</a>
+     ${_('Edit')}
+   </a>
  </div>
  <div class="grid_delete">
   ${h.secure_form(h.route_path('user_delete', user_id=user_id), request=request)}

rhodecode/templates/debug_style/code-block.html

@@ -470,7 +470,7 b''
                   <a class="btn btn-mini" href="/example/annotate/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">annotation</a>
                 <a class="btn btn-mini" href="/example/raw/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">raw</a>
                 <a class="btn btn-mini" href="/example/rawfile/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">
-                    <i class="icon-archive"></i> download
+                    download
                 </a>
 
                   <a class="btn btn-mini disabled tooltip" href="#" title="Editing files allowed only when on branch head commit">edit</a>
@@ -648,7 +648,7 b' File Edit'
                         <a class="btn btn-mini" href="/example/files/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">source</a>
                       <a class="btn btn-mini" href="/example/raw/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">raw</a>
                       <a class="btn btn-mini" href="/example/rawfile/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">
-                          <i class="icon-archive"></i> download
+                          download
                       </a>
                 </div>
             </div>

rhodecode/templates/debug_style/collapsable-content.html

@@ -150,7 +150,7 b''
                 </div>
                   <input id="reviewer_70_input" type="hidden" value="70" name="review_members">
                   <div class="reviewer_member_remove action_button" onclick="removeReviewMember(70, true)" style="visibility: hidden;">
-                    <i class="icon-remove-sign"></i>
+                    <i class="icon-remove"></i>
                   </div>
               </li>
               <li id="reviewer_33" class="collapsable-content" data-toggle="reviewers">

rhodecode/templates/debug_style/form-elements-small.html

@@ -250,7 +250,7 b''
                 <div class='input'>
                   <input id="05_example_input" type="text" readonly="readonly" placeholder="Example input">
                   <span class="btn action_button btn-x">
-                    <i class="icon-remove-sign"></i>
+                    <i class="icon-remove"></i>
                     delete
                   </span>
                   <span class="help-block">

rhodecode/templates/debug_style/form-elements.html

@@ -42,7 +42,7 b''
                 <div class='input'>
                   <div class='text-as-placeholder'>
                     http://something.example.com
-                    <span class="link" id="edit_clone_uri"><i class="icon-edit"></i>${_('edit')}</span>
+                    <span class="link" id="edit_clone_uri">${_('edit')}</span>
                   </div>
                   <p class='help-block'>Help text in a paragraph.</p>
                 </div>
@@ -339,7 +339,7 b''
                 <div class='input'>
                   <input id="05_example_input" type="text" readonly="readonly" placeholder="Example input">
                   <span class="btn btn-x">
-                    <i class="icon-remove-sign"></i>
+                    <i class="icon-remove"></i>
                     delete
                   </span>
                   <button class='btn btn-primary'>Action</button>

rhodecode/templates/debug_style/tables-wide.html

@@ -47,7 +47,6 b''
           <td>
              <div class="grid_edit">
                <a class="edit_issuetracker_entry" uid="4980baa2985b361e6e91b932f4a897d5" title="edit" href="#">
-                 <i class="icon-pencil"></i>
                    <input type="submit" value="edit" class="btn btn-link">
                </a>
              </div>
@@ -59,7 +58,7 b''
 
 <div style="display: none;"><input type="hidden" value="05adf5bfb9be3766186f25db19b545134c6b0077" name="csrf_token" id="csrf_token"></div>
                     <input type="hidden" value="4980baa2985b361e6e91b932f4a897d5" name="del_uid" id="del_uid">
-                    <i class="icon-remove-sign"></i>
+                    <i class="icon-remove"></i>
                     <input type="submit" value="delete" onclick="return confirm('Confirm to remove this pattern: kjlakjlkjlkj;lkjl;kjl;kjl;kjl;kj;lkj');" id="remove_user_3" class="btn btn-link btn-danger">
                 </form>
              </div>
@@ -74,7 +73,6 b''
           <td>
              <div class="grid_edit">
                <a class="edit_issuetracker_entry" uid="98ac51a4ab43bb36a4feceed15ac5b21" title="edit" href="#">
-                 <i class="icon-pencil"></i>
                    <input type="submit" value="edit" class="btn btn-link">
                </a>
              </div>
@@ -86,7 +84,7 b''
 
 <div style="display: none;"><input type="hidden" value="05adf5bfb9be3766186f25db19b545134c6b0077" name="csrf_token" id="csrf_token"></div>
                     <input type="hidden" value="98ac51a4ab43bb36a4feceed15ac5b21" name="del_uid" id="del_uid">
-                    <i class="icon-remove-sign"></i>
+                    <i class="icon-remove"></i>
                     <input type="submit" value="delete" onclick="return confirm('Confirm to remove this pattern: kajls;kdjfal;skdjflaskdjflksjdlfksjdlfksjdlfkjsldkfjslkdjflskdjflkdsjf');" id="remove_user_3" class="btn btn-link btn-danger">
                 </form>
              </div>
@@ -101,7 +99,6 b''
           <td>
              <div class="grid_edit">
                <a class="edit_issuetracker_entry" uid="098f6bcd4621d373cade4e832627b4f6" title="edit" href="#">
-                 <i class="icon-pencil"></i>
                    <input type="submit" value="edit" class="btn btn-link">
                </a>
              </div>
@@ -113,7 +110,7 b''
 
 <div style="display: none;"><input type="hidden" value="05adf5bfb9be3766186f25db19b545134c6b0077" name="csrf_token" id="csrf_token"></div>
                     <input type="hidden" value="098f6bcd4621d373cade4e832627b4f6" name="del_uid" id="del_uid">
-                    <i class="icon-remove-sign"></i>
+                    <i class="icon-remove"></i>
                     <input type="submit" value="delete" onclick="return confirm('Confirm to remove this pattern: test');" id="remove_user_3" class="btn btn-link btn-danger">
                 </form>
              </div>

rhodecode/templates/debug_style/tables.html

@@ -236,11 +236,12 b''
             <td class="td-action">
               <div class="grid_edit">
                 <a href="/_admin/users/2/edit" title="edit">
-                  <i class="icon-pencil"></i>Edit</a>
+                    Edit
+                </a>
               </div>
               <div class="grid_delete">
               <form action="/_admin/users/2" method="post">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
                 <input class="btn btn-danger btn-link" id="remove_user_2" name="remove_"  type="submit" value="delete">
               </form>
              </div>

rhodecode/templates/ejs_templates/templates.html

@@ -104,12 +104,12 b' var CG = new ColorGenerator();'
 
       <% if (mandatory) { %>
             <div class="reviewer_member_mandatory_remove" style="visibility: <%= edit_visibility %>;">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
             </div>
       <% } else { %>
         <% if (allowed_to_update) { %>
           <div class="reviewer_member_remove action_button" onclick="reviewersController.removeReviewMember(<%= member.user_id %>, true)" style="visibility: <%= edit_visibility %>;">
-              <i class="icon-remove-sign" ></i>
+              <i class="icon-remove" ></i>
           </div>
         <% } %>
       <% } %>

rhodecode/templates/summary/components.mako

@@ -186,7 +186,7 b''
                 % else:
                     <span class="enabled">
                         <a id="archive_link" class="btn btn-small" href="${h.route_path('repo_archivefile',repo_name=c.rhodecode_db_repo.repo_name,fname='tip.zip')}">
-                            <i class="icon-archive"></i> tip.zip
+                            tip.zip
                             ## replaced by some JS on select
                         </a>
                     </span>

rhodecode/templates/summary/summary.mako

@@ -90,7 +90,7 b''
         var fname = e.added.raw_id + ext;
         var href = pyroutes.url('repo_archivefile', {'repo_name': templateContext.repo_name, 'fname':fname});
         // set new label
-        $('#archive_link').html('<i class="icon-archive"></i> {0}{1}'.format(escapeHtml(e.added.text), ext));
+        $('#archive_link').html('{0}{1}'.format(escapeHtml(e.added.text), ext));
 
         // set new url to button,
         $('#archive_link').attr('href', href)

rhodecode/templates/summary/summary_base.mako

@@ -2,7 +2,7 b''
 
 <%def name="title()">
     ## represents page title
-    ${_('%s Summary') % c.repo_name}
+    ${_('{} Summary').format(c.repo_name)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
@@ -10,8 +10,8 b''
 
 
 <%def name="head_extra()">
-    <link href="${h.route_path('atom_feed_home', repo_name=c.rhodecode_db_repo.repo_name, _query=dict(auth_token=c.rhodecode_user.feed_token))}" rel="alternate" title="${h.tooltip(_('%s ATOM feed') % c.repo_name)}" type="application/atom+xml" />
-    <link href="${h.route_path('rss_feed_home', repo_name=c.rhodecode_db_repo.repo_name, _query=dict(auth_token=c.rhodecode_user.feed_token))}" rel="alternate" title="${h.tooltip(_('%s RSS feed') % c.repo_name)}" type="application/rss+xml" />
+    <link href="${h.route_path('atom_feed_home', repo_name=c.rhodecode_db_repo.repo_uid, _query=dict(auth_token=c.rhodecode_user.feed_token))}" rel="alternate" title="${h.tooltip(_('%s ATOM feed') % c.repo_name)}" type="application/atom+xml" />
+    <link href="${h.route_path('rss_feed_home', repo_name=c.rhodecode_db_repo.repo_uid, _query=dict(auth_token=c.rhodecode_user.feed_token))}" rel="alternate" title="${h.tooltip(_('%s RSS feed') % c.repo_name)}" type="application/rss+xml" />
 </%def>
 
 

rhodecode/tests/integrations/test_integration.py

@@ -128,7 +128,7 b' def integration_repos(request, StubInteg'
             'root_repo': root_repo,
             'other_repo': other_repo,
             'parent_repo': parent_repo,
-                'child_repo': child_repo,
+            'child_repo': child_repo,
         }
     }
 
@@ -151,9 +151,9 b' def test_enabled_integration_repo_scopes'
 
     assert triggered_integrations == [
         integrations['global'],
-        integrations['other_repo'],
         integrations['other_group'],
         integrations['other_group_recursive'],
+        integrations['other_repo'],
     ]
 
     triggered_integrations = IntegrationModel().get_for_event(
@@ -161,9 +161,9 b' def test_enabled_integration_repo_scopes'
 
     assert triggered_integrations == [
         integrations['global'],
-        integrations['parent_repo'],
         integrations['parent_group'],
         integrations['parent_group_recursive'],
+        integrations['parent_repo'],
     ]
 
     triggered_integrations = IntegrationModel().get_for_event(
@@ -171,10 +171,10 b' def test_enabled_integration_repo_scopes'
 
     assert triggered_integrations == [
         integrations['global'],
-        integrations['child_repo'],
+        integrations['child_group'],
         integrations['parent_group_recursive'],
-        integrations['child_group'],
         integrations['child_group_recursive'],
+        integrations['child_repo'],
     ]
 
 

rhodecode/tests/load/time_urls.py

@@ -19,51 +19,55 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import timeit
+import logging
+import click
 
-server = "localhost:5000"
+log = logging.getLogger(__name__)
+
 
-pages = [
-    "cpython",
-    "cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Makefile.pre.in",
-    "cpython/changelog",
-    "cpython/changeset/e0f681f4ade3af52915d5f32daac97ada580d71a",
-    "cpython/compare/tag@v3.4.1rc1...tag@v3.4.1?target_repo=cpython",
-    "cpython/files/tip/",
-    "cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Grammar",
-    "",
-    "git",
-    "git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/.gitignore",
-    "git/changelog",
-    "git/changeset/d299e9e550c1bf8640907fdba1f03cc585ee71df",
-    "git/compare/rev@1200...rev@1300?target_repo=git",
-    "git/files/tip/",
-    "git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/.gitignore"
-]
[e-mail]()
[e-mail]('--server', help='Server url to connect to. e.g http://rc.local.com', required=True)
[e-mail]('--pages', help='load pages to visit from a file', required=True, type=click.File())
[e-mail]('--repeat', help='number of times to repeat', default=10, type=int)
+def main(server, repeat, pages):
+
+    print("Repeating each URL %d times\n" % repeat)
+    pages = pages.readlines()
+
+    for page_url in pages:
+
+        url = "%s/%s" % (server, page_url.strip())
+        print(url)
+
+        stmt = "requests.get('%s', timeout=120)" % url
+        t = timeit.Timer(stmt=stmt, setup="import requests")
 
-svn_pages = [
-    "svn-apache",
-    "svn-apache/annotate/672129/cocoon/trunk/README.txt",
-    "svn-apache/changelog",
-    "svn-apache/changeset/1164362",
-    "svn-apache/compare/rev@1164350...rev@1164360?target_repo=svn-apache",
-    "svn-apache/compare/rev@1164300...rev@1164360?target_repo=svn-apache",
-    "svn-apache/files/tip/",
-    "svn-apache/files/1164363/cocoon/trunk/README.txt",
-]
+        result = t.repeat(repeat=repeat, number=1)
+        print("  %.3f (min) - %.3f (max) - %.3f (avg)\n" %
+              (min(result), max(result), sum(result) / len(result)))
+
 
-# Uncomment to check also svn performance
-# pages = pages + svn_pages
+if __name__ == '__main__':
+    main()
+
+
+
+
+
+
+
 
-repeat = 10
+
+
 
-print("Repeating each URL x%d\n" % repeat)
-for page in pages:
-    url = "http://%s/%s" % (server, page)
-    print(url)
+
+
+
 
-    stmt = "urllib2.urlopen('%s', timeout=120)" % url
-    t = timeit.Timer(stmt=stmt, setup="import urllib2")
+
+
+
 
-    result = t.repeat(repeat=repeat, number=1)
-    print("\t%.3f (min) - %.3f (max) - %.3f (avg)\n" %
-          (min(result), max(result), sum(result)/len(result)))
+
+
+

rhodecode/tests/load/vcs_performance.py

@@ -108,12 +108,12 b' class Repository(object):'
         self.name = name
         self.path = os.path.join(base_path, name)
         self.api = api
+        self.url = None
 
     def create(self):
         self._create_filesystem_repo(self.path)
         try:
-            self.url = self.api.create_repo(
-                self.name, self.TYPE, 'Performance tests')
+            self.url = self.api.create_repo(self.name, self.TYPE, 'Performance tests')
         except ApiError as e:
             log.error('api: {}'.format(e))
 
@@ -127,7 +127,7 b' class Repository(object):'
     def create_commits(self, number, file_size):
         for i in xrange(number):
             file_name = self.FILE_NAME_TEMPLATE.format(i)
-            log.debug("Create commit {}".format(file_name))
+            log.debug("Create commit[{}] {}".format(self.name, file_name))
             self._create_file(file_name, file_size)
             self._create_commit(file_name)
 
@@ -258,8 +258,8 b' class Benchmark(object):'
         for operation in operations:
             for type_ in repos:
                 times = self._measure(repos[type_], *operation)
-                print("Mean {} {} time: {:.3f} sec.".format(
-                    type_, operation[0], mean(times)))
+                print("Mean[of {}] {:5s} {:5s} time: {:.3f} sec.".format(
+                    len(times), type_, operation[0], mean(times)))
 
     def cleanup(self):
         log.info("Cleaning up...")
@@ -296,6 +296,7 b' class Benchmark(object):'
         log.addHandler(handler)
         log.setLevel(log_level)
 
+
 if __name__ == '__main__':
     config = Config()
     benchmark = Benchmark(config)

rhodecode/tests/utils.py

@@ -392,7 +392,7 b' def is_url_reachable(url):'
     try:
         urllib2.urlopen(url)
     except urllib2.URLError:
-        log.exception('URL Reach error')
+        log.exception('URL `{}` reach error'.format(url))
         return False
     return True