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/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