merged with stable

docs/release-notes/release-notes-4.25.1.rst

@@ -0,0 +1,40 b''
+|RCE| 4.25.1 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2021-04-06
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+
+
+Security
+^^^^^^^^
+
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+Fixes
+^^^^^
+
+- Artifacts: fixed admin panel bad urls generated for the new artifacts admin view in CE edition.
+
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Un-scheduled release addressing problems in 4.25.X releases.

docs/release-notes/release-notes-4.25.2.rst

@@ -0,0 +1,53 b''
+|RCE| 4.25.2 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2021-04-14
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+- Comments: refresh on draft sidebar on draft submit.
+- Vcsserver: log exceptions into the logs
+- Archiving: make it explicit archiving a repo is irreversible.
+- My-account: updated bookmarks UX
+- Pull requests: added awaiting my review filter for users pull-requests.
+  Additionally the awaiting my review now properly filters pull requests that have no review votes on them.
+
+
+Security
+^^^^^^^^
+
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+Fixes
+^^^^^
+
+- Draft comments: fixed logic in toggle all draft for submit.
+- Draft comments: when submitting edited drafts also clear the history to prevent DB problems.
+- Mercurial: fixed a case of lookup branches that had 40 characters in length.
+- Gists: block id input for public gists.
+- Pull requests: fixed problems with unicode characters in branches.
+- Pull requests: small ui fix for grid.
+- Summary: fixed ui on summary page for non-admins.
+  The setup instructions were broken if user had no write permissions.
+- Users: make user data loading more resilient to errors.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Scheduled release addressing problems in 4.25.X releases.

rhodecode/apps/admin/views/artifacts.py

@@ -0,0 +1,40 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2020 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+
+from rhodecode.apps._base import BaseAppView, DataGridAppView
+from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
+
+log = logging.getLogger(__name__)
+
+
+class AdminArtifactsView(BaseAppView, DataGridAppView):
+
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        return c
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    def artifacts(self):
+        c = self.load_default_context()
+        c.active = 'artifacts'
+        return self._get_template_context(c)

rhodecode/templates/admin/artifacts/artifacts.mako

@@ -0,0 +1,39 b''
+## -*- coding: utf-8 -*-
+<%inherit file="/base/base.mako"/>
+
+<%def name="title()">
+    ${_('Artifacts Admin')}
+    %if c.rhodecode_name:
+        &middot; ${h.branding(c.rhodecode_name)}
+    %endif
+</%def>
+
+<%def name="breadcrumbs_links()"></%def>
+
+<%def name="menu_bar_nav()">
+    ${self.menu_items(active='admin')}
+</%def>
+
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='artifacts')}
+</%def>
+
+<%def name="main()">
+
+<div class="box">
+
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">${_('Artifacts Administration.')}</h3>
+        </div>
+        <div class="panel-body">
+            <h4>${_('This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license.').format(sales_email='<a href="mailto:[e-mail]">[e-mail]</a>')|n}</h4>
+
+        </div>
+    </div>
+
+</div>
+
+
+</%def>
+

.bumpversion.cfg

@@ -1,5 +1,6 b''
 [bumpversion]
-current_version = 4.25.0
+current_version = 4.25.2
 message = release: Bump version {current_version} to {new_version}
 
 [bumpversion:file:rhodecode/VERSION]
+

.hgtags

@@ -75,3 +75,6 b' 56310d93b33b97535908ef9c7b0985b89bb7fad2'
 7637c38528fa38c1eabc1fde6a869c20995a0da7 v4.23.2
 6aeb4ac3ef7f0ac699c914740dad3688c9495e83 v4.24.0
 6eaf953da06e468a4c4e5239d3d0e700bda6b163 v4.24.1
+f8161cbc2d94a935d3c395a0e758d9a094287169 v4.25.0
+77fe47b5b39338e71b2c040de2c0359b529b6251 v4.25.1
+27475bd8a718b9a00a37a8563c4927120865ad85 v4.25.2

.release.cfg

@@ -21,7 +21,7 b' done = true'
 
 [release]
 state = prepared
-version = 4.11.6
+version = 4.25.2
 
 [task:updated_translation]
 

docs/release-notes/release-notes.rst

@@ -9,6 +9,8 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.25.2.rst
+   release-notes-4.25.1.rst
    release-notes-4.25.0.rst
    release-notes-4.24.1.rst
    release-notes-4.24.0.rst

pkgs/python-packages.nix

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

rhodecode/VERSION

@@ -1,1 +1,1 b''
-4.25.0
  No newline at end of file
+4.25.2
  No newline at end of file

rhodecode/api/views/repo_group_api.py

@@ -232,6 +232,9 b' def create_repo_group('
             user=apiuser)
 
         Session().commit()
+
+        PermissionModel().trigger_permission_flush()
+
         return {
             'msg': 'Created new repo group `%s`' % validated_group_name,
             'repo_group': repo_group.get_api_data()

rhodecode/apps/admin/__init__.py

@@ -27,6 +27,7 b' def admin_routes(config):'
     Admin prefixed routes
     """
     from rhodecode.apps.admin.views.audit_logs import AdminAuditLogsView
+    from rhodecode.apps.admin.views.artifacts import AdminArtifactsView
     from rhodecode.apps.admin.views.defaults import AdminDefaultSettingsView
     from rhodecode.apps.admin.views.exception_tracker import ExceptionsTrackerView
     from rhodecode.apps.admin.views.main_views import AdminMainView
@@ -60,6 +61,34 b' def admin_routes(config):'
         route_name='admin_audit_log_entry', request_method='GET',
         renderer='rhodecode:templates/admin/admin_audit_log_entry.mako')
 
+    # Artifacts EE feature
+    config.add_route(
+        'admin_artifacts',
+        pattern=ADMIN_PREFIX + '/artifacts')
+    config.add_route(
+        'admin_artifacts_show_all',
+        pattern=ADMIN_PREFIX + '/artifacts')
+    config.add_view(
+        AdminArtifactsView,
+        attr='artifacts',
+        route_name='admin_artifacts', request_method='GET',
+        renderer='rhodecode:templates/admin/artifacts/artifacts.mako')
+    config.add_view(
+        AdminArtifactsView,
+        attr='artifacts',
+        route_name='admin_artifacts_show_all', request_method='GET',
+        renderer='rhodecode:templates/admin/artifacts/artifacts.mako')
+    # EE views
+    config.add_route(
+        name='admin_artifacts_show_info',
+        pattern=ADMIN_PREFIX + '/artifacts/{uid}')
+    config.add_route(
+        name='admin_artifacts_delete',
+        pattern=ADMIN_PREFIX + '/artifacts/{uid}/delete')
+    config.add_route(
+        name='admin_artifacts_update',
+        pattern=ADMIN_PREFIX + '/artifacts/{uid}/update')
+
     config.add_route(
         name='admin_settings_open_source',
         pattern='/settings/open_source')

rhodecode/apps/admin/views/repo_groups.py

@@ -349,13 +349,7 b' class AdminRepoGroupsView(BaseAppView, D'
                     % repo_group_name, category='error')
             raise HTTPFound(h.route_path('home'))
 
-        affected_user_ids = [self._rhodecode_user.user_id]
-        if copy_permissions:
-            user_group_perms = repo_group.permissions(expand_from_user_groups=True)
-            copy_perms = [perm['user_id'] for perm in user_group_perms]
-            # also include those newly created by copy
-            affected_user_ids.extend(copy_perms)
-        PermissionModel().trigger_permission_flush(affected_user_ids)
+        PermissionModel().trigger_permission_flush()
 
         raise HTTPFound(
             h.route_path('repo_group_home',

rhodecode/apps/admin/views/repositories.py

@@ -242,11 +242,7 b' class AdminReposView(BaseAppView, DataGr'
 
         repo_name = form_result.get('repo_name_full')
 
-        affected_user_ids = [self._rhodecode_user.user_id]
-        if copy_permissions:
-            # permission flush is done in repo creating
-            pass
-        PermissionModel().trigger_permission_flush(affected_user_ids)
+        PermissionModel().trigger_permission_flush()
 
         raise HTTPFound(
             h.route_path('repo_creating', repo_name=repo_name,

rhodecode/apps/my_account/tests/test_my_account_edit.py

@@ -76,7 +76,11 b' class TestMyAccountEdit(TestController):'
                              'requests requiring your participation.')
 
     @pytest.mark.backends("git", "hg")
-    def test_my_account_my_pullrequests_data(self, pr_util, xhr_header):
+    @pytest.mark.parametrize('params, expected_title', [
+        ({'closed': 1}, 'Closed'),
+        ({'awaiting_my_review': 1}, 'Awaiting my review'),
+    ])
+    def test_my_account_my_pullrequests_data(self, pr_util, xhr_header, params, expected_title):
         self.log_user()
         response = self.app.get(route_path('my_account_pullrequests_data'),
                                 extra_environ=xhr_header)

rhodecode/apps/my_account/views/my_account.py

@@ -43,7 +43,7 b' from rhodecode.model.comment import Comm'
 from rhodecode.model.db import (
     IntegrityError, or_, in_filter_generator,
     Repository, UserEmailMap, UserApiKeys, UserFollowing,
-    PullRequest, UserBookmark, RepoGroup)
+    PullRequest, UserBookmark, RepoGroup, ChangesetStatus)
 from rhodecode.model.meta import Session
 from rhodecode.model.pull_request import PullRequestModel
 from rhodecode.model.user import UserModel
@@ -654,21 +654,31 b' class MyAccountView(BaseAppView, DataGri'
         Session().commit()
         return user.user_data['notification_status']
 
-    def _get_pull_requests_list(self, statuses):
+    def _get_pull_requests_list(self, statuses, filter_type=None):
         draw, start, limit = self._extract_chunk(self.request)
         search_q, order_by, order_dir = self._extract_ordering(self.request)
 
         _render = self.request.get_partial_renderer(
             'rhodecode:templates/data_table/_dt_elements.mako')
 
-        pull_requests = PullRequestModel().get_im_participating_in(
-            user_id=self._rhodecode_user.user_id,
-            statuses=statuses, query=search_q,
-            offset=start, length=limit, order_by=order_by,
-            order_dir=order_dir)
+        if filter_type == 'awaiting_my_review':
+            pull_requests = PullRequestModel().get_im_participating_in_for_review(
+                user_id=self._rhodecode_user.user_id,
+                statuses=statuses, query=search_q,
+                offset=start, length=limit, order_by=order_by,
+                order_dir=order_dir)
 
-        pull_requests_total_count = PullRequestModel().count_im_participating_in(
-            user_id=self._rhodecode_user.user_id, statuses=statuses, query=search_q)
+            pull_requests_total_count = PullRequestModel().count_im_participating_in_for_review(
+                user_id=self._rhodecode_user.user_id, statuses=statuses, query=search_q)
+        else:
+            pull_requests = PullRequestModel().get_im_participating_in(
+                user_id=self._rhodecode_user.user_id,
+                statuses=statuses, query=search_q,
+                offset=start, length=limit, order_by=order_by,
+                order_dir=order_dir)
+
+            pull_requests_total_count = PullRequestModel().count_im_participating_in(
+                user_id=self._rhodecode_user.user_id, statuses=statuses, query=search_q)
 
         data = []
         comments_model = CommentsModel()
@@ -678,6 +688,12 b' class MyAccountView(BaseAppView, DataGri'
                 repo_id, pull_request=pr, include_drafts=False, count_only=True)
             owned = pr.user_id == self._rhodecode_user.user_id
 
+            review_statuses = pr.reviewers_statuses(user=self._rhodecode_db_user)
+            my_review_status = ChangesetStatus.STATUS_NOT_REVIEWED
+            if review_statuses and review_statuses[4]:
+                _review_obj, _user, _reasons, _mandatory, statuses = review_statuses
+                my_review_status = statuses[0][1].status
+
             data.append({
                 'target_repo': _render('pullrequest_target_repo',
                                        pr.target_repo.repo_name),
@@ -688,6 +704,8 b' class MyAccountView(BaseAppView, DataGri'
                 'name_raw': pr.pull_request_id,
                 'status': _render('pullrequest_status',
                                   pr.calculated_review_status()),
+                'my_status': _render('pullrequest_status',
+                                     my_review_status),
                 'title': _render('pullrequest_title', pr.title, pr.description),
                 'description': h.escape(pr.description),
                 'updated_on': _render('pullrequest_updated_on',
@@ -723,7 +741,14 b' class MyAccountView(BaseAppView, DataGri'
         c.active = 'pullrequests'
         req_get = self.request.GET
 
-        c.closed = str2bool(req_get.get('pr_show_closed'))
+        c.closed = str2bool(req_get.get('closed'))
+        c.awaiting_my_review = str2bool(req_get.get('awaiting_my_review'))
+
+        c.selected_filter = 'all'
+        if c.closed:
+            c.selected_filter = 'all_closed'
+        if c.awaiting_my_review:
+            c.selected_filter = 'awaiting_my_review'
 
         return self._get_template_context(c)
 
@@ -732,13 +757,19 b' class MyAccountView(BaseAppView, DataGri'
     def my_account_pullrequests_data(self):
         self.load_default_context()
         req_get = self.request.GET
+
+        awaiting_my_review = str2bool(req_get.get('awaiting_my_review'))
         closed = str2bool(req_get.get('closed'))
 
         statuses = [PullRequest.STATUS_NEW, PullRequest.STATUS_OPEN]
         if closed:
             statuses += [PullRequest.STATUS_CLOSED]
 
-        data = self._get_pull_requests_list(statuses=statuses)
+        filter_type = \
+            'awaiting_my_review' if awaiting_my_review \
+            else None
+
+        data = self._get_pull_requests_list(statuses=statuses, filter_type=filter_type)
         return data
 
     @LoginRequired()

rhodecode/apps/repository/tests/test_pull_requests_list.py

@@ -41,7 +41,7 b' class TestPullRequestList(object):'
 
     @pytest.mark.parametrize('params, expected_title', [
         ({'source': 0, 'closed': 1}, 'Closed'),
-        ({'source': 0, 'my': 1}, 'Opened by me'),
+        ({'source': 0, 'my': 1}, 'Created by me'),
         ({'source': 0, 'awaiting_review': 1}, 'Awaiting review'),
         ({'source': 0, 'awaiting_my_review': 1}, 'Awaiting my review'),
         ({'source': 1}, 'From this repo'),

rhodecode/apps/repository/views/repo_commits.py

@@ -539,8 +539,14 b' class RepoCommitsView(RepoAppView):'
     @CSRFRequired()
     def repo_commit_comment_history_view(self):
         c = self.load_default_context()
+        comment_history_id = self.request.matchdict['comment_history_id']
 
-        comment_history_id = self.request.matchdict['comment_history_id']
+        comment = ChangesetComment.get_or_404(comment_history_id)
+        comment_owner = (comment.author.user_id == self._rhodecode_db_user.user_id)
+        if comment.draft and not comment_owner:
+            # if we see draft comments history, we only allow this for owner
+            raise HTTPNotFound()
+
         comment_history = ChangesetCommentHistory.get_or_404(comment_history_id)
         is_repo_comment = comment_history.comment.repo.repo_id == self.db_repo.repo_id
 
@@ -549,8 +555,7 b' class RepoCommitsView(RepoAppView):'
 
             rendered_comment = render(
                 'rhodecode:templates/changeset/comment_history.mako',
-                self._get_template_context(c)
-                , self.request)
+                self._get_template_context(c), self.request)
             return rendered_comment
         else:
             log.warning('No permissions for user %s to show comment_history_id: %s',

rhodecode/apps/repository/views/repo_pull_requests.py

@@ -39,7 +39,7 b' from rhodecode.lib.ext_json import json'
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAny, HasRepoPermissionAnyDecorator,
     NotAnonymous, CSRFRequired)
-from rhodecode.lib.utils2 import str2bool, safe_str, safe_unicode, safe_int, aslist
+from rhodecode.lib.utils2 import str2bool, safe_str, safe_unicode, safe_int, aslist, retry
 from rhodecode.lib.vcs.backends.base import (
     EmptyCommit, UpdateFailureReason, unicode_to_reference)
 from rhodecode.lib.vcs.exceptions import (
@@ -79,21 +79,20 b' class RepoPullRequestsView(RepoAppView, '
 
         if filter_type == 'awaiting_review':
             pull_requests = PullRequestModel().get_awaiting_review(
-                repo_name, search_q=search_q, source=source, opened_by=opened_by,
-                statuses=statuses, offset=start, length=limit,
-                order_by=order_by, order_dir=order_dir)
+                repo_name,
+                search_q=search_q, statuses=statuses,
+                offset=start, length=limit, order_by=order_by, order_dir=order_dir)
             pull_requests_total_count = PullRequestModel().count_awaiting_review(
-                repo_name, search_q=search_q, source=source, statuses=statuses,
-                opened_by=opened_by)
+                repo_name,
+                search_q=search_q, statuses=statuses)
         elif filter_type == 'awaiting_my_review':
             pull_requests = PullRequestModel().get_awaiting_my_review(
-                repo_name, search_q=search_q, source=source, opened_by=opened_by,
-                user_id=self._rhodecode_user.user_id, statuses=statuses,
-                offset=start, length=limit, order_by=order_by,
-                order_dir=order_dir)
+                repo_name, self._rhodecode_user.user_id,
+                search_q=search_q, statuses=statuses,
+                offset=start, length=limit, order_by=order_by, order_dir=order_dir)
             pull_requests_total_count = PullRequestModel().count_awaiting_my_review(
-                repo_name, search_q=search_q, source=source, user_id=self._rhodecode_user.user_id,
-                statuses=statuses, opened_by=opened_by)
+                repo_name, self._rhodecode_user.user_id,
+                search_q=search_q, statuses=statuses)
         else:
             pull_requests = PullRequestModel().get_all(
                 repo_name, search_q=search_q, source=source, opened_by=opened_by,
@@ -110,6 +109,12 b' class RepoPullRequestsView(RepoAppView, '
                 self.db_repo.repo_id, pull_request=pr,
                 include_drafts=False, count_only=True)
 
+            review_statuses = pr.reviewers_statuses(user=self._rhodecode_db_user)
+            my_review_status = ChangesetStatus.STATUS_NOT_REVIEWED
+            if review_statuses and review_statuses[4]:
+                _review_obj, _user, _reasons, _mandatory, statuses = review_statuses
+                my_review_status = statuses[0][1].status
+
             data.append({
                 'name': _render('pullrequest_name',
                                 pr.pull_request_id, pr.pull_request_state,
@@ -118,6 +123,8 b' class RepoPullRequestsView(RepoAppView, '
                 'name_raw': pr.pull_request_id,
                 'status': _render('pullrequest_status',
                                   pr.calculated_review_status()),
+                'my_status': _render('pullrequest_status',
+                                     my_review_status),
                 'title': _render('pullrequest_title', pr.title, pr.description),
                 'description': h.escape(pr.description),
                 'updated_on': _render('pullrequest_updated_on',
@@ -1346,9 +1353,13 b' class RepoPullRequestsView(RepoAppView, '
     def _update_commits(self, c, pull_request):
         _ = self.request.translate
 
+        @retry(exception=Exception, n_tries=3)
+        def commits_update():
+            return PullRequestModel().update_commits(
+                pull_request, self._rhodecode_db_user)
+
         with pull_request.set_state(PullRequest.STATE_UPDATING):
-            resp = PullRequestModel().update_commits(
-                pull_request, self._rhodecode_db_user)
+            resp = commits_update()  # retry x3
 
         if resp.executed:
 

rhodecode/i18n/rhodecode.pot

@@ -6,9 +6,9 b''
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rhodecode-enterprise-ce 4.24.0\n"
+"Project-Id-Version: rhodecode-enterprise-ce 4.25.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2021-01-14 15:36+0000\n"
+"POT-Creation-Date: 2021-04-05 19:29+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"
@@ -111,7 +111,7 b' msgstr ""'
 #: rhodecode/apps/admin/views/settings.py:156
 #: rhodecode/apps/admin/views/settings.py:291
 #: rhodecode/apps/admin/views/settings.py:360
-#: rhodecode/apps/admin/views/settings.py:663
+#: rhodecode/apps/admin/views/settings.py:664
 #: rhodecode/apps/repository/views/repo_settings_vcs.py:116
 msgid "Some form inputs contain invalid data."
 msgstr ""
@@ -135,54 +135,54 b' msgstr ""'
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:399
+#: rhodecode/apps/admin/views/settings.py:400
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:402
+#: rhodecode/apps/admin/views/settings.py:403
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:464
+#: rhodecode/apps/admin/views/settings.py:465
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:115
 msgid "Invalid issue tracker pattern: {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:481
+#: rhodecode/apps/admin/views/settings.py:482
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:124
 msgid "Updated issue tracker entries"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:498
+#: rhodecode/apps/admin/views/settings.py:499
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:82
 msgid "Removed issue tracker entry."
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:530
+#: rhodecode/apps/admin/views/settings.py:531
 msgid "Please enter email address"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:546
+#: rhodecode/apps/admin/views/settings.py:547
 msgid "Send email task created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:587
+#: rhodecode/apps/admin/views/settings.py:588
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:602
+#: rhodecode/apps/admin/views/settings.py:603
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:606
+#: rhodecode/apps/admin/views/settings.py:607
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:687
+#: rhodecode/apps/admin/views/settings.py:688
 msgid "Error occurred during updating labs settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:692
+#: rhodecode/apps/admin/views/settings.py:693
 msgid "Updated Labs settings"
 msgstr ""
 
@@ -592,7 +592,7 b' msgstr ""'
 msgid "1 month"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:63 rhodecode/public/js/scripts.js:48529
+#: rhodecode/apps/gist/views.py:63 rhodecode/public/js/scripts.js:48670
 #: rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
 #: rhodecode/public/js/src/rhodecode.js:634
@@ -653,8 +653,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repo_add.mako:19
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12
 #: rhodecode/templates/base/base.mako:114
-#: rhodecode/templates/base/base.mako:133
-#: rhodecode/templates/base/base.mako:1191
+#: rhodecode/templates/base/base.mako:134
+#: rhodecode/templates/base/base.mako:1192
 msgid "Repositories"
 msgstr ""
 
@@ -894,104 +894,104 b' msgstr ""'
 msgid "No such commit exists for this repository. Commit: {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:358
+#: rhodecode/apps/repository/views/repo_files.py:359
 msgid "Downloads disabled"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:364
+#: rhodecode/apps/repository/views/repo_files.py:365
 msgid "Unknown archive type for: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:370
+#: rhodecode/apps/repository/views/repo_files.py:371
 msgid "Unknown commit_id {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:373
+#: rhodecode/apps/repository/views/repo_files.py:374
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:378
+#: rhodecode/apps/repository/views/repo_files.py:384
 msgid "No node at path {} for this repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:429
+#: rhodecode/apps/repository/views/repo_files.py:436
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:986
+#: rhodecode/apps/repository/views/repo_files.py:993
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1007
-#: rhodecode/apps/repository/views/repo_summary.py:243
-#: rhodecode/model/pull_request.py:1910 rhodecode/model/scm.py:999
+#: rhodecode/apps/repository/views/repo_files.py:1014
+#: rhodecode/apps/repository/views/repo_summary.py:239
+#: rhodecode/model/pull_request.py:1912 rhodecode/model/scm.py:999
 #: rhodecode/templates/base/vcs_settings.mako:235
 #: rhodecode/templates/summary/components.mako:10
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1011
+#: rhodecode/apps/repository/views/repo_files.py:1018
 #: rhodecode/model/scm.py:1016 rhodecode/templates/base/vcs_settings.mako:260
 #: rhodecode/templates/summary/components.mako:34
 msgid "Tags"
 msgstr ""