release: Merge default into stable for release preparation

docs/admin/repo-admin.rst

@@ -0,0 +1,28 b''
+.. _repo-admin-set:
+.. _permissions-info-add-group-ref:
+
+Repository Administration
+=========================
+
+Repository permissions in |RCE| can be managed in a number of different ways.
+This overview should give you an insight into how you could adopt particular
+settings for your needs:
+
+* Global |repo| permissions: This allows you to set the default permissions
+  for each new |repo| created within |RCE|, see :ref:`repo-default-ref`. All
+  |repos| created will inherit these permissions unless explicitly configured.
+* Individual |repo| permissions: To set individual |repo| permissions,
+  see :ref:`set-repo-perms`.
+* Repository Group permissions: This allows you to define the permissions for
+  a group, and all |repos| created within that group will inherit the same
+  permissions.
+
+.. toctree::
+
+    repo_admin/repo-perm-steps
+    repo_admin/repo-extra-fields
+    repo_admin/repo-hooks
+    repo_admin/repo-issue-tracker
+    repo_admin/repo-vcs
+    repo_admin/restore-deleted-repositories
+    repo_admin/repo-admin-tasks
  No newline at end of file

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

@@ -0,0 +1,24 b''
+.. _repo-admin-tasks:
+
+Common Admin Tasks for Repositories
+-----------------------------------
+
+
+Manually Force Delete Repository
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In case of attached forks or pull-requests repositories should be archived.
+Here is how to force delete a repository and remove all dependent objects
+
+
+.. code-block:: bash
+
+    # starts the ishell interactive prompt
+    $ rccontrol ishell enterprise-1
+
+.. code-block:: python
+
+    In [4]: from rhodecode.model.repo import RepoModel
+    In [3]: repo = Repository.get_by_repo_name('test_repos/repo_with_prs')
+    In [5]: RepoModel().delete(repo, forks='detach', pull_requests='delete')
+    In [6]: Session().commit()

docs/admin/user_admin/user-admin-tasks.rst

@@ -0,0 +1,24 b''
+.. _user-admin-tasks:
+
+Common Admin Tasks for Users
+----------------------------
+
+
+Manually Set Personal Repository Group
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Here is how to set a repository group as personal for a user using ishell.
+
+
+.. code-block:: bash
+
+    # starts the ishell interactive prompt
+    $ rccontrol ishell enterprise-1
+
+.. code-block:: python
+
+    In [1]: repo_group = RepoGroup.get_by_group_name('some_group_name')
+    In [2]: user = User.get_by_username('some_user')
+    In [3]: repo_group.user = user
+    In [4]: repo_group.personal = True
+    In [5]: Session().add(repo_group);Session().commit()

docs/api/methods/search-methods.rst

@@ -0,0 +1,35 b''
+.. _search-methods-ref:
+
+search methods
+==============
+
+search 
+------
+
+.. py:function:: search(apiuser, search_query, search_type, page_limit=<Optional:10>, page=<Optional:1>, search_sort=<Optional:'newfirst'>, repo_name=<Optional:None>, repo_group_name=<Optional:None>)
+
+   Fetch Full Text Search results using API.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param search_query: Search query.
+   :type search_query: str
+   :param search_type: Search type. The following are valid options:
+       * commit
+       * content
+       * path
+   :type search_type: str
+   :param page_limit: Page item limit, from 1 to 500. Default 10 items.
+   :type page_limit: Optional(int)
+   :param page: Page number. Default first page.
+   :type page: Optional(int)
+   :param search_sort: Search sort order. Default newfirst. The following are valid options:
+       * newfirst
+       * oldfirst
+   :type search_sort: Optional(str)
+   :param repo_name: Filter by one repo. Default is all.
+   :type repo_name: Optional(str)
+   :param repo_group_name: Filter by one repo group. Default is all.
+   :type repo_group_name: Optional(str)
+
+

docs/release-notes/release-notes-4.17.0.rst

@@ -0,0 +1,85 b''
+|RCE| 4.17.0 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2019-07-04
+
+
+New Features
+^^^^^^^^^^^^
+
+- New artifacts feature.
+  Ability to store binary artifacts for repository with ACL
+- UI/UX refresh for most of the pages. This includes multiple fixes and improvements.
+- Diffs: store wide-diff mode in user sessions to store user preference for diff display.
+- Mercurial: added support for Mercurial 4.9
+- API: Added search API methods
+- Files: adding/editing allows previews for generated content.
+- Files: allowed multi file upload using UI.
+- Repository Groups: last change is now smartly calculated based on latest change
+  from all it's children repositories.
+- Archives: it's now currently possible to download partial directories from files view.
+- SVN: allowed executing pre-commit code with rcextensions, also added example to
+  validate SVN file size and paths on pre-commit level.
+
+
+General
+^^^^^^^
+- Exception store: add filter for display and deletion.
+- Files: loading history doesn't display hidden and obsolete commits anymore.
+- Repositories: bring back missing watch action in summary view.
+- Admin: user groups is now using pure DB filtering to speed up display
+  for large number of groups.
+- Mercurial: enabled full evolve+topic extensions when evolve is enabled.
+- Dependencies: bumped evolve to 8.5.1
+- Dependencies: bumped pyramid to 1.10.4
+- Dependencies: bumped psutil to 5.5.1
+- Dependencies: bumped pygments to 2.4.2
+- Dependencies: bumped pyramid to 1.10.4
+- Dependencies: bumped psycopg2 to 2.8.3
+- Dependencies [security]: updated colander to 1.7.0
+
+
+Security
+^^^^^^^^
+
+- SSH: replaced pycrypto with cryptography to generate SSH keys as pycrypto isn't
+  considered safe anymore.
+
+
+Performance
+^^^^^^^^^^^
+
+- Config: updated header limits on gunicorn to prevent errors on large Mercurial repositories.
+- User sessions: added option to cleanup redis based sessions in user session interface.
+- Authentication: reduced usage of raw auth calls inside templates to speed up rendering.
+- Sessions: don't touch session for API calls. Before each API call created new session
+  object which wasn't required.
+
+
+Fixes
+^^^^^
+
+- hHooks: fixed more unicode problems with new pull-request link generator.
+- Mercurial: fix ssh-server support for mercurial custom options.
+- Pull requests: updated metadata information for failed merges with multiple heads.
+- Pull requests: calculate ancestor in the same way as creation mode.
+  Fixed problem with updates generating wrong diffs in case of merges.
+- Pull requests: fixed a bug in removal of multiple reviewers at once.
+- Summary: fix timeout issues loading summary page without styling.
+- SSH: fix invocation of custom hgrc.
+- SSH: call custom hooks via SSH backend
+- Markup: fix styling for check-lists.
+- Archives: allows downloading refs that have slashes and special refs. e.g f/feat1 branch names.
+- Files: ensure we generate archives with consistent hashing (except for .tar.gz which uses temp files names in header)
+- Files: fixed rendering of readme files under non-ascii paths.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- In this release we introduced new UI across the application.
+  In case of problems with the display on your systems please send us info to [e-mail].
+

requirements_pinned.txt

@@ -0,0 +1,19 b''
+# contains not directly required libraries we want to pin the version.
+
+atomicwrites==1.2.1
+attrs==18.2.0
+billiard==3.5.0.3
+chameleon==2.24
+cffi==1.12.2
+ecdsa==0.13.2
+hupper==1.6.1
+gnureadline==6.3.8
+jinja2==2.9.6
+jsonschema==2.6.0
+pyramid-jinja2==2.7
+pluggy==0.11.0
+setproctitle==1.1.10
+scandir==1.10.0
+tempita==0.5.2
+vine==1.3.0
+configparser==3.7.4

rhodecode/api/tests/test_fts_search.py

@@ -0,0 +1,93 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2019 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import pytest
+from rhodecode.tests import HG_REPO
+from rhodecode.api.tests.utils import (
+    build_data, api_call, assert_error, assert_ok)
+
+
[e-mail]("testuser_api", "app")
+class TestApiSearch(object):
+
+    @pytest.mark.parametrize("query, expected_hits, expected_paths", [
+        ('todo', 23, [
+            'vcs/backends/hg/inmemory.py',
+            'vcs/tests/test_git.py']),
+        ('extension:rst installation', 6, [
+            'docs/index.rst',
+            'docs/installation.rst']),
+        ('def repo', 87, [
+            'vcs/tests/test_git.py',
+            'vcs/tests/test_changesets.py']),
+        ('repository:%s def test' % HG_REPO, 18, [
+            'vcs/tests/test_git.py',
+            'vcs/tests/test_changesets.py']),
+        ('"def main"', 9, [
+            'vcs/__init__.py',
+            'vcs/tests/__init__.py',
+            'vcs/utils/progressbar.py']),
+        ('owner:test_admin', 358, [
+            'vcs/tests/base.py',
+            'MANIFEST.in',
+            'vcs/utils/termcolors.py',
+            'docs/theme/ADC/static/documentation.png']),
+        ('owner:test_admin def main', 72, [
+            'vcs/__init__.py',
+            'vcs/tests/test_utils_filesize.py',
+            'vcs/tests/test_cli.py']),
+        ('owner:michał test', 0, []),
+    ])
+    def test_search_content_results(self, query, expected_hits, expected_paths):
+        id_, params = build_data(
+            self.apikey_regular, 'search',
+            search_query=query,
+            search_type='content')
+
+        response = api_call(self.app, params)
+        json_response = response.json
+
+        assert json_response['result']['item_count'] == expected_hits
+        paths = [x['f_path'] for x in json_response['result']['results']]
+
+        for expected_path in expected_paths:
+            assert expected_path in paths
+
+    @pytest.mark.parametrize("query, expected_hits, expected_paths", [
+        ('readme.rst', 3, []),
+        ('test*', 75, []),
+        ('*model*', 1, []),
+        ('extension:rst', 48, []),
+        ('extension:rst api', 24, []),
+    ])
+    def test_search_file_paths(self, query, expected_hits, expected_paths):
+        id_, params = build_data(
+            self.apikey_regular, 'search',
+            search_query=query,
+            search_type='path')
+
+        response = api_call(self.app, params)
+        json_response = response.json
+
+        assert json_response['result']['item_count'] == expected_hits
+        paths = [x['f_path'] for x in json_response['result']['results']]
+
+        for expected_path in expected_paths:
+            assert expected_path in paths

rhodecode/api/views/search_api.py

@@ -0,0 +1,112 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2019 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.api import jsonrpc_method
+from rhodecode.api.exc import JSONRPCValidationError
+from rhodecode.api.utils import Optional
+from rhodecode.lib.index import searcher_from_config
+from rhodecode.model import validation_schema
+from rhodecode.model.validation_schema.schemas import search_schema
+
+log = logging.getLogger(__name__)
+
+
+@jsonrpc_method()
+def search(request, apiuser, search_query, search_type, page_limit=Optional(10),
+           page=Optional(1), search_sort=Optional('newfirst'),
+           repo_name=Optional(None), repo_group_name=Optional(None)):
+    """
+    Fetch Full Text Search results using API.
+
+    :param apiuser: This is filled automatically from the |authtoken|.
+    :type apiuser: AuthUser
+    :param search_query: Search query.
+    :type search_query: str
+    :param search_type: Search type. The following are valid options:
+        * commit
+        * content
+        * path
+    :type search_type: str
+    :param page_limit: Page item limit, from 1 to 500. Default 10 items.
+    :type page_limit: Optional(int)
+    :param page: Page number. Default first page.
+    :type page: Optional(int)
+    :param search_sort: Search sort order. Default newfirst. The following are valid options:
+        * newfirst
+        * oldfirst
+    :type search_sort: Optional(str)
+    :param repo_name: Filter by one repo. Default is all.
+    :type repo_name: Optional(str)
+    :param repo_group_name: Filter by one repo group. Default is all.
+    :type repo_group_name: Optional(str)
+    """
+
+    data = {'execution_time': ''}
+    repo_name = Optional.extract(repo_name)
+    repo_group_name = Optional.extract(repo_group_name)
+
+    schema = search_schema.SearchParamsSchema()
+
+    try:
+        search_params = schema.deserialize(
+            dict(search_query=search_query,
+                 search_type=search_type,
+                 search_sort=Optional.extract(search_sort),
+                 page_limit=Optional.extract(page_limit),
+                 requested_page=Optional.extract(page))
+        )
+    except validation_schema.Invalid as err:
+        raise JSONRPCValidationError(colander_exc=err)
+
+    search_query = search_params.get('search_query')
+    search_type = search_params.get('search_type')
+    search_sort = search_params.get('search_sort')
+
+    if search_params.get('search_query'):
+        page_limit = search_params['page_limit']
+        requested_page = search_params['requested_page']
+
+        searcher = searcher_from_config(request.registry.settings)
+
+        try:
+            search_result = searcher.search(
+                search_query, search_type, apiuser, repo_name, repo_group_name,
+                requested_page=requested_page, page_limit=page_limit, sort=search_sort)
+
+            data.update(dict(
+                results=list(search_result['results']), page=requested_page,
+                item_count=search_result['count'],
+                items_per_page=page_limit))
+        finally:
+            searcher.cleanup()
+
+        if not search_result['error']:
+            data['execution_time'] = '%s results (%.3f seconds)' % (
+                search_result['count'],
+                search_result['runtime'])
+        else:
+            node = schema['search_query']
+            raise JSONRPCValidationError(
+                colander_exc=validation_schema.Invalid(node, search_result['error']))
+
+    return data

rhodecode/apps/repository/views/repo_artifacts.py

@@ -0,0 +1,48 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2019 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 pyramid.view import view_config
+
+from rhodecode.apps._base import RepoAppView
+from rhodecode.lib.auth import (
+    LoginRequired, HasRepoPermissionAnyDecorator)
+
+log = logging.getLogger(__name__)
+
+
+class RepoArtifactsView(RepoAppView):
+
+    def load_default_context(self):
+        c = self._get_local_tmpl_context(include_app_defaults=True)
+        c.rhodecode_repo = self.rhodecode_vcs_repo
+        return c
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator(
+        'repository.read', 'repository.write', 'repository.admin')
+    @view_config(
+        route_name='repo_artifacts_list', request_method='GET',
+        renderer='rhodecode:templates/artifacts/artifact_list.mako')
+    def repo_artifacts(self):
+        c = self.load_default_context()
+        c.active = 'artifacts'
+        return self._get_template_context(c)

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

@@ -0,0 +1,55 b''
+# -*- coding: utf-8 -*-
+
+import logging
+
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+from sqlalchemy import String, Column
+from sqlalchemy.sql import text
+
+from rhodecode.lib.dbmigrate.versions import _reset_base
+from rhodecode.lib.utils2 import safe_str
+from rhodecode.model import meta, init_model_encryption
+from rhodecode.model.db import RepoGroup
+
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_16_0_2
+
+    init_model_encryption(db_4_16_0_2)
+
+    context = MigrationContext.configure(migrate_engine.connect())
+    op = Operations(context)
+
+    repo_group = db_4_16_0_2.RepoGroup.__table__
+
+    with op.batch_alter_table(repo_group.name) as batch_op:
+        batch_op.add_column(
+            Column("repo_group_name_hash", String(1024), nullable=True, unique=False))
+
+    _generate_repo_group_name_hashes(db_4_16_0_2, op, meta.Session)
+
+
+def downgrade(migrate_engine):
+    pass
+
+
+def _generate_repo_group_name_hashes(models, op, session):
+    repo_groups = models.RepoGroup.get_all()
+    for repo_group in repo_groups:
+        print(safe_str(repo_group.group_name))
+        hash_ = RepoGroup.hash_repo_group_name(repo_group.group_name)
+        params = {'hash': hash_, 'id': repo_group.group_id}
+        query = text(
+            'UPDATE groups SET repo_group_name_hash = :hash'
+            ' WHERE group_id = :id').bindparams(**params)
+        op.execute(query)
+    session().commit()

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

@@ -0,0 +1,35 b''
+# -*- coding: utf-8 -*-
+
+import logging
+
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+
+from rhodecode.lib.dbmigrate.versions import _reset_base
+from rhodecode.model import init_model_encryption
+
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_16_0_2
+
+    init_model_encryption(db_4_16_0_2)
+
+    context = MigrationContext.configure(migrate_engine.connect())
+    op = Operations(context)
+
+    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)
+
+
+def downgrade(migrate_engine):
+    pass

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

@@ -0,0 +1,37 b''
+# -*- coding: utf-8 -*-
+
+import logging
+
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+from sqlalchemy import Column, LargeBinary
+
+from rhodecode.lib.dbmigrate.versions import _reset_base
+from rhodecode.model import init_model_encryption
+
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_16_0_2
+
+    init_model_encryption(db_4_16_0_2)
+
+    context = MigrationContext.configure(migrate_engine.connect())
+    op = Operations(context)
+
+    repo_group = db_4_16_0_2.RepoGroup.__table__
+
+    with op.batch_alter_table(repo_group.name) as batch_op:
+        batch_op.add_column(
+            Column("changeset_cache", LargeBinary(1024), nullable=True))
+
+
+def downgrade(migrate_engine):
+    pass

rhodecode/lib/encrypt2.py

@@ -0,0 +1,69 b''
+import os
+import base64
+from cryptography.fernet import Fernet, InvalidToken
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import hashes
+from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
+
+
+class Encryptor(object):
+    key_format = 'enc2$salt:{}$data:{}'
+    pref_len = 5  # salt:, data:
+
+    def __init__(self, enc_key):
+        self.enc_key = enc_key
+
+    def b64_encode(self, data):
+        return base64.urlsafe_b64encode(data)
+
+    def b64_decode(self, data):
+        return base64.urlsafe_b64decode(data)
+
+    def get_encryptor(self, salt):
+        """
+        Uses Fernet as encryptor with HMAC signature
+        :param salt: random salt used for encrypting the data
+        """
+        kdf = PBKDF2HMAC(
+            algorithm=hashes.SHA512(),
+            length=32,
+            salt=salt,
+            iterations=100000,
+            backend=default_backend()
+        )
+        key = self.b64_encode(kdf.derive(self.enc_key))
+        return Fernet(key)
+
+    def _get_parts(self, enc_data):
+        parts = enc_data.split('$', 3)
+        if len(parts) != 3:
+            raise ValueError('Encrypted Data has invalid format, expected {}'.format(self.key_format))
+        prefix, salt, enc_data = parts
+
+        try:
+            salt = self.b64_decode(salt[self.pref_len:])
+        except TypeError:
+            # bad base64
+            raise ValueError('Encrypted Data salt invalid format, expected base64 format')
+
+        enc_data = enc_data[self.pref_len:]
+        return prefix, salt, enc_data
+
+    def encrypt(self, data):
+        salt = os.urandom(64)
+        encryptor = self.get_encryptor(salt)
+        enc_data = encryptor.encrypt(data)
+        return self.key_format.format(self.b64_encode(salt), enc_data)
+
+    def decrypt(self, data, safe=True):
+        parts = self._get_parts(data)
+        salt = parts[1]
+        enc_data = parts[2]
+        encryptor = self.get_encryptor(salt)
+        try:
+            return encryptor.decrypt(enc_data)
+        except (InvalidToken,):
+            if safe:
+                return ''
+            else:
+                raise

rhodecode/lib/rc_beaker.py

@@ -0,0 +1,200 b''
+# Copyright (c) 2010 Agendaless Consulting and Contributors.
+# (http://www.agendaless.com), All Rights Reserved
+# License: BSD-derived (http://www.repoze.org/LICENSE.txt)
+# With Patches from RhodeCode GmBH
+
+
+import os
+
+from beaker import cache
+from beaker.session import SessionObject
+from beaker.util import coerce_cache_params
+from beaker.util import coerce_session_params
+
+from pyramid.interfaces import ISession
+from pyramid.settings import asbool
+from zope.interface import implementer
+
+from binascii import hexlify
+
+
+def BeakerSessionFactoryConfig(**options):
+    """ Return a Pyramid session factory using Beaker session settings
+    supplied directly as ``**options``"""
+
+    class PyramidBeakerSessionObject(SessionObject):
+        _options = options
+        _cookie_on_exception = _options.pop('cookie_on_exception', True)
+        _constant_csrf_token = _options.pop('constant_csrf_token', False)
+
+        def __init__(self, request):
+            SessionObject.__init__(self, request.environ, **self._options)
+
+            def session_callback(request, response):
+                exception = getattr(request, 'exception', None)
+                if (exception is None or self._cookie_on_exception) and self.accessed():
+                    self.persist()
+                    headers = self.__dict__['_headers']
+                    if headers['set_cookie'] and headers['cookie_out']:
+                        response.headerlist.append(('Set-Cookie', headers['cookie_out']))
+            request.add_response_callback(session_callback)
+
+        # ISession API
+
+        @property
+        def id(self):
+            # this is as inspected in SessionObject.__init__
+            if self.__dict__['_params'].get('type') != 'cookie':
+                return self._session().id
+            return None
+
+        @property
+        def new(self):
+            return self.last_accessed is None
+
+        changed = SessionObject.save
+
+        # modifying dictionary methods
+
+        @call_save
+        def clear(self):
+            return self._session().clear()
+
+        @call_save
+        def update(self, d, **kw):
+            return self._session().update(d, **kw)
+
+        @call_save
+        def setdefault(self, k, d=None):
+            return self._session().setdefault(k, d)
+
+        @call_save
+        def pop(self, k, d=None):
+            return self._session().pop(k, d)
+
+        @call_save
+        def popitem(self):
+            return self._session().popitem()
+
+        __setitem__ = call_save(SessionObject.__setitem__)
+        __delitem__ = call_save(SessionObject.__delitem__)
+
+        # Flash API methods
+        def flash(self, msg, queue='', allow_duplicate=True):
+            storage = self.setdefault('_f_' + queue, [])
+            if allow_duplicate or (msg not in storage):
+                storage.append(msg)
+
+        def pop_flash(self, queue=''):
+            storage = self.pop('_f_' + queue, [])
+            return storage
+
+        def peek_flash(self, queue=''):
+            storage = self.get('_f_' + queue, [])
+            return storage
+
+        # CSRF API methods
+        def new_csrf_token(self):
+            token = (self._constant_csrf_token
+                     or hexlify(os.urandom(20)).decode('ascii'))
+            self['_csrft_'] = token
+            return token
+
+        def get_csrf_token(self):
+            token = self.get('_csrft_', None)
+            if token is None:
+                token = self.new_csrf_token()
+            return token
+
+    return implementer(ISession)(PyramidBeakerSessionObject)
+
+
+def call_save(wrapped):
+    """ By default, in non-auto-mode beaker badly wants people to
+    call save even though it should know something has changed when
+    a mutating method is called.  This hack should be removed if
+    Beaker ever starts to do this by default. """
+    def save(session, *arg, **kw):
+        value = wrapped(session, *arg, **kw)
+        session.save()
+        return value
+    save.__doc__ = wrapped.__doc__
+    return save
+
+
+def session_factory_from_settings(settings):
+    """ Return a Pyramid session factory using Beaker session settings
+    supplied from a Paste configuration file"""
+    prefixes = ('session.', 'beaker.session.')
+    options = {}
+
+    # Pull out any config args meant for beaker session. if there are any
+    for k, v in settings.items():
+        for prefix in prefixes:
+            if k.startswith(prefix):
+                option_name = k[len(prefix):]
+                if option_name == 'cookie_on_exception':
+                    v = asbool(v)
+                options[option_name] = v
+
+    options = coerce_session_params(options)
+    return BeakerSessionFactoryConfig(**options)
+
+
+def set_cache_regions_from_settings(settings):
+    """ Add cache support to the Pylons application.
+
+    The ``settings`` passed to the configurator are used to setup
+    the cache options. Cache options in the settings should start
+    with either 'beaker.cache.' or 'cache.'.
+
+    """
+    cache_settings = {'regions': []}
+    for key in settings.keys():
+        for prefix in ['beaker.cache.', 'cache.']:
+            if key.startswith(prefix):
+                name = key.split(prefix)[1].strip()
+                cache_settings[name] = settings[key].strip()
+
+    if ('expire' in cache_settings
+            and isinstance(cache_settings['expire'], basestring)
+            and cache_settings['expire'].lower() in ['none', 'no']):
+        cache_settings['expire'] = None
+
+    coerce_cache_params(cache_settings)
+
+    if 'enabled' not in cache_settings:
+        cache_settings['enabled'] = True
+
+    regions = cache_settings['regions']
+    if regions:
+        for region in regions:
+            if not region:
+                continue
+
+            region_settings = {
+                'data_dir': cache_settings.get('data_dir'),
+                'lock_dir': cache_settings.get('lock_dir'),
+                'expire': cache_settings.get('expire', 60),
+                'enabled': cache_settings['enabled'],
+                'key_length': cache_settings.get('key_length', 250),
+                'type': cache_settings.get('type'),
+                'url': cache_settings.get('url'),
+            }
+            region_prefix = '%s.' % region
+            region_len = len(region_prefix)
+            for key in list(cache_settings.keys()):
+                if key.startswith(region_prefix):
+                    region_settings[key[region_len:]] = cache_settings.pop(key)
+
+            if (isinstance(region_settings['expire'], basestring)
+                    and region_settings['expire'].lower() in ['none', 'no']):
+                region_settings['expire'] = None
+            coerce_cache_params(region_settings)
+            cache.cache_regions[region] = region_settings
+
+
+def includeme(config):
+    session_factory = session_factory_from_settings(config.registry.settings)
+    config.set_session_factory(session_factory)
+    set_cache_regions_from_settings(config.registry.settings)

.bumpversion.cfg

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

.release.cfg

@@ -5,25 +5,20 b' done = false'
 done = true
 
 [task:rc_tools_pinned]
-done = true
 
 [task:fixes_on_stable]
-done = true
 
 [task:pip2nix_generated]
-done = true
 
 [task:changelog_updated]
-done = true
 
 [task:generate_api_docs]
-done = true
+
+[task:updated_translation]
 
 [release]
-state = prepared
-version = 4.16.2
-
-[task:updated_translation]
+state = in_progress
+version = 4.17.0
 
 [task:generate_js_routes]
 

Makefile

@@ -53,3 +53,12 b' web-build:'
 
 generate-pkgs:
 	nix-shell pkgs/shell-generate.nix --command "pip2nix generate --licenses"
+
+generate-js-pkgs:
+	rm -rf node_modules && \
+	nix-shell pkgs/shell-generate.nix --command "node2nix --input package.json -o pkgs/node-packages.nix -e pkgs/node-env.nix -c pkgs/node-default.nix -d --flatten --nodejs-8" && \
+	sed -i -e 's/http:\/\//https:\/\//g' pkgs/node-packages.nix
+
+generate-license-meta:
+	nix-build pkgs/license-generate.nix -o result-license && \
+	cat result-license/licenses.json | python -m json.tool > rhodecode/config/licenses.json
  No newline at end of file

configs/development.ini

@@ -133,6 +133,11 b' rhodecode.api.url = /_admin/api'
 ## `SignatureVerificationError` in case of wrong key, or damaged encryption data.
 #rhodecode.encrypted_values.strict = false
 
+## Pick algorithm for encryption. Either fernet (more secure) or aes (default)
+## fernet is safer, and we strongly recommend switching to it.
+## Due to backward compatibility aes is used as default.
+#rhodecode.encrypted_values.algorithm = fernet
+
 ## return gzipped responses from RhodeCode (static files/application)
 gzip_responses = false
 
@@ -374,6 +379,10 b' rc_cache.cache_repo_longterm.max_size = '
 beaker.session.type = file
 beaker.session.data_dir = %(here)s/data/sessions
 
+## redis sessions
+#beaker.session.type = ext:redis
+#beaker.session.url = redis://127.0.0.1:6379/2
+
 ## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
 #beaker.session.table_name = db_session

configs/gunicorn_config.py

@@ -30,10 +30,12 b" loglevel = 'debug'"
 # SECURITY
 
 # The maximum size of HTTP request line in bytes.
-limit_request_line = 4094
+# 0 for unlimited
+limit_request_line = 0
 
 # Limit the number of HTTP headers fields in a request.
-limit_request_fields = 1024
+# By default this value is 100 and can’t be larger than 32768.
+limit_request_fields = 10240
 
 # Limit the allowed size of an HTTP request header field.
 # Value is a positive number or 0.

configs/production.ini

@@ -108,6 +108,11 b' use = egg:rhodecode-enterprise-ce'
 ## `SignatureVerificationError` in case of wrong key, or damaged encryption data.
 #rhodecode.encrypted_values.strict = false
 
+## Pick algorithm for encryption. Either fernet (more secure) or aes (default)
+## fernet is safer, and we strongly recommend switching to it.
+## Due to backward compatibility aes is used as default.
+#rhodecode.encrypted_values.algorithm = fernet
+
 ## return gzipped responses from RhodeCode (static files/application)
 gzip_responses = false
 
@@ -349,6 +354,10 b' rc_cache.cache_repo_longterm.max_size = '
 beaker.session.type = file
 beaker.session.data_dir = %(here)s/data/sessions
 
+## redis sessions
+#beaker.session.type = ext:redis
+#beaker.session.url = redis://127.0.0.1:6379/2
+
 ## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
 #beaker.session.table_name = db_session

default.nix

@@ -191,7 +191,7 b' let'
         # check required files
         STATIC_CHECK="/robots.txt /502.html
                       /js/scripts.js /js/rhodecode-components.js
-                      /css/style.css /css/style-polymer.css"
+                      /css/style.css /css/style-polymer.css /css/style-ipython.css"
 
         for file in $STATIC_CHECK;
         do

docs/admin/repo_admin/repo-extra-fields.rst

@@ -29,7 +29,7 b' 1. Go to :menuselection:`Admin --> Repos'
    beside the |repo| to which you wish to add extra fields.
 2. On the |repo| settings page, select the :guilabel:`Extra fields` tab.
 
-.. image:: ../images/extra-repo-fields.png
+.. image:: ../../images/extra-repo-fields.png
 
 The most important is the `New field key` variable which under the value will
 be stored. It needs to be unique for each repository. The label and description

docs/admin/system-admin.rst

@@ -16,19 +16,17 b' The following are the most common system'
 
 .. toctree::
 
-    config-files-overview
-    vcs-server
-    svn-http
-    svn-path-permissions
-    gunicorn-ssl-support
-    apache-config
-    nginx-config
-    backup-restore
-    tuning-rhodecode
-    indexing
-    reset-information
-    enable-debug
-    admin-tricks
-    cleanup-cmds
-    restore-deleted-repositories
-
+    system_admin/config-files-overview
+    system_admin/vcs-server
+    system_admin/svn-http
+    system_admin/svn-path-permissions
+    system_admin/gunicorn-ssl-support
+    system_admin/apache-config
+    system_admin/nginx-config
+    system_admin/backup-restore
+    system_admin/tuning-rhodecode
+    system_admin/indexing
+    system_admin/reset-information
+    system_admin/enable-debug
+    system_admin/admin-tricks
+    system_admin/cleanup-cmds

docs/admin/system_admin/admin-tricks.rst

@@ -57,7 +57,7 b' 2. To add a message that will be display'
 3. Select :guilabel:`Save`, and you will see the message once your page
    refreshes.
 
-.. image:: ../images/server-wide-announcement.png
+.. image:: ../../images/server-wide-announcement.png
    :alt: Server Wide Announcement
 
 .. _md-rst:
@@ -207,7 +207,7 b' 2. Restart the |RCE| instance and check '
    Instance "enterprise-2" successfully stopped.
    Instance "enterprise-2" successfully started.
 
-.. image:: ../images/language.png
+.. image:: ../../images/language.png
 
 .. _set-repo-pub:
 
@@ -239,3 +239,26 b' following URL: ``{instance-URL}/_admin/p'
 
 .. _Markdown: http://daringfireball.net/projects/markdown/
 .. _reStructured Text: http://docutils.sourceforge.net/docs/index.html
+
+
+Unarchiving a repository
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Archive operation for the repository is similar as delete. Archive keeps the data for future references
+but makes the repository read-only. After archiving the repository it shouldn't be modified in any way.
+This is why repository settings are disabled for an archived repository.
+
+If there's a need for unarchiving a repository for some reasons, the interactive
+ishell interface should be used.
+
+.. code-block:: bash
+
+  # Open iShell from the terminal
+  $ rccontrol ishell enterprise-1/community-1
+
+.. code-block:: python
+
+  # Set repository as un-archived
+  In [1]: repo = Repository.get_by_repo_name('SOME_REPO_NAME')
+  In [2]: repo.archived = False
+  In [3]: Session().add(repo);Session().commit()

docs/admin/system_admin/apache-config.rst

@@ -8,7 +8,7 b' the information in the following section'
 
 .. toctree::
 
-   apache-conf-example
-   apache-diffie-hellman
-   apache-subdirectory
-   apache-wsgi-coding
+   apache/apache-conf-example
+   apache/apache-diffie-hellman
+   apache/apache-subdirectory
+   apache/apache-wsgi-coding

docs/admin/system_admin/apache/apache-conf-example.rst

@@ -66,14 +66,18 b' Below config if for an Apache Reverse Pr'
         # Directive to properly generate url (clone url) for RhodeCode
         ProxyPreserveHost On
 
+        # It allows request bodies to be sent to the backend using chunked transfer encoding.
+        SetEnv proxy-sendchunked 1
+
+        # Increase headers size for large Mercurial headers sent with many branches
+        LimitRequestLine 16380
+
         # Url to running RhodeCode instance. This is shown as `- URL:` when
         # running rccontrol status.
+
         ProxyPass / http://127.0.0.1:10002/ timeout=7200 Keepalive=On
         ProxyPassReverse / http://127.0.0.1:10002/
 
-        # Increase headers for large Mercurial headers
-        LimitRequestLine 16380
-
         # strict http prevents from https -> http downgrade
         Header always set Strict-Transport-Security "max-age=63072000; includeSubdomains; preload"
 

docs/admin/system_admin/nginx-config.rst

@@ -8,7 +8,7 b' the information in the following section'
 
 .. toctree::
 
-   nginx-config-example
-   nginx-diffie-hellman
-   nginx-proxy-conf
-   nginx-url-prefix
+   nginx/nginx-config-example
+   nginx/nginx-diffie-hellman
+   nginx/nginx-proxy-conf
+   nginx/nginx-url-prefix

docs/admin/system_admin/tuning-rhodecode.rst

@@ -8,14 +8,14 b' may find some of the following methods u'
 
 .. toctree::
 
-   tuning-gunicorn
-   tuning-vcs-memory-cache
-   tuning-user-sessions-performance
-   tuning-increase-db-performance
-   tuning-scale-horizontally-cluster
-   tuning-mount-cache-memory
-   tuning-change-encoding
-   tuning-change-large-file-dir
-   tuning-change-lfs-dir
-   tuning-hg-auth-loop
+   tuning/tuning-gunicorn
+   tuning/tuning-vcs-memory-cache
+   tuning/tuning-user-sessions-performance
+   tuning/tuning-increase-db-performance
+   tuning/tuning-scale-horizontally-cluster
+   tuning/tuning-mount-cache-memory
+   tuning/tuning-change-encoding
+   tuning/tuning-change-large-file-dir
+   tuning/tuning-change-lfs-dir
+   tuning/tuning-hg-auth-loop
 

docs/admin/system_admin/tuning/tuning-gunicorn.rst

@@ -42,7 +42,7 b' 2. In the ``[server:main]`` section, cha'
     ## restarted, could prevent memory leaks
     max_requests = 1000
     max_requests_jitter = 30
-    ## amount of time a worker can spend with handling a request before it
+    ## amount of time a worker can spend with handling a request tuning-change-lfs-dir.before it
     ## gets killed and restarted. Set to 6hrs
     timeout = 21600
 

docs/admin/user-admin.rst

@@ -13,11 +13,12 b' permissions applied to it; |perm|.'
 
 .. toctree::
 
-    public-access
-    default-user-perms
-    adding-anonymous-user
-    adding-new-user
-    setting-default-permissions
-    setting-usergroup-permissions
+    user_admin/public-access
+    user_admin/default-user-perms
+    user_admin/adding-anonymous-user
+    user_admin/adding-new-user
+    user_admin/setting-default-permissions
+    user_admin/setting-usergroup-permissions
+    user_admin/user-admin-tasks
 
-.. |perm| replace:: **None**, **Read**, **Write**, or **Admin**
  No newline at end of file
+.. |perm| replace:: **None**, **Read**, **Write**, or **Admin**

docs/api/api.rst

@@ -204,6 +204,7 b' are not required in args.'
    methods/pull-request-methods
    methods/repo-methods
    methods/repo-group-methods
+   methods/search-methods
    methods/server-methods
    methods/user-methods
    methods/user-group-methods

docs/api/methods/repo-methods.rst

@@ -462,6 +462,7 b' get_repo_file'
    :param cache: Use internal caches for fetching files. If disabled fetching
        files is slower but more memory efficient
    :type cache: Optional(bool)
+
    Example output:
 
    .. code-block:: bash
@@ -499,53 +500,51 b' get_repo_nodes'
 .. py:function:: get_repo_nodes(apiuser, repoid, revision, root_path, ret_type=<Optional:'all'>, details=<Optional:'basic'>, max_file_bytes=<Optional:None>)
 
    Returns a list of nodes and children in a flat list for a given
-       path at given revision.
+   path at given revision.
 
-       It's possible to specify ret_type to show only `files` or `dirs`.
+   It's possible to specify ret_type to show only `files` or `dirs`.
 
-       This command can only be run using an |authtoken| with admin rights,
-       or users with at least read rights to |repos|.
+   This command can only be run using an |authtoken| with admin rights,
+   or users with at least read rights to |repos|.
 
-       :param apiuser: This is filled automatically from the |authtoken|.
-       :type apiuser: AuthUser
-       :param repoid: The repository name or repository ID.
-       :type repoid: str or int
-       :param revision: The revision for which listing should be done.
-       :type revision: str
-       :param root_path: The path from which to start displaying.
-       :type root_path: str
-       :param ret_type: Set the return type. Valid options are
-           ``all`` (default), ``files`` and ``dirs``.
-       :type ret_type: Optional(str)
-       :param details: Returns extended information about nodes, such as
-           md5, binary, and or content.
-           The valid options are ``basic`` and ``full``.
-       :type details: Optional(str)
-       :param max_file_bytes: Only return file content under this file size bytes
-       :type details: Optional(int)
-
-       Example output:
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository ID.
+   :type repoid: str or int
+   :param revision: The revision for which listing should be done.
+   :type revision: str
+   :param root_path: The path from which to start displaying.
+   :type root_path: str
+   :param ret_type: Set the return type. Valid options are
+       ``all`` (default), ``files`` and ``dirs``.
+   :type ret_type: Optional(str)
+   :param details: Returns extended information about nodes, such as
+       md5, binary, and or content.
+       The valid options are ``basic`` and ``full``.
+   :type details: Optional(str)
+   :param max_file_bytes: Only return file content under this file size bytes
+   :type details: Optional(int)
 
-       .. code-block:: bash
+   Example output:
+
+   .. code-block:: bash
 
-           id : <id_given_in_input>
-           result: [
-                       {
-                         "binary": false,
-                         "content": "File line
-   Line2
-   ",
-                         "extension": "md",
-                         "lines": 2,
-                         "md5": "059fa5d29b19c0657e384749480f6422",
-                         "mimetype": "text/x-minidsrc",
-                         "name": "file.md",
-                         "size": 580,
-                         "type": "file"
-                       },
-                     ...
-                   ]
-           error:  null
+       id : <id_given_in_input>
+       result: [
+                   {
+                     "binary": false,
+                     "content": "File line",
+                     "extension": "md",
+                     "lines": 2,
+                     "md5": "059fa5d29b19c0657e384749480f6422",
+                     "mimetype": "text/x-minidsrc",
+                     "name": "file.md",
+                     "size": 580,
+                     "type": "file"
+                   },
+                 ...
+               ]
+       error:  null
 
 
 get_repo_refs 

docs/auth/auth-saml-bulk-enroll-users.rst

@@ -32,9 +32,9 b' The most important this id needs to be u'
 
     In [1]: saml2user = {
        ...: # OneLogin, uses externalID available to read from in the UI
-       ...: 123: {'id: '48253211'},
+       ...: 123: {'id': '48253211'},
        ...: # for Google/DuoSecurity email is also an option for unique ID
-       ...: 124: {'id: '[e-mail]'},
+       ...: 124: {'id': '[e-mail]'},
        ...: }
 
 
@@ -70,7 +70,7 b' Enter in the ishell prompt'
        ...:         new_external_identity.external_id = external_id
        ...:         new_external_identity.external_username = '{}-saml-{}'.format(user.username, user.user_id)
        ...:         new_external_identity.provider_name = provider
-       ...:         new_external_identity.local_user_id = user_id
+       ...:         new_external_identity.local_user_id = user.user_id
        ...:         new_external_identity.access_token = ''
        ...:         new_external_identity.token_secret = ''
        ...:         new_external_identity.alt_token = ''

docs/index.rst

@@ -46,7 +46,7 b' and commit files and |repos| while manag'
    nix/default-env
    admin/system-admin
    admin/user-admin
-   admin/setting-repo-perms
+   admin/repo-admin
    admin/security-tips
    auth/auth
    issue-trackers/issue-trackers
@@ -64,6 +64,13 b' and commit files and |repos| while manag'
 
 .. toctree::
    :maxdepth: 1
+   :caption: User Documentation
+
+   usage/basic-usage
+   tutorials/tutorials
+
+.. toctree::
+   :maxdepth: 1
    :caption: Developer Documentation
 
    api/api
@@ -73,13 +80,6 b' and commit files and |repos| while manag'
 
 .. toctree::
    :maxdepth: 1
-   :caption: User Documentation
-
-   usage/basic-usage
-   tutorials/tutorials
-
-.. toctree::
-   :maxdepth: 1
    :caption: About
 
    known-issues/known-issues

docs/release-notes/release-notes.rst

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

grunt_config.json

@@ -35,6 +35,7 b''
         "<%= dirs.js.node_modules %>/moment/min/moment.min.js",
         "<%= dirs.js.node_modules %>/clipboard/dist/clipboard.min.js",
         "<%= dirs.js.node_modules %>/favico.js/favico-0.3.10.min.js",
+        "<%= dirs.js.node_modules %>/dropzone/dist/dropzone.js",
         "<%= dirs.js.node_modules %>/sticky-sidebar/dist/sticky-sidebar.min.js",
         "<%= dirs.js.node_modules %>/sticky-sidebar/dist/jquery.sticky-sidebar.min.js",
         "<%= dirs.js.node_modules %>/waypoints/lib/noframework.waypoints.min.js",
@@ -107,7 +108,8 b''
       },
       "files": {
         "<%= dirs.css.dest %>/style.css": "<%= dirs.css.src %>/main.less",
-        "<%= dirs.css.dest %>/style-polymer.css": "<%= dirs.css.src %>/polymer.less"
+        "<%= dirs.css.dest %>/style-polymer.css": "<%= dirs.css.src %>/polymer.less",
+        "<%= dirs.css.dest %>/style-ipython.css": "<%= dirs.css.src %>/ipython.less"
       }
     },
     "production": {
@@ -118,7 +120,8 b''
       },
       "files": {
         "<%= dirs.css.dest %>/style.css": "<%= dirs.css.src %>/main.less",
-        "<%= dirs.css.dest %>/style-polymer.css": "<%= dirs.css.src %>/polymer.less"
+        "<%= dirs.css.dest %>/style-polymer.css": "<%= dirs.css.src %>/polymer.less",
+        "<%= dirs.css.dest %>/style-ipython.css": "<%= dirs.css.src %>/ipython.less"
       }
     },
     "components": {

package.json

@@ -13,6 +13,7 b''
     "clipboard": "^2.0.1",
     "exports-loader": "^0.6.4",
     "favico.js": "^0.3.10",
+    "dropzone": "^5.5.0",
     "grunt": "^0.4.5",
     "grunt-cli": "^1.3.1",
     "grunt-contrib-concat": "^0.5.1",

pip2nix.ini

@@ -1,3 +1,3 b''
 [pip2nix]
-requirements = ., -r ./requirements.txt
+requirements = ., -r ./requirements.txt, -r ./requirements_pinned.txt
 output = ./pkgs/python-packages.nix

pkgs/node-packages.nix

@@ -166,13 +166,13 b' let'
         sha512 = "dgOe12GyCF1VZBLUQqnzGWlf3xb255FajNCVB1VFj/AtskYtoamnafa7m3a+1vs+C8qbg4Benn5KwgxVDSW4cg==";
       };
     };
-    "@polymer/paper-spinner-3.0.1" = {
+    "@polymer/paper-spinner-3.0.2" = {
       name = "_at_polymer_slash_paper-spinner";
       packageName = "@polymer/paper-spinner";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polymer/paper-spinner/-/paper-spinner-3.0.1.tgz";
-        sha512 = "MYIU6qWZnhZ5yNFOBzROPgBteGfxKEnDZ6bCgjrvUtJkBuQEz0MQZzSE/zmZc0oaJ9u5QK5xAFuYdudsGv7+sQ==";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@polymer/paper-spinner/-/paper-spinner-3.0.2.tgz";
+        sha512 = "XUzu8/4NH+pnNZUTI2MxtOKFAr0EOsW7eGhTg3VBhTh7DDW/q3ewzwYRWnqNJokX9BEnxKMiXXaIeTEBq4k2dw==";
       };
     };
     "@polymer/paper-styles-3.0.1" = {
@@ -211,13 +211,13 b' let'
         sha512 = "yiUk09opTEnE1lK+tb501ENb+yQBi4p++Ep0eGJAHesVYKVMPNgPphVKkIizkDaU+n0SE+zXfTsRbYyOMDYXSg==";
       };
     };
-    "@polymer/polymer-3.1.0" = {
+    "@polymer/polymer-3.2.0" = {
       name = "_at_polymer_slash_polymer";
       packageName = "@polymer/polymer";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polymer/polymer/-/polymer-3.1.0.tgz";
-        sha512 = "hwN8IMERsFATz/9dSMxYHL+84J9uBkPuuarxJWlTsppZ4CAYTZKnepBfNrKoyNsafBmA3yXBiiKPPf+fJtza7A==";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@polymer/polymer/-/polymer-3.2.0.tgz";
+        sha512 = "L6uV1oM6T6xbwbVx6t3biG5T2VSSB03LxnIrUd9M2pr6RkHVPFHJ37pC5MUwBAEhkGFJif7eks7fdMMSGZTeEQ==";
       };
     };
     "@types/clone-0.1.30" = {
@@ -229,13 +229,13 b' let'
         sha1 = "e7365648c1b42136a59c7d5040637b3b5c83b614";
       };
     };
-    "@types/node-6.14.2" = {
+    "@types/node-6.14.6" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "6.14.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-6.14.2.tgz";
-        sha512 = "JWB3xaVfsfnFY8Ofc9rTB/op0fqqTSqy4vBcVk1LuRJvta7KTX+D//fCkiTMeLGhdr2EbFZzQjC97gvmPilk9Q==";
+      version = "6.14.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-6.14.6.tgz";
+        sha512 = "rFs9zCFtSHuseiNXxYxFlun8ibu+jtZPgRM+2ILCmeLiGeGLiIGxuOzD+cNyHegI1GD+da3R/cIbs9+xCLp13w==";
       };
     };
     "@types/parse5-2.2.34" = {
@@ -409,22 +409,22 b' let'
         sha512 = "mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA==";
       };
     };
-    "@webcomponents/shadycss-1.7.1" = {
+    "@webcomponents/shadycss-1.9.1" = {
       name = "_at_webcomponents_slash_shadycss";
       packageName = "@webcomponents/shadycss";
-      version = "1.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.7.1.tgz";
-        sha512 = "6SZqLajRPWL0rrKDZOGF8PCBq5B9JqgFmE5rX5psk6i8WrqiMkSCuO8+rnirzViTsU5CqnjQPFC3OvG4YJdMrQ==";
-      };
-    };
-    "@webcomponents/webcomponentsjs-2.2.1" = {
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.9.1.tgz";
+        sha512 = "IaZOnWOKXHghqk/WfPNDRIgDBi3RsVPY2IFAw6tYiL9UBGvQRy5R6uC+Fk7qTZsReTJ0xh5MTT8yAcb3MUR4mQ==";
+      };
+    };
+    "@webcomponents/webcomponentsjs-2.2.10" = {
       name = "_at_webcomponents_slash_webcomponentsjs";
       packageName = "@webcomponents/webcomponentsjs";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.1.tgz";
-        sha512 = "lZZ+Lkke6JhsJcQQqSVk1Pny6/8y4qhJ98LO7a/MwBSRO8WqHqK1X2vscfeL8vOnYGFnmBUyVG95lwYv/AXyLQ==";
+      version = "2.2.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.10.tgz";
+        sha512 = "5dzhUhP+h0qMiK0IWb7VNb0OGBoXO3AuI6Qi8t9PoKT50s5L1jv0xnwnLq+cFgPuTB8FLTNP8xIDmyoOsKBy9Q==";
       };
     };
     "@xtuc/ieee754-1.2.0" = {
@@ -499,22 +499,22 b' let'
         sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
       };
     };
-    "ajv-6.6.2" = {
+    "ajv-6.10.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz";
-        sha512 = "FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==";
-      };
-    };
-    "ajv-keywords-3.2.0" = {
+      version = "6.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz";
+        sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==";
+      };
+    };
+    "ajv-keywords-3.4.0" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz";
-        sha1 = "e86b819c602cf8821ad637413698f1dec021847a";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz";
+        sha512 = "aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==";
       };
     };
     "align-text-0.1.4" = {
@@ -716,15 +716,6 b' let'
         sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
       };
     };
-    "arrify-1.0.1" = {
-      name = "arrify";
-      packageName = "arrify";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz";
-        sha1 = "898508da2226f380df904728456849c1501a4b0d";
-      };
-    };
     "asap-2.0.6" = {
       name = "asap";
       packageName = "asap";
@@ -752,13 +743,13 b' let'
         sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==";
       };
     };
-    "assert-1.4.1" = {
+    "assert-1.5.0" = {
       name = "assert";
       packageName = "assert";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
-        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz";
+        sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==";
       };
     };
     "assert-plus-0.2.0" = {
@@ -815,22 +806,22 b' let'
         sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       };
     };
-    "async-2.6.1" = {
+    "async-2.6.2" = {
       name = "async";
       packageName = "async";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz";
-        sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==";
-      };
-    };
-    "async-each-1.0.1" = {
+      version = "2.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz";
+        sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==";
+      };
+    };
+    "async-each-1.0.3" = {
       name = "async-each";
       packageName = "async-each";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz";
-        sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz";
+        sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==";
       };
     };
     "asynckit-0.4.0" = {
@@ -1445,22 +1436,22 b' let'
         sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==";
       };
     };
-    "binary-extensions-1.12.0" = {
+    "binary-extensions-1.13.1" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz";
-        sha512 = "DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==";
-      };
-    };
-    "bluebird-3.5.3" = {
+      version = "1.13.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz";
+        sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
+      };
+    };
+    "bluebird-3.5.4" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz";
-        sha512 = "/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==";
+      version = "3.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz";
+        sha512 = "FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==";
       };
     };
     "bn.js-4.11.8" = {
@@ -1661,13 +1652,13 b' let'
         sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
       };
     };
-    "camelcase-5.0.0" = {
+    "camelcase-5.3.1" = {
       name = "camelcase";
       packageName = "camelcase";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz";
-        sha512 = "faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==";
+      version = "5.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
+        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
       };
     };
     "caniuse-api-1.6.1" = {
@@ -1679,22 +1670,22 b' let'
         sha1 = "b534e7c734c4f81ec5fbe8aca2ad24354b962c6c";
       };
     };
-    "caniuse-db-1.0.30000927" = {
+    "caniuse-db-1.0.30000967" = {
       name = "caniuse-db";
       packageName = "caniuse-db";
-      version = "1.0.30000927";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000927.tgz";
-        sha512 = "CX/QvLA8oh7kQ9cHCCzFm0UZW4KwSyQSRJ5A1XtH42HaMJQ0yh+9fEVWagMqv9I1vSCtaqA5Mb8k0uKfv7jhDw==";
-      };
-    };
-    "caniuse-lite-1.0.30000927" = {
+      version = "1.0.30000967";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000967.tgz";
+        sha512 = "70gk6cLSD5rItxnZ7WUxyCpM9LAjEb1tVzlENQfXQXZS/IiGnfAC6u32G5cZFlDBKjNPBIta/QSx5CZLZepxRA==";
+      };
+    };
+    "caniuse-lite-1.0.30000967" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30000927";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000927.tgz";
-        sha512 = "ogq4NbUWf1uG/j66k0AmiO3GjqJAlQyF8n4w8a954cbCyFKmYGvRtgz6qkq2fWuduTXHibX7GyYL5Pg58Aks2g==";
+      version = "1.0.30000967";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz";
+        sha512 = "rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==";
       };
     };
     "caseless-0.12.0" = {
@@ -1742,13 +1733,13 b' let'
         sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
       };
     };
-    "chokidar-2.0.4" = {
+    "chokidar-2.1.5" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz";
-        sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz";
+        sha512 = "i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==";
       };
     };
     "chownr-1.1.1" = {
@@ -1976,13 +1967,13 b' let'
         sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==";
       };
     };
-    "combined-stream-1.0.7" = {
+    "combined-stream-1.0.8" = {
       name = "combined-stream";
       packageName = "combined-stream";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz";
-        sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
+        sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
       };
     };
     "commander-2.14.1" = {
@@ -2003,6 +1994,15 b' let'
         sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==";
       };
     };
+    "commander-2.19.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.19.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz";
+        sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==";
+      };
+    };
     "commondir-1.0.1" = {
       name = "commondir";
       packageName = "commondir";
@@ -2012,13 +2012,13 b' let'
         sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b";
       };
     };
-    "component-emitter-1.2.1" = {
+    "component-emitter-1.3.0" = {
       name = "component-emitter";
       packageName = "component-emitter";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
-        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz";
+        sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
       };
     };
     "concat-map-0.0.1" = {
@@ -2093,13 +2093,13 b' let'
         sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==";
       };
     };
-    "core-js-2.6.1" = {
+    "core-js-2.6.5" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz";
-        sha512 = "L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==";
+      version = "2.6.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz";
+        sha512 = "klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2201,13 +2201,13 b' let'
         sha512 = "xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==";
       };
     };
-    "css-what-2.1.2" = {
+    "css-what-2.1.3" = {
       name = "css-what";
       packageName = "css-what";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz";
-        sha512 = "wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz";
+        sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==";
       };
     };
     "cssesc-0.1.0" = {
@@ -2417,13 +2417,13 b' let'
         sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
       };
     };
-    "dir-glob-2.0.0" = {
+    "dir-glob-2.2.2" = {
       name = "dir-glob";
       packageName = "dir-glob";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz";
-        sha512 = "37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz";
+        sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==";
       };
     };
     "dom-converter-0.2.0" = {
@@ -2435,13 +2435,13 b' let'
         sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==";
       };
     };
-    "dom-serializer-0.1.0" = {
+    "dom-serializer-0.1.1" = {
       name = "dom-serializer";
       packageName = "dom-serializer";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
-        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz";
+        sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==";
       };
     };
     "dom5-2.3.0" = {
@@ -2462,15 +2462,6 b' let'
         sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==";
       };
     };
-    "domelementtype-1.1.3" = {
-      name = "domelementtype";
-      packageName = "domelementtype";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
-        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
-      };
-    };
     "domelementtype-1.3.1" = {
       name = "domelementtype";
       packageName = "domelementtype";
@@ -2480,15 +2471,6 b' let'
         sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
-    "domhandler-2.1.0" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz";
-        sha1 = "d2646f5e57f6c3bab11cf6cb05d3c0acf7412594";
-      };
-    };
     "domhandler-2.3.0" = {
       name = "domhandler";
       packageName = "domhandler";
@@ -2498,15 +2480,6 b' let'
         sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
       };
     };
-    "domutils-1.1.6" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz";
-        sha1 = "bddc3de099b9a2efacc51c623f28f416ecc57485";
-      };
-    };
     "domutils-1.5.1" = {
       name = "domutils";
       packageName = "domutils";
@@ -2516,13 +2489,22 b' let'
         sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
       };
     };
-    "duplexify-3.6.1" = {
+    "dropzone-5.5.1" = {
+      name = "dropzone";
+      packageName = "dropzone";
+      version = "5.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dropzone/-/dropzone-5.5.1.tgz";
+        sha512 = "3VduRWLxx9hbVr42QieQN25mx/I61/mRdUSuxAmDGdDqZIN8qtP7tcKMa3KfpJjuGjOJGYYUzzeq6eGDnkzesA==";
+      };
+    };
+    "duplexify-3.7.1" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz";
-        sha512 = "vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==";
+      version = "3.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz";
+        sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==";
       };
     };
     "ecc-jsbn-0.1.2" = {
@@ -2534,13 +2516,13 b' let'
         sha1 = "3a83a904e54353287874c564b7549386849a98c9";
       };
     };
-    "electron-to-chromium-1.3.98" = {
+    "electron-to-chromium-1.3.133" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.98";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.98.tgz";
-        sha512 = "WIZdNuvE3dFr6kkPgv4d/cfswNZD6XbeLBM8baOIQTsnbf4xWrVEaLvp7oNnbnMWWXDqq7Tbv+H5JfciLTJm4Q==";
+      version = "1.3.133";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.133.tgz";
+        sha512 = "lyoC8aoqbbDqsprb6aPdt9n3DpOZZzdz/T4IZKsR0/dkZIxnJVUjjcpOSwA66jPRIOyDAamCTAUqweU05kKNSg==";
       };
     };
     "elliptic-6.4.1" = {
@@ -2651,13 +2633,13 b' let'
         sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
-    "eslint-scope-4.0.0" = {
+    "eslint-scope-4.0.3" = {
       name = "eslint-scope";
       packageName = "eslint-scope";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz";
-        sha512 = "1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz";
+        sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==";
       };
     };
     "espree-3.5.4" = {
@@ -2732,13 +2714,13 b' let'
         sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
       };
     };
-    "events-1.1.1" = {
+    "events-3.0.0" = {
       name = "events";
       packageName = "events";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz";
-        sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/events/-/events-3.0.0.tgz";
+        sha512 = "Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==";
       };
     };
     "evp_bytestokey-1.0.3" = {
@@ -2948,13 +2930,13 b' let'
         sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc";
       };
     };
-    "fined-1.1.1" = {
+    "fined-1.2.0" = {
       name = "fined";
       packageName = "fined";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fined/-/fined-1.1.1.tgz";
-        sha512 = "jQp949ZmEbiYHk3gkbdtpJ0G1+kgtLQBNdP5edFP7Fh+WAYceLQz6yO1SBj72Xkg8GVyTB3bBzAYrHJVh5Xd5g==";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz";
+        sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==";
       };
     };
     "flagged-respawn-1.0.1" = {
@@ -2975,13 +2957,13 b' let'
         sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782";
       };
     };
-    "flush-write-stream-1.0.3" = {
+    "flush-write-stream-1.1.1" = {
       name = "flush-write-stream";
       packageName = "flush-write-stream";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz";
-        sha512 = "calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz";
+        sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==";
       };
     };
     "for-in-1.0.2" = {
@@ -3056,13 +3038,13 b' let'
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-1.2.4" = {
+    "fsevents-1.2.9" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz";
-        sha512 = "z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==";
+      version = "1.2.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz";
+        sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==";
       };
     };
     "function-bind-1.1.1" = {
@@ -3146,13 +3128,13 b' let'
         sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
       };
     };
-    "glob-7.1.3" = {
+    "glob-7.1.4" = {
       name = "glob";
       packageName = "glob";
-      version = "7.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz";
-        sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==";
+      version = "7.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
+        sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
       };
     };
     "glob-parent-3.1.0" = {
@@ -3524,13 +3506,13 b' let'
         sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8";
       };
     };
-    "homedir-polyfill-1.0.1" = {
+    "homedir-polyfill-1.0.3" = {
       name = "homedir-polyfill";
       packageName = "homedir-polyfill";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
-        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz";
+        sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==";
       };
     };
     "hooker-0.2.3" = {
@@ -3587,15 +3569,6 b' let'
         sha1 = "b01abbd723acaaa7b37b6af4492ebda03d9dd37b";
       };
     };
-    "htmlparser2-3.3.0" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz";
-        sha1 = "cc70d05a59f6542e43f0e685c982e14c924a9efe";
-      };
-    };
     "htmlparser2-3.8.3" = {
       name = "htmlparser2";
       packageName = "htmlparser2";
@@ -3650,13 +3623,13 b' let'
         sha1 = "83f0a0ec378bf3246178b6c2ad9136f135b1c962";
       };
     };
-    "ieee754-1.1.12" = {
+    "ieee754-1.1.13" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.1.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz";
-        sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==";
+      version = "1.1.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz";
+        sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
       };
     };
     "iferr-0.1.5" = {
@@ -3974,13 +3947,13 b' let'
         sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
       };
     };
-    "is-glob-4.0.0" = {
+    "is-glob-4.0.1" = {
       name = "is-glob";
       packageName = "is-glob";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz";
-        sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
+        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
       };
     };
     "is-number-3.0.0" = {
@@ -4145,13 +4118,13 b' let'
         sha1 = "dd8b74278b27102d29df63eae28308a8cfa1b583";
       };
     };
-    "js-base64-2.5.0" = {
+    "js-base64-2.5.1" = {
       name = "js-base64";
       packageName = "js-base64";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.0.tgz";
-        sha512 = "wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g==";
+      version = "2.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz";
+        sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==";
       };
     };
     "js-tokens-3.0.2" = {
@@ -4208,6 +4181,15 b' let'
         sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b";
       };
     };
+    "jshint-2.10.2" = {
+      name = "jshint";
+      packageName = "jshint";
+      version = "2.10.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz";
+        sha512 = "e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==";
+      };
+    };
     "jshint-2.9.7" = {
       name = "jshint";
       packageName = "jshint";
@@ -4370,13 +4352,13 b' let'
         sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec";
       };
     };
-    "loader-runner-2.3.1" = {
+    "loader-runner-2.4.0" = {
       name = "loader-runner";
       packageName = "loader-runner";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.1.tgz";
-        sha512 = "By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz";
+        sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==";
       };
     };
     "loader-utils-0.2.17" = {
@@ -4460,15 +4442,6 b' let'
         sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6";
       };
     };
-    "lodash.debounce-4.0.8" = {
-      name = "lodash.debounce";
-      packageName = "lodash.debounce";
-      version = "4.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz";
-        sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af";
-      };
-    };
     "lodash.isplainobject-4.0.6" = {
       name = "lodash.isplainobject";
       packageName = "lodash.isplainobject";
@@ -4613,13 +4586,13 b' let'
         sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
       };
     };
-    "mem-4.0.0" = {
+    "mem-4.3.0" = {
       name = "mem";
       packageName = "mem";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz";
-        sha512 = "WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz";
+        sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
       };
     };
     "memory-fs-0.4.1" = {
@@ -4658,31 +4631,31 b' let'
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-db-1.37.0" = {
+    "mime-db-1.40.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.37.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz";
-        sha512 = "R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==";
-      };
-    };
-    "mime-types-2.1.21" = {
+      version = "1.40.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
+        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
+      };
+    };
+    "mime-types-2.1.24" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz";
-        sha512 = "3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==";
-      };
-    };
-    "mimic-fn-1.2.0" = {
+      version = "2.1.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
+        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
+      };
+    };
+    "mimic-fn-2.1.0" = {
       name = "mimic-fn";
       packageName = "mimic-fn";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
-        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
+        sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
       };
     };
     "minimalistic-assert-1.0.1" = {
@@ -4775,22 +4748,22 b' let'
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
-    "moment-2.23.0" = {
+    "moment-2.24.0" = {
       name = "moment";
       packageName = "moment";
-      version = "2.23.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz";
-        sha512 = "3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA==";
-      };
-    };
-    "mousetrap-1.6.2" = {
+      version = "2.24.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz";
+        sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==";
+      };
+    };
+    "mousetrap-1.6.3" = {
       name = "mousetrap";
       packageName = "mousetrap";
-      version = "1.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.2.tgz";
-        sha512 = "jDjhi7wlHwdO6q6DS7YRmSHcuI+RVxadBkLt3KHrhd3C2b+w5pKefg3oj5beTcHZyVFA9Aksf+yEE1y5jxUjVA==";
+      version = "1.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.3.tgz";
+        sha512 = "bd+nzwhhs9ifsUrC2tWaSgm24/oo2c83zaRyZQF06hYA6sANfsXHtnZ19AbbbDXCDzeH5nZBSQ4NvCjgD62tJA==";
       };
     };
     "move-concurrently-1.0.1" = {
@@ -4811,13 +4784,13 b' let'
         sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
       };
     };
-    "nan-2.12.1" = {
+    "nan-2.13.2" = {
       name = "nan";
       packageName = "nan";
-      version = "2.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz";
-        sha512 = "JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==";
+      version = "2.13.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz";
+        sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==";
       };
     };
     "nanomatch-1.2.13" = {
@@ -4829,13 +4802,13 b' let'
         sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
       };
     };
-    "neo-async-2.6.0" = {
+    "neo-async-2.6.1" = {
       name = "neo-async";
       packageName = "neo-async";
-      version = "2.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz";
-        sha512 = "MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz";
+        sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==";
       };
     };
     "nice-try-1.0.5" = {
@@ -4856,13 +4829,13 b' let'
         sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==";
       };
     };
-    "node-libs-browser-2.1.0" = {
+    "node-libs-browser-2.2.0" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz";
-        sha512 = "5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz";
+        sha512 = "5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==";
       };
     };
     "nopt-1.0.10" = {
@@ -4910,6 +4883,15 b' let'
         sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
       };
     };
+    "normalize-path-3.0.0" = {
+      name = "normalize-path";
+      packageName = "normalize-path";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz";
+        sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
+      };
+    };
     "normalize-range-0.1.2" = {
       name = "normalize-range";
       packageName = "normalize-range";
@@ -4991,13 +4973,13 b' let'
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
-    "object-keys-1.0.12" = {
+    "object-keys-1.1.1" = {
       name = "object-keys";
       packageName = "object-keys";
-      version = "1.0.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz";
-        sha512 = "FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
+        sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
       };
     };
     "object-visit-1.0.1" = {
@@ -5117,13 +5099,13 b' let'
         sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
       };
     };
-    "p-is-promise-1.1.0" = {
+    "p-is-promise-2.1.0" = {
       name = "p-is-promise";
       packageName = "p-is-promise";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz";
-        sha1 = "9c9456989e9f6588017b0434d56097675c3da05e";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz";
+        sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==";
       };
     };
     "p-limit-1.3.0" = {
@@ -5135,13 +5117,13 b' let'
         sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
       };
     };
-    "p-limit-2.1.0" = {
+    "p-limit-2.2.0" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz";
-        sha512 = "NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz";
+        sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==";
       };
     };
     "p-locate-2.0.0" = {
@@ -5171,22 +5153,22 b' let'
         sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
       };
     };
-    "p-try-2.0.0" = {
+    "p-try-2.2.0" = {
       name = "p-try";
       packageName = "p-try";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz";
-        sha512 = "hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==";
-      };
-    };
-    "pako-1.0.7" = {
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
+        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
+      };
+    };
+    "pako-1.0.10" = {
       name = "pako";
       packageName = "pako";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-1.0.7.tgz";
-        sha512 = "3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ==";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz";
+        sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==";
       };
     };
     "parallel-transform-1.1.0" = {
@@ -5207,13 +5189,13 b' let'
         sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
       };
     };
-    "parse-asn1-5.1.1" = {
+    "parse-asn1-5.1.4" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz";
-        sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==";
+      version = "5.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz";
+        sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==";
       };
     };
     "parse-filepath-1.0.2" = {
@@ -5927,13 +5909,13 b' let'
         sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
       };
     };
-    "randombytes-2.0.6" = {
+    "randombytes-2.1.0" = {
       name = "randombytes";
       packageName = "randombytes";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz";
-        sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz";
+        sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==";
       };
     };
     "randomfill-1.0.4" = {
@@ -5954,15 +5936,6 b' let'
         sha512 = "guh4ZNAf96f+CDwfnPbFeFiO5YcfPllUmZrgcoOmx6iqZPq+DcKbnyjPuBxEAtQ3tqqd++qChsQfQB+VBzFT0Q==";
       };
     };
-    "readable-stream-1.0.34" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "1.0.34";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz";
-        sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
-      };
-    };
     "readable-stream-1.1.14" = {
       name = "readable-stream";
       packageName = "readable-stream";
@@ -6116,13 +6089,13 b' let'
         sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
       };
     };
-    "renderkid-2.0.2" = {
+    "renderkid-2.0.3" = {
       name = "renderkid";
       packageName = "renderkid";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.2.tgz";
-        sha512 = "FsygIxevi1jSiPY9h7vZmBFUbAOcbYm9UwyiLNdVsLRs/5We9Ob5NMPbGYUTWiLq5L+ezlVdE0A8bbME5CWTpg==";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz";
+        sha512 = "z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==";
       };
     };
     "repeat-element-1.1.3" = {
@@ -6179,13 +6152,13 b' let'
         sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
       };
     };
-    "resolve-1.9.0" = {
+    "resolve-1.10.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz";
-        sha512 = "TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==";
+      version = "1.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz";
+        sha512 = "KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==";
       };
     };
     "resolve-cwd-2.0.0" = {
@@ -6332,22 +6305,22 b' let'
         sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d";
       };
     };
-    "semver-5.6.0" = {
+    "semver-5.7.0" = {
       name = "semver";
       packageName = "semver";
-      version = "5.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz";
-        sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==";
-      };
-    };
-    "serialize-javascript-1.6.1" = {
+      version = "5.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
+        sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
+      };
+    };
+    "serialize-javascript-1.7.0" = {
       name = "serialize-javascript";
       packageName = "serialize-javascript";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz";
-        sha512 = "A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz";
+        sha512 = "ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==";
       };
     };
     "set-blocking-2.0.0" = {
@@ -6593,13 +6566,13 b' let'
         sha1 = "04e6926f662895354f3dd015203633b857297e2c";
       };
     };
-    "sshpk-1.16.0" = {
+    "sshpk-1.16.1" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.16.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz";
-        sha512 = "Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==";
+      version = "1.16.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
+        sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
       };
     };
     "ssri-5.3.0" = {
@@ -6629,13 +6602,13 b' let'
         sha1 = "142bf6b64c2b416e4b707ebf8f09b8b5a5043877";
       };
     };
-    "stream-browserify-2.0.1" = {
+    "stream-browserify-2.0.2" = {
       name = "stream-browserify";
       packageName = "stream-browserify";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz";
-        sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz";
+        sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==";
       };
     };
     "stream-each-1.2.3" = {
@@ -6836,13 +6809,13 b' let'
         sha512 = "2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==";
       };
     };
-    "tapable-1.1.1" = {
+    "tapable-1.1.3" = {
       name = "tapable";
       packageName = "tapable";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz";
-        sha512 = "9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz";
+        sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==";
       };
     };
     "through-2.3.8" = {
@@ -6872,13 +6845,13 b' let'
         sha512 = "YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==";
       };
     };
-    "tiny-emitter-2.0.2" = {
+    "tiny-emitter-2.1.0" = {
       name = "tiny-emitter";
       packageName = "tiny-emitter";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz";
-        sha512 = "2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz";
+        sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==";
       };
     };
     "tiny-lr-fork-0.0.5" = {
@@ -7034,13 +7007,13 b' let'
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.4.9" = {
+    "uglify-js-3.4.10" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.4.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz";
-        sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==";
+      version = "3.4.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz";
+        sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -7160,13 +7133,13 b' let'
         sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559";
       };
     };
-    "upath-1.1.0" = {
+    "upath-1.1.2" = {
       name = "upath";
       packageName = "upath";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz";
-        sha512 = "bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz";
+        sha512 = "kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==";
       };
     };
     "upper-case-1.1.3" = {
@@ -7223,13 +7196,13 b' let'
         sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
       };
     };
-    "util-0.10.4" = {
+    "util-0.11.1" = {
       name = "util";
       packageName = "util";
-      version = "0.10.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz";
-        sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==";
+      version = "0.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz";
+        sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -7268,31 +7241,31 b' let'
         sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
       };
     };
-    "v8-compile-cache-2.0.2" = {
+    "v8-compile-cache-2.0.3" = {
       name = "v8-compile-cache";
       packageName = "v8-compile-cache";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz";
-        sha512 = "1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==";
-      };
-    };
-    "v8flags-3.1.2" = {
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz";
+        sha512 = "CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==";
+      };
+    };
+    "v8flags-3.1.3" = {
       name = "v8flags";
       packageName = "v8flags";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.2.tgz";
-        sha512 = "MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw==";
-      };
-    };
-    "vendors-1.0.2" = {
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz";
+        sha512 = "amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==";
+      };
+    };
+    "vendors-1.0.3" = {
       name = "vendors";
       packageName = "vendors";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz";
-        sha512 = "w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz";
+        sha512 = "fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==";
       };
     };
     "verror-1.10.0" = {
@@ -7430,13 +7403,13 b' let'
         sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
       };
     };
-    "worker-farm-1.6.0" = {
+    "worker-farm-1.7.0" = {
       name = "worker-farm";
       packageName = "worker-farm";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz";
-        sha512 = "6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz";
+        sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==";
       };
     };
     "wrap-ansi-2.1.0" = {
@@ -7536,14 +7509,14 b' let'
       sources."@polymer/paper-behaviors-3.0.1"
       sources."@polymer/paper-button-3.0.1"
       sources."@polymer/paper-ripple-3.0.1"
-      sources."@polymer/paper-spinner-3.0.1"
+      sources."@polymer/paper-spinner-3.0.2"
       sources."@polymer/paper-styles-3.0.1"
       sources."@polymer/paper-toast-3.0.1"
       sources."@polymer/paper-toggle-button-3.0.1"
       sources."@polymer/paper-tooltip-3.0.1"
-      sources."@polymer/polymer-3.1.0"
+      sources."@polymer/polymer-3.2.0"
       sources."@types/clone-0.1.30"
-      sources."@types/node-6.14.2"
+      sources."@types/node-6.14.6"
       sources."@types/parse5-2.2.34"
       sources."@webassemblyjs/ast-1.7.10"
       sources."@webassemblyjs/floating-point-hex-parser-1.7.10"
@@ -7563,8 +7536,8 b' let'
       sources."@webassemblyjs/wasm-parser-1.7.10"
       sources."@webassemblyjs/wast-parser-1.7.10"
       sources."@webassemblyjs/wast-printer-1.7.10"
-      sources."@webcomponents/shadycss-1.7.1"
-      sources."@webcomponents/webcomponentsjs-2.2.1"
+      sources."@webcomponents/shadycss-1.9.1"
+      sources."@webcomponents/webcomponentsjs-2.2.10"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.1"
       sources."abbrev-1.1.1"
@@ -7576,7 +7549,7 b' let'
         ];
       })
       sources."ajv-4.11.8"
-      sources."ajv-keywords-3.2.0"
+      sources."ajv-keywords-3.4.0"
       (sources."align-text-0.1.4" // {
         dependencies = [
           sources."kind-of-3.2.2"
@@ -7586,7 +7559,11 b' let'
       sources."amdefine-1.0.1"
       sources."ansi-regex-0.2.1"
       sources."ansi-styles-1.1.0"
-      sources."anymatch-2.0.0"
+      (sources."anymatch-2.0.0" // {
+        dependencies = [
+          sources."normalize-path-2.1.1"
+        ];
+      })
       sources."appenlight-client-git+https://[e-mail]/AppEnlight/appenlight-client-js.git#0.5.1"
       sources."aproba-1.2.0"
       (sources."argparse-0.1.16" // {
@@ -7602,11 +7579,10 b' let'
       sources."array-union-1.0.2"
       sources."array-uniq-1.0.3"
       sources."array-unique-0.3.2"
-      sources."arrify-1.0.1"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."asn1.js-4.10.1"
-      (sources."assert-1.4.1" // {
+      (sources."assert-1.5.0" // {
         dependencies = [
           sources."inherits-2.0.1"
           sources."util-0.10.3"
@@ -7616,7 +7592,7 b' let'
       sources."assign-symbols-1.0.0"
       sources."ast-types-0.9.6"
       sources."async-0.1.22"
-      sources."async-each-1.0.1"
+      sources."async-each-1.0.3"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       (sources."autoprefixer-6.7.7" // {
@@ -7738,8 +7714,8 b' let'
       sources."base64-js-1.3.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
-      sources."binary-extensions-1.12.0"
-      sources."bluebird-3.5.3"
+      sources."binary-extensions-1.13.1"
+      sources."bluebird-3.5.4"
       sources."bn.js-4.11.8"
       sources."boolbase-1.0.0"
       sources."boom-2.10.1"
@@ -7763,7 +7739,7 b' let'
       sources."builtin-status-codes-3.0.0"
       (sources."cacache-10.0.4" // {
         dependencies = [
-          sources."glob-7.1.3"
+          sources."glob-7.1.4"
           sources."graceful-fs-4.1.15"
           sources."lru-cache-4.1.5"
           sources."minimatch-3.0.4"
@@ -7772,20 +7748,20 b' let'
       })
       sources."cache-base-1.0.1"
       sources."camel-case-3.0.0"
-      sources."camelcase-5.0.0"
+      sources."camelcase-5.3.1"
       (sources."caniuse-api-1.6.1" // {
         dependencies = [
           sources."browserslist-1.7.7"
         ];
       })
-      sources."caniuse-db-1.0.30000927"
-      sources."caniuse-lite-1.0.30000927"
+      sources."caniuse-db-1.0.30000967"
+      sources."caniuse-lite-1.0.30000967"
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
       sources."chalk-0.5.1"
-      (sources."chokidar-2.0.4" // {
-        dependencies = [
-          sources."is-glob-4.0.0"
+      (sources."chokidar-2.1.5" // {
+        dependencies = [
+          sources."is-glob-4.0.1"
         ];
       })
       sources."chownr-1.1.1"
@@ -7825,7 +7801,7 b' let'
       })
       (sources."cli-1.0.1" // {
         dependencies = [
-          sources."glob-7.1.3"
+          sources."glob-7.1.4"
           sources."minimatch-3.0.4"
         ];
       })
@@ -7848,10 +7824,10 b' let'
       sources."color-string-0.3.0"
       sources."colormin-1.1.2"
       sources."colors-0.6.2"
-      sources."combined-stream-1.0.7"
+      sources."combined-stream-1.0.8"
       sources."commander-2.14.1"
       sources."commondir-1.0.1"
-      sources."component-emitter-1.2.1"
+      sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
       (sources."concat-stream-1.6.2" // {
         dependencies = [
@@ -7864,7 +7840,7 b' let'
       sources."convert-source-map-1.6.0"
       (sources."copy-concurrently-1.0.5" // {
         dependencies = [
-          sources."glob-7.1.3"
+          sources."glob-7.1.4"
           sources."minimatch-3.0.4"
           sources."rimraf-2.6.3"
         ];
@@ -7872,11 +7848,11 b' let'
       sources."copy-descriptor-0.1.1"
       (sources."copy-webpack-plugin-4.6.0" // {
         dependencies = [
-          sources."is-glob-4.0.0"
+          sources."is-glob-4.0.1"
           sources."minimatch-3.0.4"
         ];
       })
-      sources."core-js-2.6.1"
+      sources."core-js-2.6.5"
       sources."core-util-is-1.0.2"
       sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
@@ -7896,7 +7872,7 b' let'
           sources."regexpu-core-1.0.0"
         ];
       })
-      sources."css-what-2.1.2"
+      sources."css-what-2.1.3"
       sources."cssesc-0.1.0"
       sources."cssnano-3.10.0"
       sources."csso-2.3.2"
@@ -7921,11 +7897,10 b' let'
       sources."detect-file-1.0.0"
       sources."detect-indent-4.0.0"
       sources."diffie-hellman-5.0.3"
-      sources."dir-glob-2.0.0"
+      sources."dir-glob-2.2.2"
       sources."dom-converter-0.2.0"
-      (sources."dom-serializer-0.1.0" // {
-        dependencies = [
-          sources."domelementtype-1.1.3"
+      (sources."dom-serializer-0.1.1" // {
+        dependencies = [
           sources."entities-1.1.2"
         ];
       })
@@ -7939,14 +7914,15 b' let'
       sources."domelementtype-1.3.1"
       sources."domhandler-2.3.0"
       sources."domutils-1.5.1"
-      (sources."duplexify-3.6.1" // {
+      sources."dropzone-5.5.1"
+      (sources."duplexify-3.7.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
         ];
       })
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.98"
+      sources."electron-to-chromium-1.3.133"
       sources."elliptic-6.4.1"
       sources."emojis-list-2.1.0"
       sources."end-of-stream-1.4.1"
@@ -7961,14 +7937,14 b' let'
       sources."es-to-primitive-1.2.0"
       sources."es6-templates-0.2.3"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-scope-4.0.0"
+      sources."eslint-scope-4.0.3"
       sources."espree-3.5.4"
       sources."esprima-1.0.4"
       sources."esrecurse-4.2.1"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."eventemitter2-0.4.14"
-      sources."events-1.1.1"
+      sources."events-3.0.0"
       sources."evp_bytestokey-1.0.3"
       sources."execa-1.0.0"
       sources."exit-0.1.2"
@@ -8025,10 +8001,10 b' let'
           sources."minimatch-0.3.0"
         ];
       })
-      sources."fined-1.1.1"
+      sources."fined-1.2.0"
       sources."flagged-respawn-1.0.1"
       sources."flatten-1.0.2"
-      (sources."flush-write-stream-1.0.3" // {
+      (sources."flush-write-stream-1.1.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
@@ -8051,7 +8027,7 b' let'
         ];
       })
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.4"
+      sources."fsevents-1.2.9"
       sources."function-bind-1.1.1"
       sources."gaze-0.5.2"
       sources."get-caller-file-1.0.3"
@@ -8083,7 +8059,7 b' let'
       sources."globals-9.18.0"
       (sources."globby-7.1.1" // {
         dependencies = [
-          sources."glob-7.1.3"
+          sources."glob-7.1.4"
           sources."minimatch-3.0.4"
         ];
       })
@@ -8115,12 +8091,18 b' let'
           sources."supports-color-2.0.0"
         ];
       })
-      sources."grunt-contrib-jshint-0.12.0"
+      (sources."grunt-contrib-jshint-0.12.0" // {
+        dependencies = [
+          sources."jshint-2.9.7"
+          sources."lodash-4.17.11"
+          sources."minimatch-3.0.4"
+        ];
+      })
       (sources."grunt-contrib-less-1.4.1" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
           sources."ansi-styles-2.2.1"
-          sources."async-2.6.1"
+          sources."async-2.6.2"
           sources."chalk-1.1.3"
           sources."has-ansi-2.0.0"
           sources."lodash-4.17.11"
@@ -8172,7 +8154,7 b' let'
       sources."hmac-drbg-1.0.1"
       sources."hoek-2.16.3"
       sources."home-or-tmp-2.0.0"
-      sources."homedir-polyfill-1.0.1"
+      sources."homedir-polyfill-1.0.3"
       sources."hooker-0.2.3"
       sources."html-comment-regex-1.1.2"
       sources."html-loader-0.4.5"
@@ -8203,7 +8185,7 b' let'
           sources."supports-color-5.5.0"
         ];
       })
-      sources."ieee754-1.1.12"
+      sources."ieee754-1.1.13"
       sources."iferr-0.1.5"
       sources."ignore-3.3.10"
       sources."image-size-0.5.5"
@@ -8211,9 +8193,9 b' let'
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.1.0"
+          sources."p-limit-2.2.0"
           sources."p-locate-3.0.0"
-          sources."p-try-2.0.0"
+          sources."p-try-2.2.0"
           sources."pkg-dir-3.0.0"
         ];
       })
@@ -8261,12 +8243,12 b' let'
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
       sources."jquery-1.11.3"
-      sources."js-base64-2.5.0"
+      sources."js-base64-2.5.1"
       sources."js-tokens-3.0.2"
       sources."js-yaml-2.0.5"
       sources."jsbn-0.1.1"
       sources."jsesc-1.3.0"
-      (sources."jshint-2.9.7" // {
+      (sources."jshint-2.10.2" // {
         dependencies = [
           sources."lodash-4.17.11"
           sources."minimatch-3.0.4"
@@ -8297,12 +8279,11 b' let'
           sources."findup-sync-2.0.0"
         ];
       })
-      sources."loader-runner-2.3.1"
+      sources."loader-runner-2.4.0"
       sources."loader-utils-1.2.3"
       sources."locate-path-2.0.0"
       sources."lodash-0.9.2"
       sources."lodash.camelcase-4.3.0"
-      sources."lodash.debounce-4.0.8"
       sources."lodash.isplainobject-4.0.6"
       sources."lodash.memoize-4.1.2"
       sources."lodash.uniq-4.5.0"
@@ -8318,7 +8299,7 b' let'
       sources."mark.js-8.11.1"
       sources."math-expression-evaluator-1.2.17"
       sources."md5.js-1.3.5"
-      sources."mem-4.0.0"
+      sources."mem-4.3.0"
       (sources."memory-fs-0.4.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
@@ -8328,9 +8309,9 b' let'
       sources."micromatch-3.1.10"
       sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
-      sources."mime-db-1.37.0"
-      sources."mime-types-2.1.21"
-      sources."mimic-fn-1.2.0"
+      sources."mime-db-1.40.0"
+      sources."mime-types-2.1.24"
+      sources."mimic-fn-2.1.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-0.2.14"
@@ -8346,22 +8327,22 b' let'
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.23.0"
-      sources."mousetrap-1.6.2"
+      sources."moment-2.24.0"
+      sources."mousetrap-1.6.3"
       (sources."move-concurrently-1.0.1" // {
         dependencies = [
-          sources."glob-7.1.3"
+          sources."glob-7.1.4"
           sources."minimatch-3.0.4"
           sources."rimraf-2.6.3"
         ];
       })
       sources."ms-2.0.0"
-      sources."nan-2.12.1"
+      sources."nan-2.13.2"
       sources."nanomatch-1.2.13"
-      sources."neo-async-2.6.0"
+      sources."neo-async-2.6.1"
       sources."nice-try-1.0.5"
       sources."no-case-2.3.2"
-      (sources."node-libs-browser-2.1.0" // {
+      (sources."node-libs-browser-2.2.0" // {
         dependencies = [
           (sources."readable-stream-2.3.6" // {
             dependencies = [
@@ -8377,7 +8358,7 b' let'
           sources."nopt-2.0.0"
         ];
       })
-      sources."normalize-path-2.1.1"
+      sources."normalize-path-3.0.0"
       sources."normalize-range-0.1.2"
       sources."normalize-url-1.9.1"
       sources."npm-run-path-2.0.2"
@@ -8399,7 +8380,7 b' let'
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-keys-1.0.12"
+      sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.defaults-1.1.0"
       sources."object.getownpropertydescriptors-2.0.3"
@@ -8413,11 +8394,11 b' let'
       sources."osenv-0.1.5"
       sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
-      sources."p-is-promise-1.1.0"
+      sources."p-is-promise-2.1.0"
       sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
-      sources."pako-1.0.7"
+      sources."pako-1.0.10"
       (sources."parallel-transform-1.1.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
@@ -8425,7 +8406,7 b' let'
         ];
       })
       sources."param-case-2.1.1"
-      sources."parse-asn1-5.1.1"
+      sources."parse-asn1-5.1.4"
       sources."parse-filepath-1.0.2"
       sources."parse-passwd-1.0.0"
       sources."parse5-3.0.3"
@@ -8564,7 +8545,7 b' let'
       sources."query-string-4.3.4"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
-      sources."randombytes-2.0.6"
+      sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
       sources."raw-loader-1.0.0-beta.0"
       (sources."readable-stream-1.1.14" // {
@@ -8608,14 +8589,9 b' let'
       })
       sources."relateurl-0.2.7"
       sources."remove-trailing-separator-1.1.0"
-      (sources."renderkid-2.0.2" // {
+      (sources."renderkid-2.0.3" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
-          sources."domhandler-2.1.0"
-          sources."domutils-1.1.6"
-          sources."htmlparser2-3.3.0"
-          sources."isarray-0.0.1"
-          sources."readable-stream-1.0.34"
           sources."strip-ansi-3.0.1"
         ];
       })
@@ -8625,7 +8601,7 b' let'
       sources."request-2.81.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."resolve-1.9.0"
+      sources."resolve-1.10.1"
       sources."resolve-cwd-2.0.0"
       sources."resolve-dir-1.0.1"
       sources."resolve-from-3.0.0"
@@ -8641,12 +8617,12 b' let'
       sources."sax-1.2.4"
       (sources."schema-utils-0.4.7" // {
         dependencies = [
-          sources."ajv-6.6.2"
+          sources."ajv-6.10.0"
         ];
       })
       sources."select-1.1.2"
-      sources."semver-5.6.0"
-      sources."serialize-javascript-1.6.1"
+      sources."semver-5.7.0"
+      sources."serialize-javascript-1.7.0"
       sources."set-blocking-2.0.0"
       (sources."set-value-2.0.0" // {
         dependencies = [
@@ -8698,7 +8674,7 b' let'
       sources."source-map-url-0.4.0"
       sources."split-string-3.1.0"
       sources."sprintf-js-1.0.3"
-      (sources."sshpk-1.16.0" // {
+      (sources."sshpk-1.16.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -8722,7 +8698,7 b' let'
         ];
       })
       sources."sticky-sidebar-3.3.1"
-      (sources."stream-browserify-2.0.1" // {
+      (sources."stream-browserify-2.0.2" // {
         dependencies = [
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
@@ -8759,7 +8735,7 b' let'
           sources."js-yaml-3.7.0"
         ];
       })
-      sources."tapable-1.1.1"
+      sources."tapable-1.1.3"
       sources."through-2.3.8"
       (sources."through2-2.0.5" // {
         dependencies = [
@@ -8768,7 +8744,7 b' let'
         ];
       })
       sources."timers-browserify-2.0.10"
-      sources."tiny-emitter-2.0.2"
+      sources."tiny-emitter-2.1.0"
       (sources."tiny-lr-fork-0.0.5" // {
         dependencies = [
           sources."debug-0.7.4"
@@ -8808,9 +8784,9 b' let'
           sources."source-map-0.6.1"
         ];
       })
-      (sources."uglify-js-3.4.9" // {
-        dependencies = [
-          sources."commander-2.17.1"
+      (sources."uglify-js-3.4.10" // {
+        dependencies = [
+          sources."commander-2.19.0"
           sources."source-map-0.6.1"
         ];
       })
@@ -8843,7 +8819,7 b' let'
           sources."has-values-0.1.4"
         ];
       })
-      sources."upath-1.1.0"
+      sources."upath-1.1.2"
       sources."upper-case-1.1.3"
       (sources."uri-js-4.2.2" // {
         dependencies = [
@@ -8857,14 +8833,14 b' let'
         ];
       })
       sources."use-3.1.1"
-      sources."util-0.10.4"
+      sources."util-0.11.1"
       sources."util-deprecate-1.0.2"
       sources."util.promisify-1.0.0"
       sources."utila-0.4.0"
       sources."uuid-3.3.2"
-      sources."v8-compile-cache-2.0.2"
-      sources."v8flags-3.1.2"
-      sources."vendors-1.0.2"
+      sources."v8-compile-cache-2.0.3"
+      sources."v8flags-3.1.3"
+      sources."vendors-1.0.3"
       (sources."verror-1.10.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
@@ -8879,7 +8855,7 b' let'
       sources."waypoints-4.0.1"
       (sources."webpack-4.23.1" // {
         dependencies = [
-          sources."ajv-6.6.2"
+          sources."ajv-6.10.0"
         ];
       })
       (sources."webpack-cli-3.1.2" // {
@@ -8919,7 +8895,7 b' let'
       sources."which-module-2.0.0"
       sources."window-size-0.1.0"
       sources."wordwrap-0.0.2"
-      sources."worker-farm-1.6.0"
+      sources."worker-farm-1.7.0"
       (sources."wrap-ansi-2.1.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -8935,9 +8911,9 b' let'
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.1.0"
+          sources."p-limit-2.2.0"
           sources."p-locate-3.0.0"
-          sources."p-try-2.0.0"
+          sources."p-try-2.2.0"
         ];
       })
       sources."yargs-parser-11.1.1"

pkgs/python-packages-overrides.nix

@@ -35,6 +35,18 b' self: super: {'
     ];
   });
 
+  "cffi" = super."cffi".override (attrs: {
+    buildInputs = [
+      pkgs.libffi
+    ];
+  });
+
+  "cryptography" = super."cryptography".override (attrs: {
+    buildInputs = [
+      pkgs.openssl
+    ];
+  });
+
   "gevent" = super."gevent".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       # NOTE: (marcink) odd requirements from gevent aren't set properly,
@@ -152,12 +164,6 b' self: super: {'
     };
   });
 
-  "pytest-runner" = super."pytest-runner".override (attrs: {
-    propagatedBuildInputs = [
-      self."setuptools-scm"
-    ];
-  });
-
   "python-ldap" = super."python-ldap".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       pkgs.openldap

pkgs/python-packages.nix

@@ -5,7 +5,7 b''
 
 self: super: {
   "alembic" = super.buildPythonPackage {
-    name = "alembic-1.0.5";
+    name = "alembic-1.0.10";
     doCheck = false;
     propagatedBuildInputs = [
       self."sqlalchemy"
@@ -14,8 +14,8 b' self: super: {'
       self."python-dateutil"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/1c/65/b8e4f5b2f345bb13b5e0a3fddd892b0b3f0e8ad4880e954fdc6a50d00d84/alembic-1.0.5.tar.gz";
-      sha256 = "0rpjqp2iq6p49x1nli18ivak1izz547nnjxi110mzrgc1v7dxzz9";
+      url = "https://files.pythonhosted.org/packages/6e/8b/fa3bd058cccd5e9177fea4efa26bfb769228fdd3178436ad5e05830ef6ef/alembic-1.0.10.tar.gz";
+      sha256 = "1dwl0264r6ri2jyrjr68am04x538ab26xwy4crqjnnhm4alwm3c2";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -51,6 +51,17 b' self: super: {'
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
+  "asn1crypto" = super.buildPythonPackage {
+    name = "asn1crypto-0.24.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/fc/f1/8db7daa71f414ddabfa056c4ef792e1461ff655c2ae2928a2b675bfed6b4/asn1crypto-0.24.0.tar.gz";
+      sha256 = "0jaf8rf9dx1lf23xfv2cdd5h52f1qr3w8k63985bc35g3d220p4x";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
   "atomicwrites" = super.buildPythonPackage {
     name = "atomicwrites-1.2.1";
     doCheck = false;
@@ -77,8 +88,8 b' self: super: {'
     name = "authomatic-0.1.0.post1";
     doCheck = false;
     src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801";
-      sha256 = "1cgk0a86sbsjbri06gf5z5l4npwkjdxw6fdnwl4vvfmxs2sx9yxw";
+      url = "https://code.rhodecode.com/upstream/authomatic/artifacts/download/0-4fe9c041-a567-4f84-be4c-7efa2a606d3c.tar.gz?md5=f6bdc3c769688212db68233e8d2b0383";
+      sha256 = "0pc716mva0ym6xd8jwzjbjp8dqxy9069wwwv2aqwb8lyhl4757ab";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -146,15 +157,15 b' self: super: {'
     };
   };
   "bleach" = super.buildPythonPackage {
-    name = "bleach-3.0.2";
+    name = "bleach-3.1.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
       self."webencodings"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/ae/31/680afc7d44040004296a2d8f0584983c2f2386448cd9d0964197e6c1160e/bleach-3.0.2.tar.gz";
-      sha256 = "06474zg7f73hv8h1xw2wcsmvn2ygj73zxgxxqg8zcx8ap1srdls8";
+      url = "https://files.pythonhosted.org/packages/78/5a/0df03e8735cd9c75167528299c738702437589b9c71a849489d00ffa82e8/bleach-3.1.0.tar.gz";
+      sha256 = "1yhrgrhkln8bd6gn3imj69g1h4xqah9gaz9q26crqr6gmmvpzprz";
     };
     meta = {
       license = [ pkgs.lib.licenses.asl20 ];
@@ -187,6 +198,20 b' self: super: {'
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
+  "cffi" = super.buildPythonPackage {
+    name = "cffi-1.12.2";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."pycparser"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/64/7c/27367b38e6cc3e1f49f193deb761fe75cda9f95da37b67b422e62281fcac/cffi-1.12.2.tar.gz";
+      sha256 = "19qfks2djya8vix95bmg3xzipjb8w9b8mbj4j5k2hqkc8j58f4z1";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
   "chameleon" = super.buildPythonPackage {
     name = "chameleon-2.24";
     doCheck = false;
@@ -230,7 +255,7 b' self: super: {'
     };
   };
   "colander" = super.buildPythonPackage {
-    name = "colander-1.5.1";
+    name = "colander-1.7.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."translationstring"
@@ -238,8 +263,8 b' self: super: {'
       self."enum34"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/ec/d1/fcca811a0a692c69d27e36b4d11a73acb98b4bab48323442642b6fd4386d/colander-1.5.1.tar.gz";
-      sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq";
+      url = "https://files.pythonhosted.org/packages/db/e4/74ab06f54211917b41865cafc987ce511e35503de48da9bfe9358a1bdc3e/colander-1.7.0.tar.gz";
+      sha256 = "1wl1bqab307lbbcjx81i28s3yl6dlm4rf15fxawkjb6j48x1cn6p";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
@@ -252,19 +277,19 b' self: super: {'
       self."six"
     ];
     src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c";
-      sha256 = "1hhcxirwvg58grlfr177b3awhbq8hlx1l3lh69ifl1ki7lfd1s1x";
+      url = "https://code.rhodecode.com/upstream/configobj/artifacts/download/0-012de99a-b1e1-4f64-a5c0-07a98a41b324.tar.gz?md5=6a513f51fe04b2c18cf84c1395a7c626";
+      sha256 = "0kqfrdfr14mw8yd8qwq14dv2xghpkjmd3yjsy8dfcbvpcc17xnxp";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   "configparser" = super.buildPythonPackage {
-    name = "configparser-3.7.1";
+    name = "configparser-3.7.4";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/b6/a6/eceea7c5a5dbcf56815bed411c38cabd8a879386be10717b160e7362b5a2/configparser-3.7.1.tar.gz";
-      sha256 = "0cnz213il9lhgda6x70fw7mfqr8da43s3wm343lwzhqx94mgmmav";
+      url = "https://files.pythonhosted.org/packages/e2/1c/83fd53748d8245cb9a3399f705c251d3fc0ce7df04450aac1cfc49dd6a0f/configparser-3.7.4.tar.gz";
+      sha256 = "0xac32886ihs2xg7w1gppcq2sgin5qsm8lqwijs5xifq9w0x0q6s";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -285,16 +310,34 b' self: super: {'
     };
   };
   "coverage" = super.buildPythonPackage {
-    name = "coverage-4.5.1";
+    name = "coverage-4.5.3";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/35/fe/e7df7289d717426093c68d156e0fd9117c8f4872b6588e8a8928a0f68424/coverage-4.5.1.tar.gz";
-      sha256 = "1wbrzpxka3xd4nmmkc6q0ir343d91kymwsm8pbmwa0d2a7q4ir2n";
+      url = "https://files.pythonhosted.org/packages/82/70/2280b5b29a0352519bb95ab0ef1ea942d40466ca71c53a2085bdeff7b0eb/coverage-4.5.3.tar.gz";
+      sha256 = "02f6m073qdispn96rc616hg0rnmw1pgqzw3bgxwiwza4zf9hirlx";
     };
     meta = {
       license = [ pkgs.lib.licenses.asl20 ];
     };
   };
+  "cryptography" = super.buildPythonPackage {
+    name = "cryptography-2.6.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."asn1crypto"
+      self."six"
+      self."cffi"
+      self."enum34"
+      self."ipaddress"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff92f3563476c3b00d0a9157d9c0217449/cryptography-2.6.1.tar.gz";
+      sha256 = "19iwz5avym5zl6jrrrkym1rdaa9h61j20ph4cswsqgv8xg5j3j16";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "BSD or Apache License, Version 2.0"; } pkgs.lib.licenses.asl20 ];
+    };
+  };
   "cssselect" = super.buildPythonPackage {
     name = "cssselect-1.0.3";
     doCheck = false;
@@ -337,11 +380,11 b' self: super: {'
     };
   };
   "defusedxml" = super.buildPythonPackage {
-    name = "defusedxml-0.5.0";
+    name = "defusedxml-0.6.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/74/ba/4ba4e89e21b5a2e267d80736ea674609a0a33cc4435a6d748ef04f1f9374/defusedxml-0.5.0.tar.gz";
-      sha256 = "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4";
+      url = "https://files.pythonhosted.org/packages/a4/5f/f8aa58ca0cf01cbcee728abc9d88bfeb74e95e6cb4334cfd5bed5673ea77/defusedxml-0.6.0.tar.gz";
+      sha256 = "1xbp8fivl3wlbyg2jrvs4lalaqv1xp9a9f29p75wdx2s2d6h717n";
     };
     meta = {
       license = [ pkgs.lib.licenses.psfl ];
@@ -399,11 +442,11 b' self: super: {'
     };
   };
   "ecdsa" = super.buildPythonPackage {
-    name = "ecdsa-0.13";
+    name = "ecdsa-0.13.2";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/f9/e5/99ebb176e47f150ac115ffeda5fedb6a3dbb3c00c74a59fd84ddf12f5857/ecdsa-0.13.tar.gz";
-      sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4";
+      url = "https://files.pythonhosted.org/packages/51/76/139bf6e9b7b6684d5891212cdbd9e0739f2bfc03f380a1a6ffa700f392ac/ecdsa-0.13.2.tar.gz";
+      sha256 = "116qaq7bh4lcynzi613960jhsnn19v0kmsqwahiwjfj14gx4y0sw";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -491,8 +534,8 b' self: super: {'
       self."configparser"
     ];
     src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313";
-      sha256 = "0bihrdp8ahsys437kxdhk52gz6kib8rxjv71i93wkw7594fcaxll";
+      url = "https://code.rhodecode.com/upstream/entrypoints/artifacts/download/0-8e9ee9e4-c4db-409c-b07e-81568fd1832d.tar.gz?md5=3a027b8ff1d257b91fe257de6c43357d";
+      sha256 = "0qih72n2myclanplqipqxpgpj9d2yhff1pz5d02zq1cfqyd173w5";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -623,11 +666,11 b' self: super: {'
     };
   };
   "hupper" = super.buildPythonPackage {
-    name = "hupper-1.4.2";
+    name = "hupper-1.6.1";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/f1/75/1915dc7650b4867fa3049256e24ca8eddb5989998fcec788cf52b9812dfc/hupper-1.4.2.tar.gz";
-      sha256 = "16vb9fkiaakdpcp6pn56h3w0dwvm67bxq2k2dv4i382qhqwphdzb";
+      url = "https://files.pythonhosted.org/packages/85/d9/e005d357b11249c5d70ddf5b7adab2e4c0da4e8b0531ff146917a04fe6c0/hupper-1.6.1.tar.gz";
+      sha256 = "0d3cvkc8ssgwk54wvhbifj56ry97qi10pfzwfk8vwzzcikbfp3zy";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -671,15 +714,15 b' self: super: {'
     };
   };
   "ipdb" = super.buildPythonPackage {
-    name = "ipdb-0.11";
+    name = "ipdb-0.12";
     doCheck = false;
     propagatedBuildInputs = [
       self."setuptools"
       self."ipython"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/80/fe/4564de08f174f3846364b3add8426d14cebee228f741c27e702b2877e85b/ipdb-0.11.tar.gz";
-      sha256 = "02m0l8wrhhd3z7dg3czn5ys1g5pxib516hpshdzp7rxzsxgcd0bh";
+      url = "https://files.pythonhosted.org/packages/6d/43/c3c2e866a8803e196d6209595020a4a6db1a3c5d07c01455669497ae23d0/ipdb-0.12.tar.gz";
+      sha256 = "1khr2n7xfy8hg65kj1bsrjq9g7656pp0ybfa8abpbzpdawji3qnw";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -802,14 +845,14 b' self: super: {'
     };
   };
   "jupyter-core" = super.buildPythonPackage {
-    name = "jupyter-core-4.4.0";
+    name = "jupyter-core-4.5.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."traitlets"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/b6/2d/2804f4de3a95583f65e5dcb4d7c8c7183124882323758996e867f47e72af/jupyter_core-4.4.0.tar.gz";
-      sha256 = "1dy083rarba8prn9f9srxq3c7n7vyql02ycrqq306c40lr57aw5s";
+      url = "https://files.pythonhosted.org/packages/4a/de/ff4ca734656d17ebe0450807b59d728f45277e2e7f4b82bc9aae6cb82961/jupyter_core-4.5.0.tar.gz";
+      sha256 = "1xr4pbghwk5hayn5wwnhb7z95380r45p79gf5if5pi1akwg7qvic";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1008,14 +1051,14 b' self: super: {'
     };
   };
   "paste" = super.buildPythonPackage {
-    name = "paste-3.0.5";
+    name = "paste-3.0.8";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/d4/41/91bde422400786b1b06357c1e6e3a5379f54dc3002aeb337cb767233304e/Paste-3.0.5.tar.gz";
-      sha256 = "1a6i8fh1fg8r4x800fvy9r82m15clwjim6yf2g9r4dff0y40dchv";
+      url = "https://files.pythonhosted.org/packages/66/65/e3acf1663438483c1f6ced0b6c6f3b90da9f0faacb0a6e2aa0f3f9f4b235/Paste-3.0.8.tar.gz";
+      sha256 = "05w1sh6ky4d7pmdb8nv82n13w22jcn3qsagg5ih3hjmbws9kkwf4";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1033,7 +1076,7 b' self: super: {'
     };
   };
   "pastescript" = super.buildPythonPackage {
-    name = "pastescript-3.0.0";
+    name = "pastescript-3.1.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."paste"
@@ -1041,23 +1084,23 b' self: super: {'
       self."six"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/08/2a/3797377a884ab9a064ad4d564ed612e54d26d7997caa8229c9c9df4eac31/PasteScript-3.0.0.tar.gz";
-      sha256 = "1hvmyz1sbn7ws1syw567ph7km9fi0wi75r3vlyzx6sk0z26xkm6r";
+      url = "https://files.pythonhosted.org/packages/9e/1d/14db1c283eb21a5d36b6ba1114c13b709629711e64acab653d9994fe346f/PasteScript-3.1.0.tar.gz";
+      sha256 = "02qcxjjr32ks7a6d4f533wl34ysc7yhwlrfcyqwqbzr52250v4fs";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "pathlib2" = super.buildPythonPackage {
-    name = "pathlib2-2.3.3";
+    name = "pathlib2-2.3.4";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
       self."scandir"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/bf/d7/a2568f4596b75d2c6e2b4094a7e64f620decc7887f69a1f2811931ea15b9/pathlib2-2.3.3.tar.gz";
-      sha256 = "0hpp92vqqgcd8h92msm9slv161b1q160igjwnkf2ag6cx0c96695";
+      url = "https://files.pythonhosted.org/packages/b5/f4/9c7cc726ece2498b6c8b62d3262aa43f59039b953fe23c9964ac5e18d40b/pathlib2-2.3.4.tar.gz";
+      sha256 = "1y0f9rkm1924zrc5dn4bwxlhgdkbml82lkcc28l5rgmr7d918q24";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1075,14 +1118,14 b' self: super: {'
     };
   };
   "pexpect" = super.buildPythonPackage {
-    name = "pexpect-4.6.0";
+    name = "pexpect-4.7.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."ptyprocess"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/89/43/07d07654ee3e25235d8cea4164cdee0ec39d1fda8e9203156ebe403ffda4/pexpect-4.6.0.tar.gz";
-      sha256 = "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia";
+      url = "https://files.pythonhosted.org/packages/1c/b1/362a0d4235496cb42c33d1d8732b5e2c607b0129ad5fdd76f5a583b9fcb3/pexpect-4.7.0.tar.gz";
+      sha256 = "1sv2rri15zwhds85a4kamwh9pj49qcxv7m4miyr4jfpfwv81yb4y";
     };
     meta = {
       license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ];
@@ -1117,63 +1160,63 b' self: super: {'
     };
   };
   "plaster-pastedeploy" = super.buildPythonPackage {
-    name = "plaster-pastedeploy-0.6";
+    name = "plaster-pastedeploy-0.7";
     doCheck = false;
     propagatedBuildInputs = [
       self."pastedeploy"
       self."plaster"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/3f/e7/6a6833158d2038ec40085433308a1e164fd1dac595513f6dd556d5669bb8/plaster_pastedeploy-0.6.tar.gz";
-      sha256 = "1bkggk18f4z2bmsmxyxabvf62znvjwbivzh880419r3ap0616cf2";
+      url = "https://files.pythonhosted.org/packages/99/69/2d3bc33091249266a1bd3cf24499e40ab31d54dffb4a7d76fe647950b98c/plaster_pastedeploy-0.7.tar.gz";
+      sha256 = "1zg7gcsvc1kzay1ry5p699rg2qavfsxqwl17mqxzr0gzw6j9679r";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "pluggy" = super.buildPythonPackage {
-    name = "pluggy-0.8.1";
+    name = "pluggy-0.11.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/38/e1/83b10c17688af7b2998fa5342fec58ecbd2a5a7499f31e606ae6640b71ac/pluggy-0.8.1.tar.gz";
-      sha256 = "05l6g42p9ilmabw0hlbiyxy6gyzjri41m5l11a8dzgvi77q35p4d";
+      url = "https://files.pythonhosted.org/packages/0d/a1/862ab336e8128fde20981d2c1aa8506693412daf5083b1911d539412676b/pluggy-0.11.0.tar.gz";
+      sha256 = "10511a54dvafw1jrk75mrhml53c7b7w4yaw7241696lc2hfvr895";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "prompt-toolkit" = super.buildPythonPackage {
-    name = "prompt-toolkit-1.0.15";
+    name = "prompt-toolkit-1.0.16";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
       self."wcwidth"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/8a/ad/cf6b128866e78ad6d7f1dc5b7f99885fb813393d9860778b2984582e81b5/prompt_toolkit-1.0.15.tar.gz";
-      sha256 = "05v9h5nydljwpj5nm8n804ms0glajwfy1zagrzqrg91wk3qqi1c5";
+      url = "https://files.pythonhosted.org/packages/f1/03/bb36771dc9fa7553ac4bdc639a9ecdf6fda0ff4176faf940d97e3c16e41d/prompt_toolkit-1.0.16.tar.gz";
+      sha256 = "1d65hm6nf0cbq0q0121m60zzy4s1fpg9fn761s1yxf08dridvkn1";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   "psutil" = super.buildPythonPackage {
-    name = "psutil-5.4.8";
+    name = "psutil-5.5.1";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/e3/58/0eae6e4466e5abf779d7e2b71fac7fba5f59e00ea36ddb3ed690419ccb0f/psutil-5.4.8.tar.gz";
-      sha256 = "1hyna338sml2cl1mfb2gs89np18z27mvyhmq4ifh22x07n7mq9kf";
+      url = "https://files.pythonhosted.org/packages/c7/01/7c30b247cdc5ba29623faa5c8cf1f1bbf7e041783c340414b0ed7e067c64/psutil-5.5.1.tar.gz";
+      sha256 = "045qaqvn6k90bj5bcy259yrwcd2afgznaav3sfhphy9b8ambzkkj";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   "psycopg2" = super.buildPythonPackage {
-    name = "psycopg2-2.7.5";
+    name = "psycopg2-2.8.3";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/b2/c1/7bf6c464e903ffc4f3f5907c389e5a4199666bf57f6cd6bf46c17912a1f9/psycopg2-2.7.5.tar.gz";
-      sha256 = "17klx964gw8z0znl0raz3by8vdc7cq5gxj4pdcrfcina84nrdkzc";
+      url = "https://files.pythonhosted.org/packages/5c/1c/6997288da181277a0c29bc39a5f9143ff20b8c99f2a7d059cfb55163e165/psycopg2-2.8.3.tar.gz";
+      sha256 = "0ms4kx0p5n281l89awccix4d05ybmdngnjjpi9jbzd0rhf1nwyl9";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpl21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ];
@@ -1239,14 +1282,25 b' self: super: {'
     };
   };
   "pyasn1-modules" = super.buildPythonPackage {
-    name = "pyasn1-modules-0.2.4";
+    name = "pyasn1-modules-0.2.5";
     doCheck = false;
     propagatedBuildInputs = [
       self."pyasn1"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/bd/a5/ef7bf693e8a8f015386c9167483199f54f8a8ec01d1c737e05524f16e792/pyasn1-modules-0.2.4.tar.gz";
-      sha256 = "0z3w5dqrrvdplg9ma45j8n23xvyrj9ki8mg4ibqbn7l4qpl90855";
+      url = "https://files.pythonhosted.org/packages/ec/0b/69620cb04a016e4a1e8e352e8a42717862129b574b3479adb2358a1f12f7/pyasn1-modules-0.2.5.tar.gz";
+      sha256 = "15nvfx0vnl8akdlv3k6s0n80vqvryj82bm040jdsn7wmyxl1ywpg";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "pycparser" = super.buildPythonPackage {
+    name = "pycparser-2.19";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7fdeab8567783e83e1b9ab5585e6206a/pycparser-2.19.tar.gz";
+      sha256 = "1cr5dcj9628lkz1qlwq3fv97c25363qppkmcayqvd05dpy573259";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1274,23 +1328,12 b' self: super: {'
       license = [ pkgs.lib.licenses.mit { fullName = "LGPL/MIT"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
     };
   };
-  "pyflakes" = super.buildPythonPackage {
-    name = "pyflakes-0.8.1";
+  "pygments" = super.buildPythonPackage {
+    name = "pygments-2.4.2";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/75/22/a90ec0252f4f87f3ffb6336504de71fe16a49d69c4538dae2f12b9360a38/pyflakes-0.8.1.tar.gz";
-      sha256 = "0sbpq6pqm1i9wqi41mlfrsc5rk92jv4mskvlyxmnhlbdnc80ma1z";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  "pygments" = super.buildPythonPackage {
-    name = "pygments-2.3.1";
-    doCheck = false;
-    src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/64/69/413708eaf3a64a6abb8972644e0f20891a55e621c6759e2c3f3891e05d63/Pygments-2.3.1.tar.gz";
-      sha256 = "0ji87g09jph8jqcvclgb02qvxasdnr9pzvk90rl66d90yqcxmyjz";
+      url = "https://files.pythonhosted.org/packages/7e/ae/26808275fc76bf2832deb10d3a3ed3107bc4de01b85dcccbe525f2cd6d1e/Pygments-2.4.2.tar.gz";
+      sha256 = "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1330,7 +1373,7 b' self: super: {'
     };
   };
   "pyramid" = super.buildPythonPackage {
-    name = "pyramid-1.10.1";
+    name = "pyramid-1.10.4";
     doCheck = false;
     propagatedBuildInputs = [
       self."hupper"
@@ -1345,28 +1388,13 b' self: super: {'
       self."repoze.lru"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/0a/3e/22e3ac9be1b70a01139adba8906ee4b8f628bb469fea3c52f6c97b73063c/pyramid-1.10.1.tar.gz";
-      sha256 = "1h5105nfh6rsrfjiyw20aavyibj36la3hajy6vh1fa77xb4y3hrp";
+      url = "https://files.pythonhosted.org/packages/c2/43/1ae701c9c6bb3a434358e678a5e72c96e8aa55cf4cb1d2fa2041b5dd38b7/pyramid-1.10.4.tar.gz";
+      sha256 = "0rkxs1ajycg2zh1c94xlmls56mx5m161sn8112skj0amza6cn36q";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  "pyramid-beaker" = super.buildPythonPackage {
-    name = "pyramid-beaker-0.8";
-    doCheck = false;
-    propagatedBuildInputs = [
-      self."pyramid"
-      self."beaker"
-    ];
-    src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/d9/6e/b85426e00fd3d57f4545f74e1c3828552d8700f13ededeef9233f7bca8be/pyramid_beaker-0.8.tar.gz";
-      sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p";
-    };
-    meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
-    };
-  };
   "pyramid-debugtoolbar" = super.buildPythonPackage {
     name = "pyramid-debugtoolbar-4.5";
     doCheck = false;
@@ -1538,14 +1566,14 b' self: super: {'
     };
   };
   "python-dateutil" = super.buildPythonPackage {
-    name = "python-dateutil-2.7.5";
+    name = "python-dateutil-2.8.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/0e/01/68747933e8d12263d41ce08119620d9a7e5eb72c876a3442257f74490da0/python-dateutil-2.7.5.tar.gz";
-      sha256 = "00ngwcdw36w5b37b51mdwn3qxid9zdf3kpffv2q6n9kl05y2iyc8";
+      url = "https://files.pythonhosted.org/packages/ad/99/5b2e99737edeb28c71bcbec5b5dda19d0d9ef3ca3e92e3e925e7c0bb364c/python-dateutil-2.8.0.tar.gz";
+      sha256 = "17nsfhy4xdz1khrfxa61vd7pmvd5z0wa3zb6v4gb4kfnykv0b668";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.asl20 { fullName = "Dual License"; } ];
@@ -1690,7 +1718,7 b' self: super: {'
     };
   };
   "rhodecode-enterprise-ce" = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.16.2";
+    name = "rhodecode-enterprise-ce-4.17.0";
     buildInputs = [
       self."pytest"
       self."py"
@@ -1709,36 +1737,29 b' self: super: {'
     ];
     doCheck = true;
     propagatedBuildInputs = [
-      self."setuptools-scm"
       self."amqp"
       self."authomatic"
-      self."atomicwrites"
-      self."attrs"
       self."babel"
       self."beaker"
       self."bleach"
       self."celery"
-      self."chameleon"
       self."channelstream"
       self."click"
       self."colander"
       self."configobj"
       self."cssselect"
+      self."cryptography"
       self."decorator"
       self."deform"
       self."docutils"
       self."dogpile.cache"
       self."dogpile.core"
-      self."ecdsa"
       self."formencode"
       self."future"
       self."futures"
-      self."gnureadline"
       self."infrae.cache"
       self."iso8601"
       self."itsdangerous"
-      self."jinja2"
-      self."billiard"
       self."kombu"
       self."lxml"
       self."mako"
@@ -1747,21 +1768,18 b' self: super: {'
       self."msgpack-python"
       self."pyotp"
       self."packaging"
+      self."pathlib2"
       self."paste"
       self."pastedeploy"
       self."pastescript"
-      self."pathlib2"
       self."peppercorn"
       self."psutil"
       self."py-bcrypt"
+      self."pycurl"
       self."pycrypto"
-      self."pycurl"
-      self."pyflakes"
       self."pygments"
       self."pyparsing"
-      self."pyramid-beaker"
       self."pyramid-debugtoolbar"
-      self."pyramid-jinja2"
       self."pyramid-mako"
       self."pyramid"
       self."pyramid-mailer"
@@ -1784,7 +1802,6 b' self: super: {'
       self."sshpubkeys"
       self."subprocess32"
       self."supervisor"
-      self."tempita"
       self."translationstring"
       self."urllib3"
       self."urlobject"
@@ -1813,7 +1830,6 b' self: super: {'
       self."greenlet"
       self."gunicorn"
       self."waitress"
-      self."setproctitle"
       self."ipdb"
       self."ipython"
       self."rhodecode-tools"
@@ -1855,8 +1871,8 b' self: super: {'
       self."elasticsearch1-dsl"
     ];
     src = fetchurl {
-      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v1.2.1.tar.gz?md5=25bc2f7de1da318e547236d3fb463d28";
-      sha256 = "1k8l3s4mvshza1zay6dfxprq54fyb5dc85dqdva9wa3f466y0adk";
+      url = "https://code.rhodecode.com/rhodecode-tools-ce/artifacts/download/0-10ac93f4-bb7d-4b97-baea-68110743dd5a.tar.gz?md5=962dc77c06aceee62282b98d33149661";
+      sha256 = "1vfhgf46inbx7jvlfx4fdzh3vz7lh37r291gzb5hx447pfm3qllg";
     };
     meta = {
       license = [ { fullName = "Apache 2.0 and Proprietary"; } ];
@@ -1878,11 +1894,11 b' self: super: {'
     };
   };
   "scandir" = super.buildPythonPackage {
-    name = "scandir-1.9.0";
+    name = "scandir-1.10.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/16/2a/557af1181e6b4e30254d5a6163b18f5053791ca66e251e77ab08887e8fe3/scandir-1.9.0.tar.gz";
-      sha256 = "0r3hvf1a9jm1rkqgx40gxkmccknkaiqjavs8lccgq9s8khh5x5s4";
+      url = "https://files.pythonhosted.org/packages/df/f5/9c052db7bd54d0cbf1bc0bb6554362bba1012d03e5888950a4f5c5dadc4e/scandir-1.10.0.tar.gz";
+      sha256 = "1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal { fullName = "New BSD License"; } ];
@@ -1900,22 +1916,11 b' self: super: {'
     };
   };
   "setuptools" = super.buildPythonPackage {
-    name = "setuptools-40.8.0";
+    name = "setuptools-41.0.1";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/c2/f7/c7b501b783e5a74cf1768bc174ee4fb0a8a6ee5af6afa92274ff964703e0/setuptools-40.8.0.zip";
-      sha256 = "0k9hifpgahnw2a26w3cr346iy733k6d3nwh3f7g9m13y6f8fqkkf";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  "setuptools-scm" = super.buildPythonPackage {
-    name = "setuptools-scm-2.1.0";
-    doCheck = false;
-    src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/e5/62/f9e1ac314464eb5945c97542acb6bf6f3381dfa5d7a658de7730c36f31a1/setuptools_scm-2.1.0.tar.gz";
-      sha256 = "0yb364cgk15sfw3x8ln4ssh98z1dj6n8iiz4r2rw1cfsxhgi8rx7";
+      url = "https://files.pythonhosted.org/packages/1d/64/a18a487b4391a05b9c7f938b94a16d80305bf0369c6b0b9509e86165e1d3/setuptools-41.0.1.zip";
+      sha256 = "04sns22y2hhsrwfy1mha2lgslvpjsjsz8xws7h2rh5a7ylkd28m2";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1966,40 +1971,40 b' self: super: {'
     };
   };
   "sshpubkeys" = super.buildPythonPackage {
-    name = "sshpubkeys-2.2.0";
+    name = "sshpubkeys-3.1.0";
     doCheck = false;
     propagatedBuildInputs = [
-      self."pycrypto"
+      self."cryptography"
       self."ecdsa"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/27/da/337fabeb3dca6b62039a93ceaa636f25065e0ae92b575b1235342076cf0a/sshpubkeys-2.2.0.tar.gz";
-      sha256 = "0r4kpwzmg96a2x56pllik7dmc3fnqk189v3sfgsi07q2ryrhr6xm";
+      url = "https://files.pythonhosted.org/packages/00/23/f7508a12007c96861c3da811992f14283d79c819d71a217b3e12d5196649/sshpubkeys-3.1.0.tar.gz";
+      sha256 = "105g2li04nm1hb15a2y6hm9m9k7fbrkd5l3gy12w3kgcmsf3k25k";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   "subprocess32" = super.buildPythonPackage {
-    name = "subprocess32-3.5.3";
+    name = "subprocess32-3.5.4";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/be/2b/beeba583e9877e64db10b52a96915afc0feabf7144dcbf2a0d0ea68bf73d/subprocess32-3.5.3.tar.gz";
-      sha256 = "1hr5fan8i719hmlmz73hf8rhq74014w07d8ryg7krvvf6692kj3b";
+      url = "https://files.pythonhosted.org/packages/32/c8/564be4d12629b912ea431f1a50eb8b3b9d00f1a0b1ceff17f266be190007/subprocess32-3.5.4.tar.gz";
+      sha256 = "17f7mvwx2271s1wrl0qac3wjqqnrqag866zs3qc8v5wp0k43fagb";
     };
     meta = {
       license = [ pkgs.lib.licenses.psfl ];
     };
   };
   "supervisor" = super.buildPythonPackage {
-    name = "supervisor-3.3.5";
+    name = "supervisor-4.0.3";
     doCheck = false;
     propagatedBuildInputs = [
       self."meld3"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/ba/65/92575a8757ed576beaee59251f64a3287bde82bdc03964b89df9e1d29e1b/supervisor-3.3.5.tar.gz";
-      sha256 = "1w3ahridzbc6rxfpbyx8lij6pjlcgf2ymzyg53llkjqxalp6sk8v";
+      url = "https://files.pythonhosted.org/packages/97/48/f38bf70bd9282d1a18d591616557cc1a77a1c627d57dff66ead65c891dc8/supervisor-4.0.3.tar.gz";
+      sha256 = "17hla7mx6w5m5jzkkjxgqa8wpswqmfhbhf49f692hw78fg0ans7p";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
@@ -2128,22 +2133,22 b' self: super: {'
     };
   };
   "vine" = super.buildPythonPackage {
-    name = "vine-1.2.0";
+    name = "vine-1.3.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/46/1a/c94317efa98040c5d50fe3cf9080cafb0372ff5afb0283dc018c751c6746/vine-1.2.0.tar.gz";
-      sha256 = "0xjz2sjbr5jrpjk411b7alkghdskhphgsqqrbi7abqfh2pli6j7f";
+      url = "https://files.pythonhosted.org/packages/1c/e1/79fb8046e607dd6c2ad05c9b8ebac9d0bd31d086a08f02699e96fc5b3046/vine-1.3.0.tar.gz";
+      sha256 = "11ydsbhl1vabndc2r979dv61s6j2b0giq6dgvryifvq1m7bycghk";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   "waitress" = super.buildPythonPackage {
-    name = "waitress-1.1.0";
+    name = "waitress-1.3.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/3c/68/1c10dd5c556872ceebe88483b0436140048d39de83a84a06a8baa8136f4f/waitress-1.1.0.tar.gz";
-      sha256 = "1a85gyji0kajc3p0s1pwwfm06w4wfxjkvvl4rnrz3h164kbd6g6k";
+      url = "https://files.pythonhosted.org/packages/43/50/9890471320d5ad22761ae46661cf745f487b1c8c4ec49352b99e1078b970/waitress-1.3.0.tar.gz";
+      sha256 = "09j5dzbbcxib7vdskhx39s1qsydlr4n2p2png71d7mjnr9pnwajf";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpl21 ];
@@ -2218,18 +2223,18 b' self: super: {'
     };
   };
   "webob" = super.buildPythonPackage {
-    name = "webob-1.8.4";
+    name = "webob-1.8.5";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/e4/6c/99e322c3d4cc11d9060a67a9bf2f7c9c581f40988c11fffe89bb8c36bc5e/WebOb-1.8.4.tar.gz";
-      sha256 = "16cfg5y4n6sihz59vsmns2yqbfm0gfsn3l5xgz2g0pdhilaib0x4";
+      url = "https://files.pythonhosted.org/packages/9d/1a/0c89c070ee2829c934cb6c7082287c822e28236a4fcf90063e6be7c35532/WebOb-1.8.5.tar.gz";
+      sha256 = "11khpzaxc88q31v25ic330gsf56fwmbdc9b30br8mvp0fmwspah5";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "webtest" = super.buildPythonPackage {
-    name = "webtest-2.0.32";
+    name = "webtest-2.0.33";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
@@ -2238,8 +2243,8 b' self: super: {'
       self."beautifulsoup4"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/27/9f/9e74449d272ffbef4fb3012e6dbc53c0b24822d545e7a33a342f80131e59/WebTest-2.0.32.tar.gz";
-      sha256 = "0qp0nnbazzm4ibjiyqfcn6f230svk09i4g58zg2i9x1ga06h48a2";
+      url = "https://files.pythonhosted.org/packages/a8/b0/ffc9413b637dbe26e291429bb0f6ed731e518d0cd03da28524a8fe2e8a8f/WebTest-2.0.33.tar.gz";
+      sha256 = "1l3z0cwqslsf4rcrhi2gr8kdfh74wn2dw76376i4g9i38gz8wd21";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -2293,42 +2298,42 b' self: super: {'
     };
   };
   "zope.deprecation" = super.buildPythonPackage {
-    name = "zope.deprecation-4.3.0";
+    name = "zope.deprecation-4.4.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."setuptools"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/a1/18/2dc5e6bfe64fdc3b79411b67464c55bb0b43b127051a20f7f492ab767758/zope.deprecation-4.3.0.tar.gz";
-      sha256 = "095jas41wbxgmw95kwdxqhbc3bgihw2hzj9b3qpdg85apcsf2lkx";
+      url = "https://files.pythonhosted.org/packages/34/da/46e92d32d545dd067b9436279d84c339e8b16de2ca393d7b892bc1e1e9fd/zope.deprecation-4.4.0.tar.gz";
+      sha256 = "1pz2cv7gv9y1r3m0bdv7ks1alagmrn5msm5spwdzkb2by0w36i8d";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
   "zope.event" = super.buildPythonPackage {
-    name = "zope.event-4.3.0";
+    name = "zope.event-4.4";
     doCheck = false;
     propagatedBuildInputs = [
       self."setuptools"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/9e/d0/54ba59f19a0635f6591b74be259cf6fbf67e73f4edda27b5cd0cf4d26efa/zope.event-4.3.0.tar.gz";
-      sha256 = "1rrkyx42bcq8dkpj23c2v99kczlrg8d39c06q5qpr0vs4hjfmv70";
+      url = "https://files.pythonhosted.org/packages/4c/b2/51c0369adcf5be2334280eed230192ab3b03f81f8efda9ddea6f65cc7b32/zope.event-4.4.tar.gz";
+      sha256 = "1ksbc726av9xacml6jhcfyn828hlhb9xlddpx6fcvnlvmpmpvhk9";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
   "zope.interface" = super.buildPythonPackage {
-    name = "zope.interface-4.5.0";
+    name = "zope.interface-4.6.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."setuptools"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/ac/8a/657532df378c2cd2a1fe6b12be3b4097521570769d4852ec02c24bd3594e/zope.interface-4.5.0.tar.gz";
-      sha256 = "0k67m60ij06wkg82n15qgyn96waf4pmrkhv0njpkfzpmv5q89hsp";
+      url = "https://files.pythonhosted.org/packages/4e/d0/c9d16bd5b38de44a20c6dc5d5ed80a49626fafcb3db9f9efdc2a19026db6/zope.interface-4.6.0.tar.gz";
+      sha256 = "1rgh2x3rcl9r0v0499kf78xy86rnmanajf4ywmqb943wpk50sg8v";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpl21 ];

requirements.txt

@@ -1,37 +1,31 b''
 ## dependencies
 
-setuptools-scm==2.1.0
 amqp==2.3.1
 # not released authomatic that has updated some oauth providers
-https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801#egg=authomatic==0.1.0.post1
-atomicwrites==1.2.1
-attrs==18.2.0
+https://code.rhodecode.com/upstream/authomatic/artifacts/download/0-4fe9c041-a567-4f84-be4c-7efa2a606d3c.tar.gz?md5=f6bdc3c769688212db68233e8d2b0383#egg=authomatic==0.1.0.post1
+
 babel==1.3
 beaker==1.9.1
-bleach==3.0.2
+bleach==3.1.0
 celery==4.1.1
-chameleon==2.24
 channelstream==0.5.2
 click==7.0
-colander==1.5.1
+colander==1.7.0
 # our custom configobj
-https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c#egg=configobj==5.0.6
+https://code.rhodecode.com/upstream/configobj/artifacts/download/0-012de99a-b1e1-4f64-a5c0-07a98a41b324.tar.gz?md5=6a513f51fe04b2c18cf84c1395a7c626#egg=configobj==5.0.6
 cssselect==1.0.3
+cryptography==2.6.1
 decorator==4.1.2
 deform==2.0.7
 docutils==0.14.0
 dogpile.cache==0.7.1
 dogpile.core==0.4.1
-ecdsa==0.13
 formencode==1.2.4
 future==0.14.3
 futures==3.0.2
-gnureadline==6.3.8
 infrae.cache==1.0.1
 iso8601==0.1.12
 itsdangerous==0.24
-jinja2==2.9.6
-billiard==3.5.0.3
 kombu==4.2.1
 lxml==4.2.5
 mako==1.0.7
@@ -40,23 +34,20 b' markupsafe==1.1.0'
 msgpack-python==0.5.6
 pyotp==2.2.7
 packaging==15.2
-paste==3.0.5
+pathlib2==2.3.4
+paste==3.0.8
 pastedeploy==2.0.1
-pastescript==3.0.0
-pathlib2==2.3.3
+pastescript==3.1.0
 peppercorn==0.6
-psutil==5.4.8
+psutil==5.5.1
 py-bcrypt==0.4
-pycrypto==2.6.1
 pycurl==7.43.0.2
-pyflakes==0.8.1
-pygments==2.3.1
+pycrypto==2.6.1
+pygments==2.4.2
 pyparsing==2.3.0
-pyramid-beaker==0.8
 pyramid-debugtoolbar==4.5.0
-pyramid-jinja2==2.7
 pyramid-mako==1.0.2
-pyramid==1.10.1
+pyramid==1.10.4
 pyramid_mailer==0.15.1
 python-dateutil
 python-ldap==3.1.0
@@ -74,10 +65,9 b' routes==2.4.1'
 simplejson==3.16.0
 six==1.11.0
 sqlalchemy==1.1.18
-sshpubkeys==2.2.0
-subprocess32==3.5.3
-supervisor==3.3.5
-tempita==0.5.2
+sshpubkeys==3.1.0
+subprocess32==3.5.4
+supervisor==4.0.3
 translationstring==1.3
 urllib3==1.24.1
 urlobject==2.4.3
@@ -85,29 +75,29 b' venusian==1.2.0'
 weberror==0.10.3
 webhelpers2==2.0
 webhelpers==1.3
-webob==1.8.4
+webob==1.8.5
 whoosh==2.7.4
 wsgiref==0.1.2
 zope.cachedescriptors==4.3.1
-zope.deprecation==4.3.0
-zope.event==4.3.0
-zope.interface==4.5.0
+zope.deprecation==4.4.0
+zope.event==4.4.0
+zope.interface==4.6.0
 
 # DB drivers
 mysql-python==1.2.5
 pymysql==0.8.1
 pysqlite==2.8.3
-psycopg2==2.7.5
+psycopg2==2.8.3
 
 # IPYTHON RENDERING
 # entrypoints backport, pypi version doesn't support egg installs
-https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313#egg=entrypoints==0.2.2.rhodecode-upstream1
+https://code.rhodecode.com/upstream/entrypoints/artifacts/download/0-8e9ee9e4-c4db-409c-b07e-81568fd1832d.tar.gz?md5=3a027b8ff1d257b91fe257de6c43357d#egg=entrypoints==0.2.2.rhodecode-upstream1
 nbconvert==5.3.1
 nbformat==4.4.0
 jupyter_client==5.0.0
 
 ## cli tools
-alembic==1.0.5
+alembic==1.0.10
 invoke==0.13.0
 bumpversion==0.5.3
 
@@ -115,15 +105,14 b' bumpversion==0.5.3'
 gevent==1.4.0
 greenlet==0.4.15
 gunicorn==19.9.0
-waitress==1.1.0
-setproctitle==1.1.10
+waitress==1.3.0
 
 ## debug
-ipdb==0.11.0
+ipdb==0.12.0
 ipython==5.1.0
 
 ## rhodecode-tools, special case
-https://code.rhodecode.com/rhodecode-tools-ce/archive/v1.2.1.tar.gz?md5=25bc2f7de1da318e547236d3fb463d28#egg=rhodecode-tools==1.2.1
+https://code.rhodecode.com/rhodecode-tools-ce/artifacts/download/0-10ac93f4-bb7d-4b97-baea-68110743dd5a.tar.gz?md5=962dc77c06aceee62282b98d33149661#egg=rhodecode-tools==1.2.1
 
 ## appenlight
 appenlight-client==0.6.26

requirements_test.txt

@@ -10,7 +10,7 b' gprof2dot==2017.9.19'
 
 mock==1.0.1
 cov-core==1.15.0
-coverage==4.5.1
+coverage==4.5.3
 
-webtest==2.0.32
+webtest==2.0.33
 beautifulsoup4==4.6.3

rhodecode/VERSION

@@ -1,1 +1,1 b''
-4.16.2
  No newline at end of file
+4.17.0
  No newline at end of file

rhodecode/__init__.py

@@ -45,7 +45,7 b' PYRAMID_SETTINGS = {}'
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 95  # defines current db version for migrations
+__dbversion__ = 98  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'

rhodecode/api/tests/test_comment_commit.py

@@ -37,11 +37,11 b' class TestCommentCommit(object):'
         assert_error(id_, expected, given=response.body)
 
     @pytest.mark.parametrize("commit_id, expected_err", [
-        ('abcabca', {'hg': 'Commit {commit} does not exist for {repo}',
-                     'git': 'Commit {commit} does not exist for {repo}',
+        ('abcabca', {'hg': 'Commit {commit} does not exist for `{repo}`',
+                     'git': 'Commit {commit} does not exist for `{repo}`',
                      'svn': 'Commit id {commit} not understood.'}),
-        ('idontexist', {'hg': 'Commit {commit} does not exist for {repo}',
-                        'git': 'Commit {commit} does not exist for {repo}',
+        ('idontexist', {'hg': 'Commit {commit} does not exist for `{repo}`',
+                        'git': 'Commit {commit} does not exist for `{repo}`',
                         'svn': 'Commit id {commit} not understood.'}),
     ])
     def test_api_comment_commit_wrong_hash(self, backend, commit_id, expected_err):
@@ -53,7 +53,7 b' class TestCommentCommit(object):'
 
         expected_err = expected_err[backend.alias]
         expected_err = expected_err.format(
-            repo=backend.repo.scm_instance(), commit=commit_id)
+            repo=backend.repo.scm_instance().name, commit=commit_id)
         assert_error(id_, expected_err, given=response.body)
 
     @pytest.mark.parametrize("status_change, message, commit_id", [

rhodecode/api/tests/test_get_repo.py

@@ -44,6 +44,7 b' class TestGetRepo(object):'
             self, apikey_attr, expect_secrets, cache_param, backend,
             user_util):
         repo = backend.create_repo()
+        repo_id = repo.repo_id
         usr = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
         group = user_util.create_user_group(members=[usr])
         user_util.grant_user_group_permission_to_repo(
@@ -64,6 +65,8 b' class TestGetRepo(object):'
         permissions = expected_permissions(repo)
 
         followers = []
+
+        repo = RepoModel().get(repo_id)
         for user in repo.followers:
             followers.append(user.user.get_api_data(
                 include_secrets=expect_secrets))
@@ -84,6 +87,7 b' class TestGetRepo(object):'
         # TODO: Depending on which tests are running before this one, we
         # start with a different number of permissions in the database.
         repo = RepoModel().get_by_repo_name(backend.repo_name)
+        repo_id = repo.repo_id
         permission_count = len(repo.repo_to_perm)
 
         RepoModel().grant_user_permission(repo=backend.repo_name,
@@ -102,6 +106,8 b' class TestGetRepo(object):'
         permissions = expected_permissions(repo)
 
         followers = []
+
+        repo = RepoModel().get(repo_id)
         for user in repo.followers:
             followers.append(user.user.get_api_data())
 

rhodecode/api/views/repo_api.py

@@ -444,7 +444,7 b' def get_repo_nodes(request, apiuser, rep'
         result: [
                     {
                       "binary": false,
-                      "content": "File line\nLine2\n",
+                      "content": "File line",
                       "extension": "md",
                       "lines": 2,
                       "md5": "059fa5d29b19c0657e384749480f6422",
@@ -529,6 +529,7 b' def get_repo_file(request, apiuser, repo'
     :param cache: Use internal caches for fetching files. If disabled fetching
         files is slower but more memory efficient
     :type cache: Optional(bool)
+
     Example output:
 
     .. code-block:: bash

rhodecode/apps/_base/__init__.py

@@ -168,6 +168,28 b' class BaseAppView(object):'
             from rhodecode.lib.base import attach_context_attributes
             attach_context_attributes(c, self.request, self.request.user.user_id)
 
+        c.is_super_admin = c.auth_user.is_admin
+
+        c.can_create_repo = c.is_super_admin
+        c.can_create_repo_group = c.is_super_admin
+        c.can_create_user_group = c.is_super_admin
+
+        c.is_delegated_admin = False
+
+        if not c.auth_user.is_default and not c.is_super_admin:
+            c.can_create_repo = h.HasPermissionAny('hg.create.repository')(
+                user=self.request.user)
+            repositories = c.auth_user.repositories_admin or c.can_create_repo
+
+            c.can_create_repo_group = h.HasPermissionAny('hg.repogroup.create.true')(
+                user=self.request.user)
+            repository_groups = c.auth_user.repository_groups_admin or c.can_create_repo_group
+
+            c.can_create_user_group = h.HasPermissionAny('hg.usergroup.create.true')(
+                user=self.request.user)
+            user_groups = c.auth_user.user_groups_admin or c.can_create_user_group
+            # delegated admin can create, or manage some objects
+            c.is_delegated_admin = repositories or repository_groups or user_groups
         return c
 
     def _get_template_context(self, tmpl_args, **kwargs):
@@ -215,12 +237,17 b' class RepoAppView(BaseAppView):'
         c.rhodecode_db_repo = self.db_repo
         c.repo_name = self.db_repo_name
         c.repository_pull_requests = self.db_repo_pull_requests
+        c.repository_is_user_following = ScmModel().is_following_repo(
+            self.db_repo_name, self._rhodecode_user.user_id)
         self.path_filter = PathFilter(None)
 
         c.repository_requirements_missing = {}
         try:
             self.rhodecode_vcs_repo = self.db_repo.scm_instance()
-            if self.rhodecode_vcs_repo:
+            # NOTE(marcink):
+            # comparison to None since if it's an object __bool__ is expensive to
+            # calculate
+            if self.rhodecode_vcs_repo is not None:
                 path_perms = self.rhodecode_vcs_repo.get_path_permissions(
                     c.auth_user.username)
                 self.path_filter = PathFilter(path_perms)

rhodecode/apps/_base/navigation.py

@@ -85,8 +85,6 b' class NavigationRegistry(object):'
                  'admin_settings_hooks'),
         NavEntry('search', _('Full Text Search'),
                  'admin_settings_search'),
-        NavEntry('integrations', _('Integrations'),
-                 'global_integrations_home'),
         NavEntry('system', _('System Info'),
                  'admin_settings_system'),
         NavEntry('exceptions', _('Exceptions Tracker'),

rhodecode/apps/admin/__init__.py

@@ -424,6 +424,10 b' def admin_routes(config):'
         pattern='/repo_groups')
 
     config.add_route(
+        name='repo_groups_data',
+        pattern='/repo_groups_data')
+
+    config.add_route(
         name='repo_group_new',
         pattern='/repo_group/new')
 

rhodecode/apps/admin/tests/test_admin_main_views.py

@@ -46,10 +46,10 b' def route_path(name, params=None, **kwar'
 
 class TestAdminMainView(TestController):
 
-    def test_redirect_admin_home(self):
+    def test_access_admin_home(self):
         self.log_user()
-        response = self.app.get(route_path('admin_home'), status=302)
-        assert response.location.endswith('/audit_logs')
+        response = self.app.get(route_path('admin_home'), status=200)
+        response.mustcontain("Administration area")
 
     def test_redirect_pull_request_view(self, view):
         self.log_user()

rhodecode/apps/admin/tests/test_admin_repository_groups.py

@@ -23,11 +23,11 b' import pytest'
 
 from rhodecode.apps._base import ADMIN_PREFIX
 from rhodecode.lib import helpers as h
-from rhodecode.model.db import Repository, UserRepoToPerm, User
+from rhodecode.model.db import Repository, UserRepoToPerm, User, RepoGroup
 from rhodecode.model.meta import Session
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.tests import (
-    assert_session_flash, TEST_USER_REGULAR_LOGIN, TESTS_TMP_PATH, TestController)
+    assert_session_flash, TEST_USER_REGULAR_LOGIN, TESTS_TMP_PATH)
 from rhodecode.tests.fixture import Fixture
 
 fixture = Fixture()
@@ -38,6 +38,7 b' def route_path(name, params=None, **kwar'
 
     base_url = {
         'repo_groups': ADMIN_PREFIX + '/repo_groups',
+        'repo_groups_data': ADMIN_PREFIX + '/repo_groups_data',
         'repo_group_new': ADMIN_PREFIX + '/repo_group/new',
         'repo_group_create': ADMIN_PREFIX + '/repo_group/create',
 
@@ -59,13 +60,30 b' def _get_permission_for_user(user, repo)'
 
 @pytest.mark.usefixtures("app")
 class TestAdminRepositoryGroups(object):
+
     def test_show_repo_groups(self, autologin_user):
-        response = self.app.get(route_path('repo_groups'))
-        response.mustcontain('data: []')
+        self.app.get(route_path('repo_groups'))
+
+    def test_show_repo_groups_data(self, autologin_user, xhr_header):
+        response = self.app.get(route_path(
+            'repo_groups_data'), extra_environ=xhr_header)
+
+        all_repo_groups = RepoGroup.query().count()
+        assert response.json['recordsTotal'] == all_repo_groups
 
-    def test_show_repo_groups_after_creating_group(self, autologin_user):
+    def test_show_repo_groups_data_filtered(self, autologin_user, xhr_header):
+        response = self.app.get(route_path(
+            'repo_groups_data', params={'search[value]': 'empty_search'}),
+            extra_environ=xhr_header)
+
+        all_repo_groups = RepoGroup.query().count()
+        assert response.json['recordsTotal'] == all_repo_groups
+        assert response.json['recordsFiltered'] == 0
+
+    def test_show_repo_groups_after_creating_group(self, autologin_user, xhr_header):
         fixture.create_repo_group('test_repo_group')
-        response = self.app.get(route_path('repo_groups'))
+        response = self.app.get(route_path(
+            'repo_groups_data'), extra_environ=xhr_header)
         response.mustcontain('"name_raw": "test_repo_group"')
         fixture.destroy_repo_group('test_repo_group')
 

rhodecode/apps/admin/tests/test_admin_settings.py

@@ -214,8 +214,7 b' class TestAdminSettingsGlobal(object):'
             })
 
             response = response.follow()
-            response.mustcontain(
-                """<div class="branding">- %s</div>""" % new_title)
+            response.mustcontain(new_title)
 
     def post_and_verify_settings(self, settings):
         old_title = 'RhodeCode'

rhodecode/apps/admin/tests/test_admin_users_ssh_keys.py

@@ -173,4 +173,4 b' class TestAdminUsersSshKeysView(TestCont'
 
         response.mustcontain('Private key')
         response.mustcontain('Public key')
-        response.mustcontain('-----BEGIN RSA PRIVATE KEY-----')
+        response.mustcontain('-----BEGIN PRIVATE KEY-----')

rhodecode/apps/admin/views/exception_tracker.py

@@ -50,7 +50,7 b' class ExceptionsTrackerView(BaseAppView)'
             count +=1
         return count
 
-    def get_all_exceptions(self, read_metadata=False, limit=None):
+    def get_all_exceptions(self, read_metadata=False, limit=None, type_filter=None):
         exc_store_path = exc_tracking.get_exc_store()
         exception_list = []
 
@@ -59,7 +59,7 b' class ExceptionsTrackerView(BaseAppView)'
                 return val.split('_')[-1]
             except Exception:
                 return 0
-        count = 0
+
         for fname in reversed(sorted(os.listdir(exc_store_path), key=key_sorter)):
 
             parts = fname.split('_', 2)
@@ -83,13 +83,17 b' class ExceptionsTrackerView(BaseAppView)'
                 except Exception:
                     log.exception('Failed to read exc data from:{}'.format(full_path))
                     pass
-
             # convert our timestamp to a date obj, for nicer representation
             exc['exc_utc_date'] = time_to_utcdatetime(exc['exc_timestamp'])
-            exception_list.append(exc)
 
-            count += 1
-            if limit and count >= limit:
+            type_present = exc.get('exc_type')
+            if type_filter:
+                if type_present and type_present == type_filter:
+                    exception_list.append(exc)
+            else:
+                exception_list.append(exc)
+
+            if limit and len(exception_list) >= limit:
                 break
         return exception_list
 
@@ -103,8 +107,10 b' class ExceptionsTrackerView(BaseAppView)'
         c = self.load_default_context()
         c.active = 'exceptions_browse'
         c.limit = safe_int(self.request.GET.get('limit')) or 50
+        c.type_filter = self.request.GET.get('type_filter')
         c.next_limit = c.limit + 50
-        c.exception_list = self.get_all_exceptions(read_metadata=True, limit=c.limit)
+        c.exception_list = self.get_all_exceptions(
+            read_metadata=True, limit=c.limit, type_filter=c.type_filter)
         c.exception_list_count = self.count_all_exceptions()
         c.exception_store_dir = exc_tracking.get_exc_store()
         return self._get_template_context(c)
@@ -132,12 +138,20 b' class ExceptionsTrackerView(BaseAppView)'
     def exception_delete_all(self):
         _ = self.request.translate
         c = self.load_default_context()
+        type_filter = self.request.POST.get('type_filter')
 
         c.active = 'exceptions'
-        all_exc = self.get_all_exceptions()
-        exc_count = len(all_exc)
+        all_exc = self.get_all_exceptions(read_metadata=bool(type_filter), type_filter=type_filter)
+        exc_count = 0
+
         for exc in all_exc:
-            exc_tracking.delete_exception(exc['exc_id'], prefix=None)
+            if type_filter:
+                if exc.get('exc_type') == type_filter:
+                    exc_tracking.delete_exception(exc['exc_id'], prefix=None)
+                    exc_count += 1
+            else:
+                exc_tracking.delete_exception(exc['exc_id'], prefix=None)
+                exc_count += 1
 
         h.flash(_('Removed {} Exceptions').format(exc_count), category='success')
         raise HTTPFound(h.route_path('admin_settings_exception_tracker'))

rhodecode/apps/admin/views/main_views.py

@@ -20,12 +20,12 b''
 
 import logging
 
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPFound, HTTPNotFound
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib import helpers as h
-from rhodecode.lib.auth import (LoginRequired, HasPermissionAllDecorator)
+from rhodecode.lib.auth import (LoginRequired, NotAnonymous)
 from rhodecode.model.db import PullRequest
 
 
@@ -33,14 +33,23 b' log = logging.getLogger(__name__)'
 
 
 class AdminMainView(BaseAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        return c
 
     @LoginRequired()
-    @HasPermissionAllDecorator('hg.admin')
+    @NotAnonymous()
     @view_config(
-        route_name='admin_home', request_method='GET')
+        route_name='admin_home', request_method='GET',
+        renderer='rhodecode:templates/admin/main.mako')
     def admin_main(self):
-        # redirect _admin to audit logs...
-        raise HTTPFound(h.route_path('admin_audit_logs'))
+        c = self.load_default_context()
+        c.active = 'admin'
+
+        if not (c.is_super_admin or c.is_delegated_admin):
+            raise HTTPNotFound()
+
+        return self._get_template_context(c)
 
     @LoginRequired()
     @view_config(route_name='pull_requests_global_0', request_method='GET')
@@ -49,8 +58,7 b' class AdminMainView(BaseAppView):'
     def pull_requests(self):
         """
         Global redirect for Pull Requests
-
-        :param pull_request_id: id of pull requests in the system
+        pull_request_id: id of pull requests in the system
         """
 
         pull_request = PullRequest.get_or_404(

rhodecode/apps/admin/views/repo_groups.py

@@ -17,7 +17,7 b''
 # 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 datetime
 import logging
 import formencode
 import formencode.htmlfill
@@ -30,16 +30,16 b' from pyramid.response import Response'
 from rhodecode import events
 from rhodecode.apps._base import BaseAppView, DataGridAppView
 
-from rhodecode.lib.ext_json import json
 from rhodecode.lib.auth import (
     LoginRequired, CSRFRequired, NotAnonymous,
     HasPermissionAny, HasRepoGroupPermissionAny)
 from rhodecode.lib import helpers as h, audit_logger
-from rhodecode.lib.utils2 import safe_int, safe_unicode
+from rhodecode.lib.utils2 import safe_int, safe_unicode, datetime_to_time
 from rhodecode.model.forms import RepoGroupForm
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.scm import RepoGroupList
-from rhodecode.model.db import Session, RepoGroup
+from rhodecode.model.db import (
+    or_, count, func, in_filter_generator, Session, RepoGroup, User, Repository)
 
 log = logging.getLogger(__name__)
 
@@ -88,22 +88,168 b' class AdminRepoGroupsView(BaseAppView, D'
                 return False
         return False
 
+    # permission check in data loading of
+    # `repo_group_list_data` via RepoGroupList
     @LoginRequired()
     @NotAnonymous()
-    # perms check inside
     @view_config(
         route_name='repo_groups', request_method='GET',
         renderer='rhodecode:templates/admin/repo_groups/repo_groups.mako')
     def repo_group_list(self):
         c = self.load_default_context()
+        return self._get_template_context(c)
 
-        repo_group_list = RepoGroup.get_all_repo_groups()
-        repo_group_list_acl = RepoGroupList(
-            repo_group_list, perm_set=['group.admin'])
-        repo_group_data = RepoGroupModel().get_repo_groups_as_dict(
-            repo_group_list=repo_group_list_acl, admin=True)
-        c.data = json.dumps(repo_group_data)
-        return self._get_template_context(c)
+    # permission check inside
+    @LoginRequired()
+    @NotAnonymous()
+    @view_config(
+        route_name='repo_groups_data', request_method='GET',
+        renderer='json_ext', xhr=True)
+    def repo_group_list_data(self):
+        self.load_default_context()
+        column_map = {
+            'name_raw': 'group_name_hash',
+            'desc': 'group_description',
+            'last_change_raw': 'updated_on',
+            'top_level_repos': 'repos_total',
+            'owner': 'user_username',
+        }
+        draw, start, limit = self._extract_chunk(self.request)
+        search_q, order_by, order_dir = self._extract_ordering(
+            self.request, column_map=column_map)
+
+        _render = self.request.get_partial_renderer(
+            'rhodecode:templates/data_table/_dt_elements.mako')
+        c = _render.get_call_context()
+
+        def quick_menu(repo_group_name):
+            return _render('quick_repo_group_menu', repo_group_name)
+
+        def repo_group_lnk(repo_group_name):
+            return _render('repo_group_name', repo_group_name)
+
+        def last_change(last_change):
+            if isinstance(last_change, datetime.datetime) and not last_change.tzinfo:
+                delta = datetime.timedelta(
+                    seconds=(datetime.datetime.now() - datetime.datetime.utcnow()).seconds)
+                last_change = last_change + delta
+            return _render("last_change", last_change)
+
+        def desc(desc, personal):
+            return _render(
+                'repo_group_desc', desc, personal, c.visual.stylify_metatags)
+
+        def repo_group_actions(repo_group_id, repo_group_name, gr_count):
+            return _render(
+                'repo_group_actions', repo_group_id, repo_group_name, gr_count)
+
+        def user_profile(username):
+            return _render('user_profile', username)
+
+        auth_repo_group_list = RepoGroupList(
+            RepoGroup.query().all(), perm_set=['group.admin'])
+
+        allowed_ids = [-1]
+        for repo_group in auth_repo_group_list:
+                allowed_ids.append(repo_group.group_id)
+
+        repo_groups_data_total_count = RepoGroup.query()\
+            .filter(or_(
+                # generate multiple IN to fix limitation problems
+                *in_filter_generator(RepoGroup.group_id, allowed_ids)
+            )) \
+            .count()
+
+        repo_groups_data_total_inactive_count = RepoGroup.query()\
+            .filter(RepoGroup.group_id.in_(allowed_ids))\
+            .count()
+
+        repo_count = count(Repository.repo_id)
+        base_q = Session.query(
+            RepoGroup.group_name,
+            RepoGroup.group_name_hash,
+            RepoGroup.group_description,
+            RepoGroup.group_id,
+            RepoGroup.personal,
+            RepoGroup.updated_on,
+            User,
+            repo_count.label('repos_count')
+            ) \
+            .filter(or_(
+                # generate multiple IN to fix limitation problems
+                *in_filter_generator(RepoGroup.group_id, allowed_ids)
+            )) \
+            .outerjoin(Repository) \
+            .join(User, User.user_id == RepoGroup.user_id) \
+            .group_by(RepoGroup, User)
+
+        if search_q:
+            like_expression = u'%{}%'.format(safe_unicode(search_q))
+            base_q = base_q.filter(or_(
+                RepoGroup.group_name.ilike(like_expression),
+            ))
+
+        repo_groups_data_total_filtered_count = base_q.count()
+        # the inactive isn't really used, but we still make it same as other data grids
+        # which use inactive (users,user groups)
+        repo_groups_data_total_filtered_inactive_count = repo_groups_data_total_filtered_count
+
+        sort_defined = False
+        if order_by == 'group_name':
+            sort_col = func.lower(RepoGroup.group_name)
+            sort_defined = True
+        elif order_by == 'repos_total':
+            sort_col = repo_count
+            sort_defined = True
+        elif order_by == 'user_username':
+            sort_col = User.username
+        else:
+            sort_col = getattr(RepoGroup, order_by, None)
+
+        if sort_defined or sort_col:
+            if order_dir == 'asc':
+                sort_col = sort_col.asc()
+            else:
+                sort_col = sort_col.desc()
+
+        base_q = base_q.order_by(sort_col)
+        base_q = base_q.offset(start).limit(limit)
+
+        # authenticated access to user groups
+        auth_repo_group_list = base_q.all()
+
+        repo_groups_data = []
+        for repo_gr in auth_repo_group_list:
+            row = {
+                "menu": quick_menu(repo_gr.group_name),
+                "name": repo_group_lnk(repo_gr.group_name),
+                "name_raw": repo_gr.group_name,
+                "last_change": last_change(repo_gr.updated_on),
+                "last_change_raw": datetime_to_time(repo_gr.updated_on),
+
+                "last_changeset": "",
+                "last_changeset_raw": "",
+
+                "desc": desc(repo_gr.group_description, repo_gr.personal),
+                "owner": user_profile(repo_gr.User.username),
+                "top_level_repos": repo_gr.repos_count,
+                "action": repo_group_actions(
+                    repo_gr.group_id, repo_gr.group_name, repo_gr.repos_count),
+
+            }
+
+            repo_groups_data.append(row)
+
+        data = ({
+            'draw': draw,
+            'data': repo_groups_data,
+            'recordsTotal': repo_groups_data_total_count,
+            'recordsTotalInactive': repo_groups_data_total_inactive_count,
+            'recordsFiltered': repo_groups_data_total_filtered_count,
+            'recordsFilteredInactive': repo_groups_data_total_filtered_inactive_count,
+        })
+
+        return data
 
     @LoginRequired()
     @NotAnonymous()

rhodecode/apps/admin/views/user_groups.py

@@ -39,7 +39,7 b' from rhodecode.model.forms import UserGr'
 from rhodecode.model.permission import PermissionModel
 from rhodecode.model.scm import UserGroupList
 from rhodecode.model.db import (
-    or_, count, User, UserGroup, UserGroupMember)
+    or_, count, User, UserGroup, UserGroupMember, in_filter_generator)
 from rhodecode.model.meta import Session
 from rhodecode.model.user_group import UserGroupModel
 from rhodecode.model.db import true
@@ -107,11 +107,17 b' class AdminUserGroupsView(BaseAppView, D'
                 allowed_ids.append(user_group.users_group_id)
 
         user_groups_data_total_count = UserGroup.query()\
-            .filter(UserGroup.users_group_id.in_(allowed_ids))\
+            .filter(or_(
+                # generate multiple IN to fix limitation problems
+                *in_filter_generator(UserGroup.users_group_id, allowed_ids)
+            ))\
             .count()
 
         user_groups_data_total_inactive_count = UserGroup.query()\
-            .filter(UserGroup.users_group_id.in_(allowed_ids))\
+            .filter(or_(
+                # generate multiple IN to fix limitation problems
+                *in_filter_generator(UserGroup.users_group_id, allowed_ids)
+            ))\
             .filter(UserGroup.users_group_active != true()).count()
 
         member_count = count(UserGroupMember.user_id)
@@ -123,11 +129,14 b' class AdminUserGroupsView(BaseAppView, D'
             UserGroup.group_data,
             User,
             member_count.label('member_count')
-        ) \
-        .filter(UserGroup.users_group_id.in_(allowed_ids)) \
-        .outerjoin(UserGroupMember) \
-        .join(User, User.user_id == UserGroup.user_id) \
-        .group_by(UserGroup, User)
+            ) \
+            .filter(or_(
+                # generate multiple IN to fix limitation problems
+                *in_filter_generator(UserGroup.users_group_id, allowed_ids)
+            )) \
+            .outerjoin(UserGroupMember) \
+            .join(User, User.user_id == UserGroup.user_id) \
+            .group_by(UserGroup, User)
 
         base_q_inactive = base_q.filter(UserGroup.users_group_active != true())
 
@@ -141,14 +150,16 b' class AdminUserGroupsView(BaseAppView, D'
         user_groups_data_total_filtered_count = base_q.count()
         user_groups_data_total_filtered_inactive_count = base_q_inactive.count()
 
+        sort_defined = False
         if order_by == 'members_total':
             sort_col = member_count
+            sort_defined = True
         elif order_by == 'user_username':
             sort_col = User.username
         else:
             sort_col = getattr(UserGroup, order_by, None)
 
-        if isinstance(sort_col, count) or sort_col:
+        if sort_defined or sort_col:
             if order_dir == 'asc':
                 sort_col = sort_col.asc()
             else:
@@ -162,7 +173,7 b' class AdminUserGroupsView(BaseAppView, D'
 
         user_groups_data = []
         for user_gr in auth_user_group_list:
-            user_groups_data.append({
+            row = {
                 "users_group_name": user_group_name(user_gr.users_group_name),
                 "name_raw": h.escape(user_gr.users_group_name),
                 "description": h.escape(user_gr.user_group_description),
@@ -175,7 +186,8 b' class AdminUserGroupsView(BaseAppView, D'
                 "owner": user_profile(user_gr.User.username),
                 "action": user_group_actions(
                     user_gr.users_group_id, user_gr.users_group_name)
-            })
+            }
+            user_groups_data.append(row)
 
         data = ({
             'draw': draw,

rhodecode/apps/admin/views/users.py

@@ -682,8 +682,7 b' class UsersView(UserAppView):'
         if personal_repo_group:
             raise HTTPFound(h.route_path('user_edit_advanced', user_id=user_id))
 
-        personal_repo_group_name = RepoGroupModel().get_personal_group_name(
-            c.user)
+        personal_repo_group_name = RepoGroupModel().get_personal_group_name(c.user)
         named_personal_group = RepoGroup.get_by_group_name(
             personal_repo_group_name)
         try:

rhodecode/apps/file_store/local_store.py

@@ -38,19 +38,18 b' class LocalFileStorage(object):'
         """
         Resolves a unique name and the correct path. If a filename
         for that path already exists then a numeric prefix with values > 0 will be
-        added, for example test.jpg -> test-1.jpg etc. initially file would have 0 prefix.
+        added, for example test.jpg -> 1-test.jpg etc. initially file would have 0 prefix.
 
         :param name: base name of file
         :param directory: absolute directory path
         """
 
-        basename, ext = os.path.splitext(name)
         counter = 0
         while True:
-            name = '%s-%d%s' % (basename, counter, ext)
+            name = '%d-%s' % (counter, name)
 
             # sub_store prefix to optimize disk usage, e.g some_path/ab/final_file
-            sub_store = cls._sub_store_from_filename(basename)
+            sub_store = cls._sub_store_from_filename(name)
             sub_store_path = os.path.join(directory, sub_store)
             if not os.path.exists(sub_store_path):
                 os.makedirs(sub_store_path)
@@ -209,3 +208,16 b' class LocalFileStorage(object):'
             filename = os.path.join(directory, filename)
 
         return filename, metadata
+
+    def get_metadata(self, filename):
+        """
+        Reads JSON stored metadata for a file
+
+        :param filename:
+        :return:
+        """
+        filename = self.store_path(filename)
+        filename_meta = filename + '.meta'
+
+        with open(filename_meta, "rb") as source_meta:
+            return json.loads(source_meta.read())

rhodecode/apps/file_store/tests/test_upload_file.py

@@ -21,6 +21,7 b' import os'
 import pytest
 
 from rhodecode.lib.ext_json import json
+from rhodecode.model.db import Session, FileStore
 from rhodecode.tests import TestController
 from rhodecode.apps.file_store import utils, config_keys
 
@@ -46,9 +47,12 b' class TestFileStoreViews(TestController)'
         ('abcde-0.exe', "1234567", True),
         ('abcde-0.jpg', "xxxxx", False),
     ])
-    def test_get_files_from_store(self, fid, content, exists, tmpdir):
-        self.log_user()
+    def test_get_files_from_store(self, fid, content, exists, tmpdir, user_util):
+        user = self.log_user()
+        user_id = user['user_id']
+        repo_id = user_util.create_repo().repo_id
         store_path = self.app._pyramid_settings[config_keys.store_path]
+        store_uid = fid
 
         if exists:
             status = 200
@@ -58,17 +62,28 b' class TestFileStoreViews(TestController)'
                 f.write(content)
 
             with open(filesystem_file, 'rb') as f:
-                fid, metadata = store.save_file(f, fid, extra_metadata={'filename': fid})
+                store_uid, metadata = store.save_file(f, fid, extra_metadata={'filename': fid})
+
+            entry = FileStore.create(
+                file_uid=store_uid, filename=metadata["filename"],
+                file_hash=metadata["sha256"], file_size=metadata["size"],
+                file_display_name='file_display_name',
+                file_description='repo artifact `{}`'.format(metadata["filename"]),
+                check_acl=True, user_id=user_id,
+                scope_repo_id=repo_id
+            )
+            Session().add(entry)
+            Session().commit()
 
         else:
             status = 404
 
-        response = self.app.get(route_path('download_file', fid=fid), status=status)
+        response = self.app.get(route_path('download_file', fid=store_uid), status=status)
 
         if exists:
             assert response.text == content
-            file_store_path = os.path.dirname(store.resolve_name(fid, store_path)[1])
-            metadata_file = os.path.join(file_store_path, fid + '.meta')
+            file_store_path = os.path.dirname(store.resolve_name(store_uid, store_path)[1])
+            metadata_file = os.path.join(file_store_path, store_uid + '.meta')
             assert os.path.exists(metadata_file)
             with open(metadata_file, 'rb') as f:
                 json_data = json.loads(f.read())

rhodecode/apps/file_store/utils.py

@@ -19,9 +19,10 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
-import os
 import uuid
 
+import pathlib2
+
 
 def get_file_storage(settings):
     from rhodecode.apps.file_store.local_store import LocalFileStorage
@@ -30,6 +31,11 b' def get_file_storage(settings):'
     return LocalFileStorage(base_path=store_path)
 
 
+def splitext(filename):
+    ext = ''.join(pathlib2.Path(filename).suffixes)
+    return filename, ext
+
+
 def uid_filename(filename, randomized=True):
     """
     Generates a randomized or stable (uuid) filename,
@@ -38,7 +44,8 b' def uid_filename(filename, randomized=Tr'
     :param filename: the original filename
     :param randomized: define if filename should be stable (sha1 based) or randomized
     """
-    _, ext = os.path.splitext(filename)
+
+    _, ext = splitext(filename)
     if randomized:
         uid = uuid.uuid4()
     else:

rhodecode/apps/file_store/views.py

@@ -30,7 +30,7 b' from rhodecode.apps.file_store.exception'
 
 from rhodecode.lib import helpers as h
 from rhodecode.lib import audit_logger
-from rhodecode.lib.auth import (CSRFRequired, NotAnonymous)
+from rhodecode.lib.auth import (CSRFRequired, NotAnonymous, HasRepoPermissionAny, HasRepoGroupPermissionAny)
 from rhodecode.model.db import Session, FileStore
 
 log = logging.getLogger(__name__)
@@ -68,7 +68,7 b' class FileStoreView(BaseAppView):'
                               'user_id': self._rhodecode_user.user_id,
                               'ip': self._rhodecode_user.ip_addr}}
         try:
-            store_fid, metadata = self.storage.save_file(
+            store_uid, metadata = self.storage.save_file(
                 file_obj.file, filename, extra_metadata=metadata)
         except FileNotAllowedException:
             return {'store_fid': None,
@@ -82,7 +82,7 b' class FileStoreView(BaseAppView):'
 
         try:
             entry = FileStore.create(
-                file_uid=store_fid, filename=metadata["filename"],
+                file_uid=store_uid, filename=metadata["filename"],
                 file_hash=metadata["sha256"], file_size=metadata["size"],
                 file_description='upload attachment',
                 check_acl=False, user_id=self._rhodecode_user.user_id
@@ -96,8 +96,8 b' class FileStoreView(BaseAppView):'
                     'access_path': None,
                     'error': 'File {} failed to store in DB.'.format(filename)}
 
-        return {'store_fid': store_fid,
-                'access_path': h.route_path('download_file', fid=store_fid)}
+        return {'store_fid': store_uid,
+                'access_path': h.route_path('download_file', fid=store_uid)}
 
     @view_config(route_name='download_file')
     def download_file(self):
@@ -109,6 +109,35 b' class FileStoreView(BaseAppView):'
             log.debug('File with FID:%s not found in the store', file_uid)
             raise HTTPNotFound()
 
+        db_obj = FileStore().query().filter(FileStore.file_uid == file_uid).scalar()
+        if not db_obj:
+            raise HTTPNotFound()
+
+        # private upload for user
+        if db_obj.check_acl and db_obj.scope_user_id:
+            user = db_obj.user
+            if self._rhodecode_db_user.user_id != user.user_id:
+                log.warning('Access to file store object forbidden')
+                raise HTTPNotFound()
+
+        # scoped to repository permissions
+        if db_obj.check_acl and db_obj.scope_repo_id:
+            repo = db_obj.repo
+            perm_set = ['repository.read', 'repository.write', 'repository.admin']
+            has_perm = HasRepoPermissionAny(*perm_set)(repo.repo_name, 'FileStore check')
+            if not has_perm:
+                log.warning('Access to file store object forbidden')
+                raise HTTPNotFound()
+
+        # scoped to repository group permissions
+        if db_obj.check_acl and db_obj.scope_repo_group_id:
+            repo_group = db_obj.repo_group
+            perm_set = ['group.read', 'group.write', 'group.admin']
+            has_perm = HasRepoGroupPermissionAny(*perm_set)(repo_group.group_name, 'FileStore check')
+            if not has_perm:
+                log.warning('Access to file store object forbidden')
+                raise HTTPNotFound()
+
         FileStore.bump_access_counter(file_uid)
 
         file_path = self.storage.store_path(file_uid)

rhodecode/apps/gist/views.py

@@ -25,7 +25,7 b' import formencode'
 import formencode.htmlfill
 import peppercorn
 
-from pyramid.httpexceptions import HTTPNotFound, HTTPFound
+from pyramid.httpexceptions import HTTPNotFound, HTTPFound, HTTPBadRequest
 from pyramid.view import view_config
 from pyramid.renderers import render
 from pyramid.response import Response
@@ -67,7 +67,6 b' class GistView(BaseAppView):'
             (Gist.ACL_LEVEL_PUBLIC, _("Can be accessed by anonymous users"))
         ]
 
-
         return c
 
     @LoginRequired()
@@ -296,6 +295,8 b' class GistView(BaseAppView):'
             response = Response(content)
             response.content_type = 'text/plain'
             return response
+        elif return_format:
+            raise HTTPBadRequest()
 
         return self._get_template_context(c)
 

rhodecode/apps/home/__init__.py

@@ -68,6 +68,10 b' def includeme(config):'
         pattern='/_markup_preview')
 
     config.add_route(
+        name='file_preview',
+        pattern='/_file_preview')
+
+    config.add_route(
         name='store_user_session_value',
         pattern='/_store_session_attr')
 

rhodecode/apps/home/views.py

@@ -27,13 +27,14 b' from pyramid.view import view_config'
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import (
-    LoginRequired, NotAnonymous, HasRepoGroupPermissionAnyDecorator,
-    CSRFRequired)
+    LoginRequired, NotAnonymous, HasRepoGroupPermissionAnyDecorator, CSRFRequired)
+from rhodecode.lib.codeblocks import filenode_as_lines_tokens
 from rhodecode.lib.index import searcher_from_config
 from rhodecode.lib.utils2 import safe_unicode, str2bool, safe_int
 from rhodecode.lib.ext_json import json
+from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.model.db import (
-    func, true, or_, in_filter_generator, Repository, RepoGroup, User, UserGroup)
+    func, true, or_, case, in_filter_generator, Repository, RepoGroup, User, UserGroup)
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.scm import RepoGroupList, RepoList
@@ -105,21 +106,27 b' class HomeView(BaseAppView):'
 
         return {'suggestions': _user_groups}
 
-    def _get_repo_list(self, name_contains=None, repo_type=None, limit=20):
+    def _get_repo_list(self, name_contains=None, repo_type=None, repo_group_name='', limit=20):
         org_query = name_contains
         allowed_ids = self._rhodecode_user.repo_acl_ids(
             ['repository.read', 'repository.write', 'repository.admin'],
             cache=False, name_filter=name_contains) or [-1]
 
         query = Repository.query()\
-            .order_by(func.length(Repository.repo_name))\
-            .order_by(Repository.repo_name)\
             .filter(Repository.archived.isnot(true()))\
             .filter(or_(
                 # generate multiple IN to fix limitation problems
                 *in_filter_generator(Repository.repo_id, allowed_ids)
             ))
 
+        query = query.order_by(case(
+            [
+                (Repository.repo_name.startswith(repo_group_name), repo_group_name+'/'),
+            ],
+        ))
+        query = query.order_by(func.length(Repository.repo_name))
+        query = query.order_by(Repository.repo_name)
+
         if repo_type:
             query = query.filter(Repository.repo_type == repo_type)
 
@@ -145,20 +152,26 b' class HomeView(BaseAppView):'
             }
             for obj in acl_iter]
 
-    def _get_repo_group_list(self, name_contains=None, limit=20):
+    def _get_repo_group_list(self, name_contains=None, repo_group_name='', limit=20):
         org_query = name_contains
         allowed_ids = self._rhodecode_user.repo_group_acl_ids(
             ['group.read', 'group.write', 'group.admin'],
             cache=False, name_filter=name_contains) or [-1]
 
         query = RepoGroup.query()\
-            .order_by(func.length(RepoGroup.group_name))\
-            .order_by(RepoGroup.group_name) \
             .filter(or_(
                 # generate multiple IN to fix limitation problems
                 *in_filter_generator(RepoGroup.group_id, allowed_ids)
             ))
 
+        query = query.order_by(case(
+            [
+                (RepoGroup.group_name.startswith(repo_group_name), repo_group_name+'/'),
+            ],
+        ))
+        query = query.order_by(func.length(RepoGroup.group_name))
+        query = query.order_by(RepoGroup.group_name)
+
         if name_contains:
             ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
             query = query.filter(
@@ -183,11 +196,17 b' class HomeView(BaseAppView):'
     def _get_user_list(self, name_contains=None, limit=20):
         org_query = name_contains
         if not name_contains:
-            return []
+            return [], False
 
-        name_contains = re.compile('(?:user:)(.+)').findall(name_contains)
+        # TODO(marcink): should all logged in users be allowed to search others?
+        allowed_user_search = self._rhodecode_user.username != User.DEFAULT_USER
+        if not allowed_user_search:
+            return [], False
+
+        name_contains = re.compile('(?:user:[ ]?)(.+)').findall(name_contains)
         if len(name_contains) != 1:
-            return []
+            return [], False
+
         name_contains = name_contains[0]
 
         query = User.query()\
@@ -207,22 +226,28 b' class HomeView(BaseAppView):'
             {
                 'id': obj.user_id,
                 'value': org_query,
-                'value_display': obj.username,
+                'value_display': 'user: `{}`'.format(obj.username),
                 'type': 'user',
                 'icon_link': h.gravatar_url(obj.email, 30),
                 'url': h.route_path(
                     'user_profile', username=obj.username)
             }
-            for obj in acl_iter]
+            for obj in acl_iter], True
 
     def _get_user_groups_list(self, name_contains=None, limit=20):
         org_query = name_contains
         if not name_contains:
-            return []
+            return [], False
 
-        name_contains = re.compile('(?:user_group:)(.+)').findall(name_contains)
+        # TODO(marcink): should all logged in users be allowed to search others?
+        allowed_user_search = self._rhodecode_user.username != User.DEFAULT_USER
+        if not allowed_user_search:
+            return [], False
+
+        name_contains = re.compile('(?:user_group:[ ]?)(.+)').findall(name_contains)
         if len(name_contains) != 1:
-            return []
+            return [], False
+
         name_contains = name_contains[0]
 
         query = UserGroup.query()\
@@ -241,27 +266,34 b' class HomeView(BaseAppView):'
             {
                 'id': obj.users_group_id,
                 'value': org_query,
-                'value_display': obj.users_group_name,
+                'value_display': 'user_group: `{}`'.format(obj.users_group_name),
                 'type': 'user_group',
                 'url': h.route_path(
                     'user_group_profile', user_group_name=obj.users_group_name)
             }
-            for obj in acl_iter]
+            for obj in acl_iter], True
 
-    def _get_hash_commit_list(self, auth_user, searcher, query):
+    def _get_hash_commit_list(self, auth_user, searcher, query, repo=None, repo_group=None):
+        repo_name = repo_group_name = None
+        if repo:
+            repo_name = repo.repo_name
+        if repo_group:
+            repo_group_name = repo_group.group_name
+
         org_query = query
         if not query or len(query) < 3 or not searcher:
-            return []
+            return [], False
 
-        commit_hashes = re.compile('(?:commit:)([0-9a-f]{2,40})').findall(query)
+        commit_hashes = re.compile('(?:commit:[ ]?)([0-9a-f]{2,40})').findall(query)
 
         if len(commit_hashes) != 1:
-            return []
+            return [], False
+
         commit_hash = commit_hashes[0]
 
         result = searcher.search(
             'commit_id:{}*'.format(commit_hash), 'commit', auth_user,
-            raise_on_exc=False)
+            repo_name, repo_group_name, raise_on_exc=False)
 
         commits = []
         for entry in result['results']:
@@ -286,7 +318,55 b' class HomeView(BaseAppView):'
             }
 
             commits.append(commit_entry)
-        return commits
+        return commits, True
+
+    def _get_path_list(self, auth_user, searcher, query, repo=None, repo_group=None):
+        repo_name = repo_group_name = None
+        if repo:
+            repo_name = repo.repo_name
+        if repo_group:
+            repo_group_name = repo_group.group_name
+
+        org_query = query
+        if not query or len(query) < 3 or not searcher:
+            return [], False
+
+        paths_re = re.compile('(?:file:[ ]?)(.+)').findall(query)
+        if len(paths_re) != 1:
+            return [], False
+
+        file_path = paths_re[0]
+
+        search_path = searcher.escape_specials(file_path)
+        result = searcher.search(
+            'file.raw:*{}*'.format(search_path), 'path', auth_user,
+            repo_name, repo_group_name, raise_on_exc=False)
+
+        files = []
+        for entry in result['results']:
+            repo_data = {
+                'repository_id': entry.get('repository_id'),
+                'repository_type': entry.get('repo_type'),
+                'repository_name': entry.get('repository'),
+            }
+
+            file_entry = {
+                'id': entry['commit_id'],
+                'value': org_query,
+                'value_display': '`{}` file: {}'.format(
+                    entry['repository'], entry['file']),
+                'type': 'file',
+                'repo': entry['repository'],
+                'repo_data': repo_data,
+
+                'url': h.route_path(
+                    'repo_files',
+                    repo_name=entry['repository'], commit_id=entry['commit_id'],
+                    f_path=entry['file'])
+            }
+
+            files.append(file_entry)
+        return files, True
 
     @LoginRequired()
     @view_config(
@@ -363,36 +443,42 b' class HomeView(BaseAppView):'
             def query_modifier():
                 qry = query
                 return {'q': qry, 'type': 'content'}
-            label = u'File search for `{}` in this repository.'.format(query)
-            queries.append(
-                {
-                    'id': -10,
-                    'value': query,
-                    'value_display': label,
-                    'type': 'search',
-                    'url': h.route_path('search_repo',
-                                        repo_name=repo_name,
-                                        _query=query_modifier())
+
+            label = u'File search for `{}`'.format(h.escape(query))
+            file_qry = {
+                'id': -10,
+                'value': query,
+                'value_display': label,
+                'type': 'search',
+                'subtype': 'repo',
+                'url': h.route_path('search_repo',
+                                    repo_name=repo_name,
+                                    _query=query_modifier())
                 }
-            )
 
             # commits
             def query_modifier():
                 qry = query
                 return {'q': qry, 'type': 'commit'}
 
-            label = u'Commit search for `{}` in this repository.'.format(query)
-            queries.append(
-                {
-                    'id': -20,
-                    'value': query,
-                    'value_display': label,
-                    'type': 'search',
-                    'url': h.route_path('search_repo',
-                                        repo_name=repo_name,
-                                        _query=query_modifier())
+            label = u'Commit search for `{}`'.format(h.escape(query))
+            commit_qry = {
+                'id': -20,
+                'value': query,
+                'value_display': label,
+                'type': 'search',
+                'subtype': 'repo',
+                'url': h.route_path('search_repo',
+                                    repo_name=repo_name,
+                                    _query=query_modifier())
                 }
-            )
+
+            if repo_context in ['commit', 'commits']:
+                queries.extend([commit_qry, file_qry])
+            elif repo_context in ['files', 'summary']:
+                queries.extend([file_qry, commit_qry])
+            else:
+                queries.extend([commit_qry, file_qry])
 
         elif is_es_6 and repo_group_name:
             # files
@@ -400,37 +486,43 b' class HomeView(BaseAppView):'
                 qry = query
                 return {'q': qry, 'type': 'content'}
 
-            label = u'File search for `{}` in this repository group'.format(query)
-            queries.append(
-                {
-                    'id': -30,
-                    'value': query,
-                    'value_display': label,
-                    'type': 'search',
-                    'url': h.route_path('search_repo_group',
-                                        repo_group_name=repo_group_name,
-                                        _query=query_modifier())
+            label = u'File search for `{}`'.format(query)
+            file_qry = {
+                'id': -30,
+                'value': query,
+                'value_display': label,
+                'type': 'search',
+                'subtype': 'repo_group',
+                'url': h.route_path('search_repo_group',
+                                    repo_group_name=repo_group_name,
+                                    _query=query_modifier())
                 }
-            )
 
             # commits
             def query_modifier():
                 qry = query
                 return {'q': qry, 'type': 'commit'}
 
-            label = u'Commit search for `{}` in this repository group'.format(query)
-            queries.append(
-                {
-                    'id': -40,
-                    'value': query,
-                    'value_display': label,
-                    'type': 'search',
-                    'url': h.route_path('search_repo_group',
-                                        repo_group_name=repo_group_name,
-                                        _query=query_modifier())
+            label = u'Commit search for `{}`'.format(query)
+            commit_qry = {
+                'id': -40,
+                'value': query,
+                'value_display': label,
+                'type': 'search',
+                'subtype': 'repo_group',
+                'url': h.route_path('search_repo_group',
+                                    repo_group_name=repo_group_name,
+                                    _query=query_modifier())
                 }
-            )
 
+            if repo_context in ['commit', 'commits']:
+                queries.extend([commit_qry, file_qry])
+            elif repo_context in ['files', 'summary']:
+                queries.extend([file_qry, commit_qry])
+            else:
+                queries.extend([commit_qry, file_qry])
+
+        # Global, not scoped
         if not queries:
             queries.append(
                 {
@@ -438,6 +530,7 b' class HomeView(BaseAppView):'
                     'value': query,
                     'value_display': u'File search for: `{}`'.format(query),
                     'type': 'search',
+                    'subtype': 'global',
                     'url': h.route_path('search',
                                         _query={'q': query, 'type': 'content'})
                 })
@@ -447,6 +540,7 b' class HomeView(BaseAppView):'
                     'value': query,
                     'value_display': u'Commit search for: `{}`'.format(query),
                     'type': 'search',
+                    'subtype': 'global',
                     'url': h.route_path('search',
                                         _query={'q': query, 'type': 'commit'})
                 })
@@ -469,54 +563,107 b' class HomeView(BaseAppView):'
         if not query:
             return {'suggestions': res}
 
+        def no_match(name):
+            return {
+                'id': -1,
+                'value': "",
+                'value_display': name,
+                'type': 'text',
+                'url': ""
+            }
         searcher = searcher_from_config(self.request.registry.settings)
-        for _q in self._get_default_search_queries(self.request.GET, searcher, query):
-            res.append(_q)
+        has_specialized_search = False
 
+        # set repo context
+        repo = None
+        repo_id = safe_int(self.request.GET.get('search_context[repo_id]'))
+        if repo_id:
+            repo = Repository.get(repo_id)
+
+        # set group context
+        repo_group = None
         repo_group_id = safe_int(self.request.GET.get('search_context[repo_group_id]'))
         if repo_group_id:
             repo_group = RepoGroup.get(repo_group_id)
-            composed_hint = '{}/{}'.format(repo_group.group_name, query)
-            show_hint = not query.startswith(repo_group.group_name)
-            if repo_group and show_hint:
-                hint = u'Repository search inside: `{}`'.format(composed_hint)
-                res.append({
-                    'id': -1,
-                    'value': composed_hint,
-                    'value_display': hint,
-                    'type': 'hint',
-                    'url': ""
-                })
+        prefix_match = False
+
+        # user: type search
+        if not prefix_match:
+            users, prefix_match = self._get_user_list(query)
+            if users:
+                has_specialized_search = True
+                for serialized_user in users:
+                    res.append(serialized_user)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching users found'))
 
-        repo_groups = self._get_repo_group_list(query)
-        for serialized_repo_group in repo_groups:
-            res.append(serialized_repo_group)
+        # user_group: type search
+        if not prefix_match:
+            user_groups, prefix_match = self._get_user_groups_list(query)
+            if user_groups:
+                has_specialized_search = True
+                for serialized_user_group in user_groups:
+                    res.append(serialized_user_group)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching user groups found'))
 
-        repos = self._get_repo_list(query)
-        for serialized_repo in repos:
-            res.append(serialized_repo)
+        # FTS commit: type search
+        if not prefix_match:
+            commits, prefix_match = self._get_hash_commit_list(
+                c.auth_user, searcher, query, repo, repo_group)
+            if commits:
+                has_specialized_search = True
+                unique_repos = collections.OrderedDict()
+                for commit in commits:
+                    repo_name = commit['repo']
+                    unique_repos.setdefault(repo_name, []).append(commit)
 
-        # TODO(marcink): should all logged in users be allowed to search others?
-        allowed_user_search = self._rhodecode_user.username != User.DEFAULT_USER
-        if allowed_user_search:
-            users = self._get_user_list(query)
-            for serialized_user in users:
-                res.append(serialized_user)
+                for _repo, commits in unique_repos.items():
+                    for commit in commits:
+                        res.append(commit)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching commits found'))
 
-            user_groups = self._get_user_groups_list(query)
-            for serialized_user_group in user_groups:
-                res.append(serialized_user_group)
+        # FTS file: type search
+        if not prefix_match:
+            paths, prefix_match = self._get_path_list(
+                c.auth_user, searcher, query, repo, repo_group)
+            if paths:
+                has_specialized_search = True
+                unique_repos = collections.OrderedDict()
+                for path in paths:
+                    repo_name = path['repo']
+                    unique_repos.setdefault(repo_name, []).append(path)
 
-        commits = self._get_hash_commit_list(c.auth_user, searcher, query)
-        if commits:
-            unique_repos = collections.OrderedDict()
-            for commit in commits:
-                repo_name = commit['repo']
-                unique_repos.setdefault(repo_name, []).append(commit)
+                for repo, paths in unique_repos.items():
+                    for path in paths:
+                        res.append(path)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching files found'))
+
+        # main suggestions
+        if not has_specialized_search:
+            repo_group_name = ''
+            if repo_group:
+                repo_group_name = repo_group.group_name
 
-            for repo, commits in unique_repos.items():
-                for commit in commits:
-                    res.append(commit)
+            for _q in self._get_default_search_queries(self.request.GET, searcher, query):
+                res.append(_q)
+
+            repo_groups = self._get_repo_group_list(query, repo_group_name=repo_group_name)
+            for serialized_repo_group in repo_groups:
+                res.append(serialized_repo_group)
+
+            repos = self._get_repo_list(query, repo_group_name=repo_group_name)
+            for serialized_repo in repos:
+                res.append(serialized_repo)
+
+            if not repos and not repo_groups:
+                res.append(no_match('No matches found'))
 
         return {'suggestions': res}
 
@@ -564,8 +711,11 b' class HomeView(BaseAppView):'
     def repo_group_main_page(self):
         c = self.load_default_context()
         c.repo_group = self.request.db_repo_group
-        repo_data, repo_group_data = self._get_groups_and_repos(
-            c.repo_group.group_id)
+        repo_data, repo_group_data = self._get_groups_and_repos(c.repo_group.group_id)
+
+        # update every 5 min
+        if self.request.db_repo_group.last_commit_cache_update_diff > 60 * 5:
+            self.request.db_repo_group.update_commit_cache()
 
         # json used to render the grids
         c.repos_data = json.dumps(repo_data)
@@ -594,6 +744,34 b' class HomeView(BaseAppView):'
     @LoginRequired()
     @CSRFRequired()
     @view_config(
+        route_name='file_preview', request_method='POST',
+        renderer='string', xhr=True)
+    def file_preview(self):
+        # Technically a CSRF token is not needed as no state changes with this
+        # call. However, as this is a POST is better to have it, so automated
+        # tools don't flag it as potential CSRF.
+        # Post is required because the payload could be bigger than the maximum
+        # allowed by GET.
+
+        text = self.request.POST.get('text')
+        file_path = self.request.POST.get('file_path')
+
+        renderer = h.renderer_from_filename(file_path)
+
+        if renderer:
+            return h.render(text, renderer=renderer, mentions=True)
+        else:
+            self.load_default_context()
+            _render = self.request.get_partial_renderer(
+                'rhodecode:templates/files/file_content.mako')
+
+            lines = filenode_as_lines_tokens(FileNode(file_path, text))
+
+            return _render('render_lines', lines)
+
+    @LoginRequired()
+    @CSRFRequired()
+    @view_config(
         route_name='store_user_session_value', request_method='POST',
         renderer='string', xhr=True)
     def store_user_session_attr(self):
@@ -604,4 +782,4 b' class HomeView(BaseAppView):'
         if existing_value != val:
             self.request.session[key] = val
 
-        return 'stored:{}'.format(key)
+        return 'stored:{}:{}'.format(key, val)

rhodecode/apps/journal/views.py

@@ -31,12 +31,12 b' from pyramid.renderers import render'
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.model.db import (
-    or_, joinedload, UserLog, UserFollowing, User, UserApiKeys)
+    or_, joinedload, Repository, UserLog, UserFollowing, User, UserApiKeys)
 from rhodecode.model.meta import Session
 import rhodecode.lib.helpers as h
 from rhodecode.lib.helpers import Page
 from rhodecode.lib.user_log_filter import user_log_filter
-from rhodecode.lib.auth import LoginRequired, NotAnonymous, CSRFRequired
+from rhodecode.lib.auth import LoginRequired, NotAnonymous, CSRFRequired, HasRepoPermissionAny
 from rhodecode.lib.utils2 import safe_int, AttributeDict, md5_safe
 from rhodecode.model.scm import ScmModel
 
@@ -153,7 +153,7 b' class JournalView(BaseAppView):'
             desc = action_extra()
             _url = h.route_url('home')
             if entry.repository is not None:
-                _url = h.route_url('repo_changelog',
+                _url = h.route_url('repo_commits',
                                    repo_name=entry.repository.repo_name)
 
             feed.add_item(
@@ -199,7 +199,7 b' class JournalView(BaseAppView):'
             desc = action_extra()
             _url = h.route_url('home')
             if entry.repository is not None:
-                _url = h.route_url('repo_changelog',
+                _url = h.route_url('repo_commits',
                                    repo_name=entry.repository.repo_name)
 
             feed.add_item(
@@ -297,18 +297,19 b' class JournalView(BaseAppView):'
         user_id = self.request.POST.get('follows_user_id')
         if user_id:
             try:
-                ScmModel().toggle_following_user(
-                    user_id, self._rhodecode_user.user_id)
+                ScmModel().toggle_following_user(user_id, self._rhodecode_user.user_id)
                 Session().commit()
                 return 'ok'
             except Exception:
                 raise HTTPBadRequest()
 
         repo_id = self.request.POST.get('follows_repo_id')
-        if repo_id:
+        repo = Repository.get_or_404(repo_id)
+        perm_set = ['repository.read', 'repository.write', 'repository.admin']
+        has_perm = HasRepoPermissionAny(*perm_set)(repo.repo_name, 'RepoWatch check')
+        if repo and has_perm:
             try:
-                ScmModel().toggle_following_repo(
-                    repo_id, self._rhodecode_user.user_id)
+                ScmModel().toggle_following_repo(repo_id, self._rhodecode_user.user_id)
                 Session().commit()
                 return 'ok'
             except Exception:

rhodecode/apps/my_account/tests/test_my_account_ssh_keys.py

@@ -160,4 +160,4 b' class TestMyAccountSshKeysView(TestContr'
 
         response.mustcontain('Private key')
         response.mustcontain('Public key')
-        response.mustcontain('-----BEGIN RSA PRIVATE KEY-----')
+        response.mustcontain('-----BEGIN PRIVATE KEY-----')

rhodecode/apps/my_account/views/my_account.py

@@ -360,7 +360,7 b' class MyAccountView(BaseAppView, DataGri'
                 'repository.read', 'repository.write', 'repository.admin'])
 
         repos_data = RepoModel().get_repos_as_dict(
-            repo_list=repo_list, admin=admin)
+            repo_list=repo_list, admin=admin, short_name=False)
         # json used to render the grid
         return json.dumps(repos_data)
 
@@ -423,7 +423,7 b' class MyAccountView(BaseAppView, DataGri'
         default_redirect_url = ''
 
         # save repo
-        if entry.get('bookmark_repo'):
+        if entry.get('bookmark_repo') and safe_int(entry.get('bookmark_repo')):
             repo = Repository.get(entry['bookmark_repo'])
             perm_check = HasRepoPermissionAny(
                 'repository.read', 'repository.write', 'repository.admin')
@@ -432,7 +432,7 b' class MyAccountView(BaseAppView, DataGri'
                 should_save = True
                 default_redirect_url = '${repo_url}'
         # save repo group
-        elif entry.get('bookmark_repo_group'):
+        elif entry.get('bookmark_repo_group') and safe_int(entry.get('bookmark_repo_group')):
             repo_group = RepoGroup.get(entry['bookmark_repo_group'])
             perm_check = HasRepoGroupPermissionAny(
                 'group.read', 'group.write', 'group.admin')
@@ -496,6 +496,7 b' class MyAccountView(BaseAppView, DataGri'
         if not user_bookmark:
             raise HTTPFound(redirect_url)
 
+        # repository set
         if user_bookmark.repository:
             repo_name = user_bookmark.repository.repo_name
             base_redirect_url = h.route_path(
@@ -506,7 +507,7 b' class MyAccountView(BaseAppView, DataGri'
                     .safe_substitute({'repo_url': base_redirect_url})
             else:
                 redirect_url = base_redirect_url
-
+        # repository group set
         elif user_bookmark.repository_group:
             repo_group_name = user_bookmark.repository_group.group_name
             base_redirect_url = h.route_path(
@@ -517,9 +518,11 b' class MyAccountView(BaseAppView, DataGri'
                     .safe_substitute({'repo_group_url': base_redirect_url})
             else:
                 redirect_url = base_redirect_url
-
+        # custom URL set
         elif user_bookmark.redirect_url:
-            redirect_url = user_bookmark.redirect_url
+            server_url = h.route_url('home').rstrip('/')
+            redirect_url = string.Template(user_bookmark.redirect_url) \
+                .safe_substitute({'server_url': server_url})
 
         log.debug('Redirecting bookmark %s to %s', user_bookmark, redirect_url)
         raise HTTPFound(redirect_url)

rhodecode/apps/repository/__init__.py

@@ -90,7 +90,7 b' def includeme(config):'
     # Files
     config.add_route(
         name='repo_archivefile',
-        pattern='/{repo_name:.*?[^/]}/archive/{fname}', repo_route=True)
+        pattern='/{repo_name:.*?[^/]}/archive/{fname:.*}', repo_route=True)
 
     config.add_route(
         name='repo_files_diff',
@@ -172,6 +172,10 b' def includeme(config):'
         pattern='/{repo_name:.*?[^/]}/add_file/{commit_id}/{f_path:.*}',
         repo_route=True)
     config.add_route(
+        name='repo_files_upload_file',
+        pattern='/{repo_name:.*?[^/]}/upload_file/{commit_id}/{f_path:.*}',
+        repo_route=True)
+    config.add_route(
         name='repo_files_create_file',
         pattern='/{repo_name:.*?[^/]}/create_file/{commit_id}/{f_path:.*}',
         repo_route=True)
@@ -189,19 +193,27 b' def includeme(config):'
         name='repo_stats',
         pattern='/{repo_name:.*?[^/]}/repo_stats/{commit_id}', repo_route=True)
 
-    # Changelog
+    # Commits
+    config.add_route(
+        name='repo_commits',
+        pattern='/{repo_name:.*?[^/]}/commits', repo_route=True)
+    config.add_route(
+        name='repo_commits_file',
+        pattern='/{repo_name:.*?[^/]}/commits/{commit_id}/{f_path:.*}', repo_route=True)
+    config.add_route(
+        name='repo_commits_elements',
+        pattern='/{repo_name:.*?[^/]}/commits_elements', repo_route=True)
+    config.add_route(
+        name='repo_commits_elements_file',
+        pattern='/{repo_name:.*?[^/]}/commits_elements/{commit_id}/{f_path:.*}', repo_route=True)
+
+    # Changelog (old deprecated name for commits page)
     config.add_route(
         name='repo_changelog',
         pattern='/{repo_name:.*?[^/]}/changelog', repo_route=True)
     config.add_route(
         name='repo_changelog_file',
         pattern='/{repo_name:.*?[^/]}/changelog/{commit_id}/{f_path:.*}', repo_route=True)
-    config.add_route(
-        name='repo_changelog_elements',
-        pattern='/{repo_name:.*?[^/]}/changelog_elements', repo_route=True)
-    config.add_route(
-        name='repo_changelog_elements_file',
-        pattern='/{repo_name:.*?[^/]}/changelog_elements/{commit_id}/{f_path:.*}', repo_route=True)
 
     # Compare
     config.add_route(
@@ -312,6 +324,11 b' def includeme(config):'
         pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/comment/{comment_id}/delete',
         repo_route=True, repo_accepted_types=['hg', 'git'])
 
+    # Artifacts, (EE feature)
+    config.add_route(
+        name='repo_artifacts_list',
+        pattern='/{repo_name:.*?[^/]}/artifacts', repo_route=True)
+
     # Settings
     config.add_route(
         name='edit_repo',

rhodecode/apps/repository/tests/test_pull_requests_list.py

@@ -40,11 +40,11 b' def route_path(name, params=None, **kwar'
 class TestPullRequestList(object):
 
     @pytest.mark.parametrize('params, expected_title', [
-        ({'source': 0, 'closed': 1}, 'Closed Pull Requests'),
-        ({'source': 0, 'my': 1}, 'opened by me'),
-        ({'source': 0, 'awaiting_review': 1}, 'awaiting review'),
-        ({'source': 0, 'awaiting_my_review': 1}, 'awaiting my review'),
-        ({'source': 1}, 'Pull Requests from'),
+        ({'source': 0, 'closed': 1}, 'Closed'),
+        ({'source': 0, 'my': 1}, 'Opened by me'),
+        ({'source': 0, 'awaiting_review': 1}, 'Awaiting review'),
+        ({'source': 0, 'awaiting_my_review': 1}, 'Awaiting my review'),
+        ({'source': 1}, 'From this repo'),
     ])
     def test_showing_list_page(self, backend, pr_util, params, expected_title):
         pull_request = pr_util.create_pull_request()
@@ -55,9 +55,10 b' class TestPullRequestList(object):'
                        params=params))
 
         assert_response = response.assert_response()
-        assert_response.element_equals_to('.panel-title', expected_title)
-        element = assert_response.get_element('.panel-title')
-        element_text = assert_response._element_to_string(element)
+
+        element = assert_response.get_element('.title .active')
+        element_text = element.text_content()
+        assert expected_title == element_text
 
     def test_showing_list_page_data(self, backend, pr_util, xhr_header):
         pull_request = pr_util.create_pull_request()

rhodecode/apps/repository/tests/test_repo_changelog.py

@@ -32,9 +32,10 b' def route_path(name, params=None, **kwar'
     import urllib
 
     base_url = {
-        'repo_changelog':'/{repo_name}/changelog',
-        'repo_changelog_file':'/{repo_name}/changelog/{commit_id}/{f_path}',
-        'repo_changelog_elements':'/{repo_name}/changelog_elements',
+        'repo_changelog': '/{repo_name}/changelog',
+        'repo_commits': '/{repo_name}/commits',
+        'repo_commits_file': '/{repo_name}/commits/{commit_id}/{f_path}',
+        'repo_commits_elements': '/{repo_name}/commits_elements',
     }[name].format(**kwargs)
 
     if params:
@@ -42,8 +43,22 b' def route_path(name, params=None, **kwar'
     return base_url
 
 
+def assert_commits_on_page(response, indexes):
+    found_indexes = [int(idx) for idx in MATCH_HASH.findall(response.body)]
+    assert found_indexes == indexes
+
+
 class TestChangelogController(TestController):
 
+    def test_commits_page(self, backend):
+        self.log_user()
+        response = self.app.get(
+            route_path('repo_commits', repo_name=backend.repo_name))
+
+        first_idx = -1
+        last_idx = -DEFAULT_CHANGELOG_SIZE
+        self.assert_commit_range_on_page(response, first_idx, last_idx, backend)
+
     def test_changelog(self, backend):
         self.log_user()
         response = self.app.get(
@@ -62,6 +77,14 b' class TestChangelogController(TestContro'
                        params=dict(branch=backend.default_branch_name)),
             status=200)
 
+    @pytest.mark.backends("hg", "git")
+    def test_commits_filtered_by_branch(self, backend):
+        self.log_user()
+        self.app.get(
+            route_path('repo_commits', repo_name=backend.repo_name,
+                       params=dict(branch=backend.default_branch_name)),
+            status=200)
+
     @pytest.mark.backends("svn")
     def test_changelog_filtered_by_branch_svn(self, autologin_user, backend):
         repo = backend['svn-simple-layout']
@@ -70,27 +93,22 b' class TestChangelogController(TestContro'
                        params=dict(branch='trunk')),
             status=200)
 
-        self.assert_commits_on_page(
-            response, indexes=[15, 12, 7, 3, 2, 1])
+        assert_commits_on_page(response, indexes=[15, 12, 7, 3, 2, 1])
 
-    def test_changelog_filtered_by_wrong_branch(self, backend):
+    def test_commits_filtered_by_wrong_branch(self, backend):
         self.log_user()
         branch = 'wrong-branch-name'
         response = self.app.get(
-            route_path('repo_changelog', repo_name=backend.repo_name,
+            route_path('repo_commits', repo_name=backend.repo_name,
                        params=dict(branch=branch)),
             status=302)
-        expected_url = '/{repo}/changelog/{branch}'.format(
+        expected_url = '/{repo}/commits/{branch}'.format(
             repo=backend.repo_name, branch=branch)
         assert expected_url in response.location
         response = response.follow()
         expected_warning = 'Branch {} is not found.'.format(branch)
         assert expected_warning in response.body
 
-    def assert_commits_on_page(self, response, indexes):
-        found_indexes = [int(idx) for idx in MATCH_HASH.findall(response.body)]
-        assert found_indexes == indexes
-
     @pytest.mark.xfail_backends("svn", reason="Depends on branch support")
     def test_changelog_filtered_by_branch_with_merges(
             self, autologin_user, backend):
@@ -112,21 +130,20 b' class TestChangelogController(TestContro'
             status=200)
 
     @pytest.mark.backends("hg")
-    def test_changelog_closed_branches(self, autologin_user, backend):
+    def test_commits_closed_branches(self, autologin_user, backend):
         repo = backend['closed_branch']
         response = self.app.get(
-            route_path('repo_changelog', repo_name=repo.repo_name,
+            route_path('repo_commits', repo_name=repo.repo_name,
                        params=dict(branch='experimental')),
             status=200)
 
-        self.assert_commits_on_page(
-            response, indexes=[3, 1])
+        assert_commits_on_page(response, indexes=[3, 1])
 
     def test_changelog_pagination(self, backend):
         self.log_user()
         # pagination, walk up to page 6
         changelog_url = route_path(
-            'repo_changelog', repo_name=backend.repo_name)
+            'repo_commits', repo_name=backend.repo_name)
 
         for page in range(1, 7):
             response = self.app.get(changelog_url, {'page': page})
@@ -138,22 +155,30 b' class TestChangelogController(TestContro'
     def assert_commit_range_on_page(
             self, response, first_idx, last_idx, backend):
         input_template = (
-            """<input class="commit-range" id="%(raw_id)s" """
+            """<input class="commit-range" """ 
+            """data-commit-id="%(raw_id)s" data-commit-idx="%(idx)s" """ 
+            """data-short-id="%(short_id)s" id="%(raw_id)s" """
             """name="%(raw_id)s" type="checkbox" value="1" />"""
         )
+
         commit_span_template = """<span class="commit_hash">r%s:%s</span>"""
         repo = backend.repo
 
         first_commit_on_page = repo.get_commit(commit_idx=first_idx)
         response.mustcontain(
-            input_template % {'raw_id': first_commit_on_page.raw_id})
+            input_template % {'raw_id': first_commit_on_page.raw_id,
+                              'idx': first_commit_on_page.idx,
+                              'short_id': first_commit_on_page.short_id})
+
         response.mustcontain(commit_span_template % (
             first_commit_on_page.idx, first_commit_on_page.short_id)
         )
 
         last_commit_on_page = repo.get_commit(commit_idx=last_idx)
         response.mustcontain(
-            input_template % {'raw_id': last_commit_on_page.raw_id})
+            input_template % {'raw_id': last_commit_on_page.raw_id,
+                              'idx': last_commit_on_page.idx,
+                              'short_id': last_commit_on_page.short_id})
         response.mustcontain(commit_span_template % (
             last_commit_on_page.idx, last_commit_on_page.short_id)
         )
@@ -168,10 +193,10 b' class TestChangelogController(TestContro'
         '/vcs/exceptions.py',
         '//vcs/exceptions.py'
     ])
-    def test_changelog_with_filenode(self, backend, test_path):
+    def test_commits_with_filenode(self, backend, test_path):
         self.log_user()
         response = self.app.get(
-            route_path('repo_changelog_file', repo_name=backend.repo_name,
+            route_path('repo_commits_file', repo_name=backend.repo_name,
                        commit_id='tip', f_path=test_path),
             )
 
@@ -180,16 +205,16 b' class TestChangelogController(TestContro'
         response.mustcontain('Added not implemented hg backend test case')
         response.mustcontain('Added BaseChangeset class')
 
-    def test_changelog_with_filenode_that_is_dirnode(self, backend):
+    def test_commits_with_filenode_that_is_dirnode(self, backend):
         self.log_user()
         self.app.get(
-            route_path('repo_changelog_file', repo_name=backend.repo_name,
+            route_path('repo_commits_file', repo_name=backend.repo_name,
                        commit_id='tip', f_path='/tests'),
             status=302)
 
-    def test_changelog_with_filenode_not_existing(self, backend):
+    def test_commits_with_filenode_not_existing(self, backend):
         self.log_user()
         self.app.get(
-            route_path('repo_changelog_file', repo_name=backend.repo_name,
+            route_path('repo_commits_file', repo_name=backend.repo_name,
                        commit_id='tip', f_path='wrong_path'),
             status=302)

rhodecode/apps/repository/tests/test_repo_compare.py

@@ -94,6 +94,7 b' class TestCompareView(object):'
         origin_repo = origin.scm_instance(cache=False)
         origin_repo.config.clear_section('hooks')
         origin_repo.pull(fork.repo_full_path, commit_ids=[commit3.raw_id])
+        origin_repo = origin.scm_instance(cache=False)  # cache rebuild
 
         # Verify test fixture setup
         # This does not work for git
@@ -162,8 +163,7 b' class TestCompareView(object):'
         compare_page.target_source_are_disabled()
 
     @pytest.mark.xfail_backends("svn", reason="Depends on branch support")
-    def test_compare_forks_on_branch_extra_commits_origin_has_incomming(
-            self, backend):
+    def test_compare_forks_on_branch_extra_commits_origin_has_incomming(self, backend):
         repo1 = backend.create_repo()
 
         # commit something !

rhodecode/apps/repository/tests/test_repo_compare_on_single_file.py

@@ -21,6 +21,7 b''
 import pytest
 
 from rhodecode.lib.vcs import nodes
+from rhodecode.lib.vcs.backends.base import EmptyCommit
 from rhodecode.tests.fixture import Fixture
 from rhodecode.tests.utils import commit_change
 
@@ -43,70 +44,7 b' def route_path(name, params=None, **kwar'
 @pytest.mark.usefixtures("autologin_user", "app")
 class TestSideBySideDiff(object):
 
-    def test_diff_side_by_side(self, app, backend, backend_stub):
-        f_path = 'test_sidebyside_file.py'
-        commit1_content = 'content-25d7e49c18b159446c\n'
-        commit2_content = 'content-603d6c72c46d953420\n'
-        repo = backend.create_repo()
-
-        commit1 = commit_change(
-            repo.repo_name, filename=f_path, content=commit1_content,
-            message='A', vcs_type=backend.alias, parent=None, newfile=True)
-
-        commit2 = commit_change(
-            repo.repo_name, filename=f_path, content=commit2_content,
-            message='B, child of A', vcs_type=backend.alias, parent=commit1)
-
-        response = self.app.get(route_path(
-            'repo_compare',
-            repo_name=repo.repo_name,
-            source_ref_type='rev',
-            source_ref=commit1.raw_id,
-            target_ref_type='rev',
-            target_ref=commit2.raw_id,
-            params=dict(f_path=f_path, target_repo=repo.repo_name, diffmode='sidebyside')
-        ))
-
-        response.mustcontain('Expand 1 commit')
-        response.mustcontain('1 file changed')
-
-        response.mustcontain(
-            'r%s:%s...r%s:%s' % (
-            commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
-
-        response.mustcontain('<strong>{}</strong>'.format(f_path))
-
-    def test_diff_side_by_side_with_empty_file(self, app, backend, backend_stub):
-        commits = [
-            {'message': 'First commit'},
-            {'message': 'Commit with binary',
-             'added': [nodes.FileNode('file.empty', content='')]},
-        ]
-        f_path = 'file.empty'
-        repo = backend.create_repo(commits=commits)
-        commit1 = repo.get_commit(commit_idx=0)
-        commit2 = repo.get_commit(commit_idx=1)
-
-        response = self.app.get(route_path(
-            'repo_compare',
-            repo_name=repo.repo_name,
-            source_ref_type='rev',
-            source_ref=commit1.raw_id,
-            target_ref_type='rev',
-            target_ref=commit2.raw_id,
-            params=dict(f_path=f_path, target_repo=repo.repo_name, diffmode='sidebyside')
-        ))
-
-        response.mustcontain('Expand 1 commit')
-        response.mustcontain('1 file changed')
-
-        response.mustcontain(
-            'r%s:%s...r%s:%s' % (
-            commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
-
-        response.mustcontain('<strong>{}</strong>'.format(f_path))
-
-    def test_diff_sidebyside_two_commits(self, app, backend):
+    def test_diff_sidebyside_single_commit(self, app, backend):
         commit_id_range = {
             'hg': {
                 'commits': ['25d7e49c18b159446cadfa506a5cf8ad1cb04067',
@@ -141,26 +79,164 b' class TestSideBySideDiff(object):'
             params=dict(target_repo=backend.repo_name, diffmode='sidebyside')
         ))
 
+        response.mustcontain(file_changes)
         response.mustcontain('Expand 1 commit')
-        response.mustcontain(file_changes)
 
-    def test_diff_sidebyside_two_commits_single_file(self, app, backend):
+    def test_diff_sidebyside_two_commits(self, app, backend):
         commit_id_range = {
             'hg': {
-                'commits': ['25d7e49c18b159446cadfa506a5cf8ad1cb04067',
+                'commits': ['4fdd71e9427417b2e904e0464c634fdee85ec5a7',
                             '603d6c72c46d953420c89d36372f08d9f305f5dd'],
-                'changes': '1 file changed: 1 inserted, 1 deleted'
+                'changes': '32 files changed: 1165 inserted, 308 deleted'
             },
             'git': {
-                'commits': ['6fc9270775aaf5544c1deb014f4ddd60c952fcbb',
+                'commits': ['f5fbf9cfd5f1f1be146f6d3b38bcd791a7480c13',
                             '03fa803d7e9fb14daa9a3089e0d1494eda75d986'],
-                'changes': '1 file changed: 1 inserted, 1 deleted'
+                'changes': '32 files changed: 1165 inserted, 308 deleted'
             },
 
             'svn': {
-                'commits': ['336',
+                'commits': ['335',
                             '337'],
-                'changes': '1 file changed: 1 inserted, 1 deleted'
+                'changes': '32 files changed: 1179 inserted, 310 deleted'
+            },
+        }
+
+        commit_info = commit_id_range[backend.alias]
+        commit2, commit1 = commit_info['commits']
+        file_changes = commit_info['changes']
+
+        response = self.app.get(route_path(
+            'repo_compare',
+            repo_name=backend.repo_name,
+            source_ref_type='rev',
+            source_ref=commit2,
+            target_repo=backend.repo_name,
+            target_ref_type='rev',
+            target_ref=commit1,
+            params=dict(target_repo=backend.repo_name, diffmode='sidebyside')
+        ))
+
+        response.mustcontain(file_changes)
+        response.mustcontain('Expand 2 commits')
+
+    @pytest.mark.xfail(reason='GIT does not handle empty commit compare correct (missing 1 commit)')
+    def test_diff_side_by_side_from_0_commit(self, app, backend, backend_stub):
+        f_path = 'test_sidebyside_file.py'
+        commit1_content = 'content-25d7e49c18b159446c\n'
+        commit2_content = 'content-603d6c72c46d953420\n'
+        repo = backend.create_repo()
+
+        commit1 = commit_change(
+            repo.repo_name, filename=f_path, content=commit1_content,
+            message='A', vcs_type=backend.alias, parent=None, newfile=True)
+
+        commit2 = commit_change(
+            repo.repo_name, filename=f_path, content=commit2_content,
+            message='B, child of A', vcs_type=backend.alias, parent=commit1)
+
+        response = self.app.get(route_path(
+            'repo_compare',
+            repo_name=repo.repo_name,
+            source_ref_type='rev',
+            source_ref=EmptyCommit().raw_id,
+            target_ref_type='rev',
+            target_ref=commit2.raw_id,
+            params=dict(diffmode='sidebyside')
+        ))
+
+        response.mustcontain('Expand 2 commits')
+        response.mustcontain('123 file changed')
+
+        response.mustcontain(
+            'r%s:%s...r%s:%s' % (
+                commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
+
+        response.mustcontain('<strong>{}</strong>'.format(f_path))
+
+    @pytest.mark.xfail(reason='GIT does not handle empty commit compare correct (missing 1 commit)')
+    def test_diff_side_by_side_from_0_commit_with_file_filter(self, app, backend, backend_stub):
+        f_path = 'test_sidebyside_file.py'
+        commit1_content = 'content-25d7e49c18b159446c\n'
+        commit2_content = 'content-603d6c72c46d953420\n'
+        repo = backend.create_repo()
+
+        commit1 = commit_change(
+            repo.repo_name, filename=f_path, content=commit1_content,
+            message='A', vcs_type=backend.alias, parent=None, newfile=True)
+
+        commit2 = commit_change(
+            repo.repo_name, filename=f_path, content=commit2_content,
+            message='B, child of A', vcs_type=backend.alias, parent=commit1)
+
+        response = self.app.get(route_path(
+            'repo_compare',
+            repo_name=repo.repo_name,
+            source_ref_type='rev',
+            source_ref=EmptyCommit().raw_id,
+            target_ref_type='rev',
+            target_ref=commit2.raw_id,
+            params=dict(f_path=f_path, target_repo=repo.repo_name, diffmode='sidebyside')
+        ))
+
+        response.mustcontain('Expand 2 commits')
+        response.mustcontain('1 file changed')
+
+        response.mustcontain(
+            'r%s:%s...r%s:%s' % (
+                commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
+
+        response.mustcontain('<strong>{}</strong>'.format(f_path))
+
+    def test_diff_side_by_side_with_empty_file(self, app, backend, backend_stub):
+        commits = [
+            {'message': 'First commit'},
+            {'message': 'Second commit'},
+            {'message': 'Commit with binary',
+             'added': [nodes.FileNode('file.empty', content='')]},
+        ]
+        f_path = 'file.empty'
+        repo = backend.create_repo(commits=commits)
+        commit1 = repo.get_commit(commit_idx=0)
+        commit2 = repo.get_commit(commit_idx=1)
+        commit3 = repo.get_commit(commit_idx=2)
+
+        response = self.app.get(route_path(
+            'repo_compare',
+            repo_name=repo.repo_name,
+            source_ref_type='rev',
+            source_ref=commit1.raw_id,
+            target_ref_type='rev',
+            target_ref=commit3.raw_id,
+            params=dict(f_path=f_path, target_repo=repo.repo_name, diffmode='sidebyside')
+        ))
+
+        response.mustcontain('Expand 2 commits')
+        response.mustcontain('1 file changed')
+
+        response.mustcontain(
+            'r%s:%s...r%s:%s' % (
+                commit2.idx, commit2.short_id, commit3.idx, commit3.short_id))
+
+        response.mustcontain('<strong>{}</strong>'.format(f_path))
+
+    def test_diff_sidebyside_two_commits_with_file_filter(self, app, backend):
+        commit_id_range = {
+            'hg': {
+                'commits': ['4fdd71e9427417b2e904e0464c634fdee85ec5a7',
+                            '603d6c72c46d953420c89d36372f08d9f305f5dd'],
+                'changes': '1 file changed: 3 inserted, 3 deleted'
+            },
+            'git': {
+                'commits': ['f5fbf9cfd5f1f1be146f6d3b38bcd791a7480c13',
+                            '03fa803d7e9fb14daa9a3089e0d1494eda75d986'],
+                'changes': '1 file changed: 3 inserted, 3 deleted'
+            },
+
+            'svn': {
+                'commits': ['335',
+                            '337'],
+                'changes': '1 file changed: 3 inserted, 3 deleted'
             },
         }
         f_path = 'docs/conf.py'
@@ -179,5 +255,5 b' class TestSideBySideDiff(object):'
             params=dict(f_path=f_path, target_repo=backend.repo_name, diffmode='sidebyside')
         ))
 
-        response.mustcontain('Expand 1 commit')
+        response.mustcontain('Expand 2 commits')
         response.mustcontain(file_changes)

rhodecode/apps/repository/tests/test_repo_files.py

@@ -243,7 +243,7 b' class TestFilesViews(object):'
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='vcs/nodes.py'))
 
-        msgbox = """<div class="commit right-content">%s</div>"""
+        msgbox = """<div class="commit">%s</div>"""
         response.mustcontain(msgbox % (commit.message, ))
 
         assert_response = response.assert_response()
@@ -313,6 +313,7 b' class TestFilesViews(object):'
 
         expected_data = json.loads(
             fixture.load_resource('svn_node_history_branches.json'))
+
         assert expected_data == response.json
 
     def test_file_source_history_with_annotation(self, backend, xhr_header):
@@ -521,10 +522,10 b' class TestRepositoryArchival(object):'
     def test_archival(self, backend):
         backend.enable_downloads()
         commit = backend.repo.get_commit(commit_idx=173)
-        for archive, info in settings.ARCHIVE_SPECS.items():
-            mime_type, arch_ext = info
-            short = commit.short_id + arch_ext
-            fname = commit.raw_id + arch_ext
+        for a_type, content_type, extension in settings.ARCHIVE_SPECS:
+
+            short = commit.short_id + extension
+            fname = commit.raw_id + extension
             filename = '%s-%s' % (backend.repo_name, short)
             response = self.app.get(
                 route_path('repo_archivefile',
@@ -534,7 +535,7 b' class TestRepositoryArchival(object):'
             assert response.status == '200 OK'
             headers = [
                 ('Content-Disposition', 'attachment; filename=%s' % filename),
-                ('Content-Type', '%s' % mime_type),
+                ('Content-Type', '%s' % content_type),
             ]
 
             for header in headers:
@@ -761,7 +762,7 b' class TestModifyFilesWithWebInterface(ob'
 
     @pytest.mark.xfail_backends("svn", reason="Depends on online editing")
     def test_add_file_into_repo_missing_content(self, backend, csrf_token):
-        repo = backend.create_repo()
+        backend.create_repo()
         filename = 'init.py'
         response = self.app.post(
             route_path('repo_files_create_file',
@@ -770,26 +771,25 b' class TestModifyFilesWithWebInterface(ob'
             params={
                 'content': "",
                 'filename': filename,
-                'location': "",
                 'csrf_token': csrf_token,
             },
             status=302)
-        assert_session_flash(response,
-            'Successfully committed new file `{}`'.format(
-                os.path.join(filename)))
+        expected_msg = 'Successfully committed new file `{}`'.format(os.path.join(filename))
+        assert_session_flash(response, expected_msg)
 
     def test_add_file_into_repo_missing_filename(self, backend, csrf_token):
+        commit_id = backend.repo.get_commit().raw_id
         response = self.app.post(
             route_path('repo_files_create_file',
                        repo_name=backend.repo_name,
-                       commit_id='tip', f_path='/'),
+                       commit_id=commit_id, f_path='/'),
             params={
                 'content': "foo",
                 'csrf_token': csrf_token,
             },
             status=302)
 
-        assert_session_flash(response, 'No filename')
+        assert_session_flash(response, 'No filename specified')
 
     def test_add_file_into_repo_errors_and_no_commits(
             self, backend, csrf_token):
@@ -806,7 +806,7 b' class TestModifyFilesWithWebInterface(ob'
             },
             status=302)
 
-        assert_session_flash(response, 'No filename')
+        assert_session_flash(response, 'No filename specified')
 
         # Not allowed, redirect to the summary
         redirected = response.follow()
@@ -817,52 +817,51 b' class TestModifyFilesWithWebInterface(ob'
 
         assert redirected.request.path == summary_url
 
-    @pytest.mark.parametrize("location, filename", [
-        ('/abs', 'foo'),
-        ('../rel', 'foo'),
-        ('file/../foo', 'foo'),
+    @pytest.mark.parametrize("filename, clean_filename", [
+        ('/abs/foo', 'abs/foo'),
+        ('../rel/foo', 'rel/foo'),
+        ('file/../foo/foo', 'file/foo/foo'),
     ])
-    def test_add_file_into_repo_bad_filenames(
-            self, location, filename, backend, csrf_token):
+    def test_add_file_into_repo_bad_filenames(self, filename, clean_filename, backend, csrf_token):
+        repo = backend.create_repo()
+        commit_id = repo.get_commit().raw_id
+
         response = self.app.post(
             route_path('repo_files_create_file',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='/'),
+                       repo_name=repo.repo_name,
+                       commit_id=commit_id, f_path='/'),
             params={
                 'content': "foo",
                 'filename': filename,
-                'location': location,
                 'csrf_token': csrf_token,
             },
             status=302)
 
-        assert_session_flash(
-            response,
-            'The location specified must be a relative path and must not '
-            'contain .. in the path')
+        expected_msg = 'Successfully committed new file `{}`'.format(clean_filename)
+        assert_session_flash(response, expected_msg)
 
-    @pytest.mark.parametrize("cnt, location, filename", [
-        (1, '', 'foo.txt'),
-        (2, 'dir', 'foo.rst'),
-        (3, 'rel/dir', 'foo.bar'),
+    @pytest.mark.parametrize("cnt, filename, content", [
+        (1, 'foo.txt', "Content"),
+        (2, 'dir/foo.rst', "Content"),
+        (3, 'dir/foo-second.rst', "Content"),
+        (4, 'rel/dir/foo.bar', "Content"),
     ])
-    def test_add_file_into_repo(self, cnt, location, filename, backend,
-                                csrf_token):
+    def test_add_file_into_empty_repo(self, cnt, filename, content, backend, csrf_token):
         repo = backend.create_repo()
+        commit_id = repo.get_commit().raw_id
         response = self.app.post(
             route_path('repo_files_create_file',
                        repo_name=repo.repo_name,
-                       commit_id='tip', f_path='/'),
+                       commit_id=commit_id, f_path='/'),
             params={
-                'content': "foo",
+                'content': content,
                 'filename': filename,
-                'location': location,
                 'csrf_token': csrf_token,
             },
             status=302)
-        assert_session_flash(response,
-            'Successfully committed new file `{}`'.format(
-                os.path.join(location, filename)))
+
+        expected_msg = 'Successfully committed new file `{}`'.format(filename)
+        assert_session_flash(response, expected_msg)
 
     def test_edit_file_view(self, backend):
         response = self.app.get(
@@ -884,8 +883,7 b' class TestModifyFilesWithWebInterface(ob'
                        f_path='vcs/nodes.py'),
             status=302)
         assert_session_flash(
-            response,
-            'You can only edit files with commit being a valid branch')
+            response, 'Cannot modify file. Given commit `tip` is not head of a branch.')
 
     def test_edit_file_view_commit_changes(self, backend, csrf_token):
         repo = backend.create_repo()
@@ -953,8 +951,7 b' class TestModifyFilesWithWebInterface(ob'
                        f_path='vcs/nodes.py'),
             status=302)
         assert_session_flash(
-            response,
-            'You can only delete files with commit being a valid branch')
+            response, 'Cannot modify file. Given commit `tip` is not head of a branch.')
 
     def test_delete_file_view_commit_changes(self, backend, csrf_token):
         repo = backend.create_repo()
@@ -992,7 +989,7 b' class TestFilesViewOtherCases(object):'
         repo_file_add_url = route_path(
             'repo_files_add_file',
             repo_name=repo.repo_name,
-            commit_id=0, f_path='') + '#edit'
+            commit_id=0, f_path='')
 
         assert_session_flash(
             response,
@@ -1009,7 +1006,7 b' class TestFilesViewOtherCases(object):'
         repo_file_add_url = route_path(
             'repo_files_add_file',
             repo_name=repo.repo_name,
-            commit_id=0, f_path='') + '#edit'
+            commit_id=0, f_path='')
 
         response = self.app.get(
             route_path('repo_files',

rhodecode/apps/repository/tests/test_repo_pullrequests.py

@@ -40,6 +40,8 b' def route_path(name, params=None, **kwar'
     base_url = {
         'repo_changelog': '/{repo_name}/changelog',
         'repo_changelog_file': '/{repo_name}/changelog/{commit_id}/{f_path}',
+        'repo_commits': '/{repo_name}/commits',
+        'repo_commits_file': '/{repo_name}/commits/{commit_id}/{f_path}',
         'pullrequest_show': '/{repo_name}/pull-request/{pull_request_id}',
         'pullrequest_show_all': '/{repo_name}/pull-request',
         'pullrequest_show_all_data': '/{repo_name}/pull-request-data',
@@ -998,11 +1000,11 b' class TestPullrequestsView(object):'
         assert len(target_children) == 1
 
         expected_origin_link = route_path(
-            'repo_changelog',
+            'repo_commits',
             repo_name=pull_request.source_repo.scm_instance().name,
             params=dict(branch='origin'))
         expected_target_link = route_path(
-            'repo_changelog',
+            'repo_commits',
             repo_name=pull_request.target_repo.scm_instance().name,
             params=dict(branch='target'))
         assert origin_children[0].attrib['href'] == expected_origin_link

rhodecode/apps/repository/tests/test_repo_summary.py

@@ -350,11 +350,11 b' class TestCreateReferenceData(object):'
             {
                 'children': [
                     {
-                        'id': 'a', 'raw_id': 'a_id', 'text': 'a', 'type': 't1',
+                        'id': 'a', 'idx': 0, 'raw_id': 'a_id', 'text': 'a', 'type': 't1',
                         'files_url': expected_files_url + 'a/?at=a',
                     },
                     {
-                        'id': 'b', 'raw_id': 'b_id', 'text': 'b', 'type': 't1',
+                        'id': 'b', 'idx': 0, 'raw_id': 'b_id', 'text': 'b', 'type': 't1',
                         'files_url': expected_files_url + 'b/?at=b',
                     }
                 ],
@@ -363,7 +363,7 b' class TestCreateReferenceData(object):'
             {
                 'children': [
                     {
-                        'id': 'c', 'raw_id': 'c_id', 'text': 'c', 'type': 't2',
+                        'id': 'c', 'idx': 0, 'raw_id': 'c_id', 'text': 'c', 'type': 't2',
                         'files_url': expected_files_url + 'c/?at=c',
                     }
                 ],
@@ -385,12 +385,12 b' class TestCreateReferenceData(object):'
             {
                 'children': [
                     {
-                        'id': 'a@a_id', 'raw_id': 'a_id',
+                        'id': 'a@a_id', 'idx': 0, 'raw_id': 'a_id',
                         'text': 'a', 'type': 't1',
                         'files_url': expected_files_url + 'a_id/a?at=a',
                     },
                     {
-                        'id': 'b@b_id', 'raw_id': 'b_id',
+                        'id': 'b@b_id', 'idx': 0, 'raw_id': 'b_id',
                         'text': 'b', 'type': 't1',
                         'files_url': expected_files_url + 'b_id/b?at=b',
                     }
@@ -400,7 +400,7 b' class TestCreateReferenceData(object):'
             {
                 'children': [
                     {
-                        'id': 'c@c_id', 'raw_id': 'c_id',
+                        'id': 'c@c_id', 'idx': 0, 'raw_id': 'c_id',
                         'text': 'c', 'type': 't2',
                         'files_url': expected_files_url + 'c_id/c?at=c',
                     }
@@ -516,6 +516,7 b' class TestReferenceItems(object):'
                 'text': ref_name,
                 'id': self._format_function(ref_name, ref_id),
                 'raw_id': ref_id,
+                'idx': 0,
                 'type': self.ref_type,
                 'files_url': self.fake_url
             }

rhodecode/apps/repository/views/repo_changelog.py

@@ -113,7 +113,7 b' class RepoChangelogView(RepoAppView):'
             h.flash('Branch {} is not found.'.format(h.escape(branch_name)),
                     category='warning')
             redirect_url = h.route_path(
-                'repo_changelog_file', repo_name=repo_name,
+                'repo_commits_file', repo_name=repo_name,
                 commit_id=branch_name, f_path=f_path or '')
             raise HTTPFound(redirect_url)
 
@@ -127,13 +127,13 b' class RepoChangelogView(RepoAppView):'
             if f_path:
                 # changelog for file
                 return h.route_path(
-                    'repo_changelog_file',
+                    'repo_commits_file',
                     repo_name=c.rhodecode_db_repo.repo_name,
                     commit_id=commit_id, f_path=f_path,
                     _query=query_params)
             else:
                 return h.route_path(
-                    'repo_changelog',
+                    'repo_commits',
                     repo_name=c.rhodecode_db_repo.repo_name, _query=query_params)
 
         c.total_cs = len(collection)
@@ -171,11 +171,18 b' class RepoChangelogView(RepoAppView):'
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
+        route_name='repo_commits', request_method='GET',
+        renderer='rhodecode:templates/commits/changelog.mako')
+    @view_config(
+        route_name='repo_commits_file', request_method='GET',
+        renderer='rhodecode:templates/commits/changelog.mako')
+    # old routes for backward compat
+    @view_config(
         route_name='repo_changelog', request_method='GET',
-        renderer='rhodecode:templates/changelog/changelog.mako')
+        renderer='rhodecode:templates/commits/changelog.mako')
     @view_config(
         route_name='repo_changelog_file', request_method='GET',
-        renderer='rhodecode:templates/changelog/changelog.mako')
+        renderer='rhodecode:templates/commits/changelog.mako')
     def repo_changelog(self):
         c = self.load_default_context()
 
@@ -224,7 +231,7 b' class RepoChangelogView(RepoAppView):'
                     except RepositoryError as e:
                         h.flash(safe_str(e), category='warning')
                         redirect_url = h.route_path(
-                            'repo_changelog', repo_name=self.db_repo_name)
+                            'repo_commits', repo_name=self.db_repo_name)
                         raise HTTPFound(redirect_url)
                 collection = list(reversed(collection))
             else:
@@ -246,14 +253,14 b' class RepoChangelogView(RepoAppView):'
             log.exception(safe_str(e))
             h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPFound(
-                h.route_path('repo_changelog', repo_name=self.db_repo_name))
+                h.route_path('repo_commits', repo_name=self.db_repo_name))
 
         if partial_xhr or self.request.environ.get('HTTP_X_PJAX'):
             # case when loading dynamic file history in file view
             # loading from ajax, we don't want the first result, it's popped
             # in the code above
             html = render(
-                'rhodecode:templates/changelog/changelog_file_history.mako',
+                'rhodecode:templates/commits/changelog_file_history.mako',
                 self._get_template_context(c), self.request)
             return Response(html)
 
@@ -271,14 +278,14 b' class RepoChangelogView(RepoAppView):'
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
-        route_name='repo_changelog_elements', request_method=('GET', 'POST'),
-        renderer='rhodecode:templates/changelog/changelog_elements.mako',
+        route_name='repo_commits_elements', request_method=('GET', 'POST'),
+        renderer='rhodecode:templates/commits/changelog_elements.mako',
         xhr=True)
     @view_config(
-        route_name='repo_changelog_elements_file', request_method=('GET', 'POST'),
-        renderer='rhodecode:templates/changelog/changelog_elements.mako',
+        route_name='repo_commits_elements_file', request_method=('GET', 'POST'),
+        renderer='rhodecode:templates/commits/changelog_elements.mako',
         xhr=True)
-    def repo_changelog_elements(self):
+    def repo_commits_elements(self):
         c = self.load_default_context()
         commit_id = self.request.matchdict.get('commit_id')
         f_path = self._get_f_path(self.request.matchdict)
@@ -312,7 +319,7 b' class RepoChangelogView(RepoAppView):'
             except (RepositoryError, CommitDoesNotExistError, Exception) as e:
                 log.exception(safe_str(e))
                 raise HTTPFound(
-                    h.route_path('repo_changelog', repo_name=self.db_repo_name))
+                    h.route_path('repo_commits', repo_name=self.db_repo_name))
 
             collection = base_commit.get_path_history(
                 f_path, limit=hist_limit, pre_load=pre_load)

rhodecode/apps/repository/views/repo_commits.py

@@ -105,10 +105,9 b' class RepoCommitsView(RepoAppView):'
 
             c.commit_ranges = commits
             if not c.commit_ranges:
-                raise RepositoryError(
-                    'The commit range returned an empty result')
-        except CommitDoesNotExistError:
-            msg = _('No such commit exists for this repository')
+                raise RepositoryError('The commit range returned an empty result')
+        except CommitDoesNotExistError as e:
+            msg = _('No such commit exists. Org exception: `{}`').format(e)
             h.flash(msg, category='error')
             raise HTTPNotFound()
         except Exception:

rhodecode/apps/repository/views/repo_compare.py

@@ -214,29 +214,23 b' class RepoCompareView(RepoAppView):'
         pre_load = ["author", "branch", "date", "message"]
         c.ancestor = None
 
-        if c.file_path:
-            if source_commit == target_commit:
-                c.commit_ranges = []
-            else:
-                c.commit_ranges = [target_commit]
-        else:
-            try:
-                c.commit_ranges = source_scm.compare(
-                    source_commit.raw_id, target_commit.raw_id,
-                    target_scm, merge, pre_load=pre_load)
-                if merge:
-                    c.ancestor = source_scm.get_common_ancestor(
-                        source_commit.raw_id, target_commit.raw_id, target_scm)
-            except RepositoryRequirementError:
-                msg = _('Could not compare repos with different '
-                        'large file settings')
-                log.error(msg)
-                if partial:
-                    return Response(msg)
-                h.flash(msg, category='error')
-                raise HTTPFound(
-                    h.route_path('repo_compare_select',
-                                 repo_name=self.db_repo_name))
+        try:
+            c.commit_ranges = source_scm.compare(
+                source_commit.raw_id, target_commit.raw_id,
+                target_scm, merge, pre_load=pre_load) or []
+            if merge:
+                c.ancestor = source_scm.get_common_ancestor(
+                    source_commit.raw_id, target_commit.raw_id, target_scm)
+        except RepositoryRequirementError:
+            msg = _('Could not compare repos with different '
+                    'large file settings')
+            log.error(msg)
+            if partial:
+                return Response(msg)
+            h.flash(msg, category='error')
+            raise HTTPFound(
+                h.route_path('repo_compare_select',
+                             repo_name=self.db_repo_name))
 
         c.statuses = self.db_repo.statuses(
             [x.raw_id for x in c.commit_ranges])

rhodecode/apps/repository/views/repo_files.py

@@ -25,6 +25,7 b' import shutil'
 import tempfile
 import collections
 import urllib
+import pathlib2
 
 from pyramid.httpexceptions import HTTPNotFound, HTTPBadRequest, HTTPFound
 from pyramid.view import view_config
@@ -42,7 +43,7 b' from rhodecode.lib.exceptions import Non'
 from rhodecode.lib.codeblocks import (
     filenode_as_lines_tokens, filenode_as_annotated_lines_tokens)
 from rhodecode.lib.utils2 import (
-    convert_line_endings, detect_mode, safe_str, str2bool, safe_int)
+    convert_line_endings, detect_mode, safe_str, str2bool, safe_int, sha1, safe_unicode)
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
 from rhodecode.lib.vcs import path as vcspath
@@ -87,7 +88,7 b' class RepoFilesView(RepoAppView):'
         c.enable_downloads = self.db_repo.enable_downloads
         return c
 
-    def _ensure_not_locked(self):
+    def _ensure_not_locked(self, commit_id='tip'):
         _ = self.request.translate
 
         repo = self.db_repo
@@ -98,21 +99,41 b' class RepoFilesView(RepoAppView):'
                     'warning')
             files_url = h.route_path(
                 'repo_files:default_path',
-                repo_name=self.db_repo_name, commit_id='tip')
+                repo_name=self.db_repo_name, commit_id=commit_id)
             raise HTTPFound(files_url)
 
-    def check_branch_permission(self, branch_name):
+    def forbid_non_head(self, is_head, f_path, commit_id='tip', json_mode=False):
+        _ = self.request.translate
+
+        if not is_head:
+            message = _('Cannot modify file. '
+                        'Given commit `{}` is not head of a branch.').format(commit_id)
+            h.flash(message, category='warning')
+
+            if json_mode:
+                return message
+
+            files_url = h.route_path(
+                'repo_files', repo_name=self.db_repo_name, commit_id=commit_id,
+                f_path=f_path)
+            raise HTTPFound(files_url)
+
+    def check_branch_permission(self, branch_name, commit_id='tip', json_mode=False):
         _ = self.request.translate
 
         rule, branch_perm = self._rhodecode_user.get_rule_and_branch_permission(
             self.db_repo_name, branch_name)
         if branch_perm and branch_perm not in ['branch.push', 'branch.push_force']:
-            h.flash(
-                _('Branch `{}` changes forbidden by rule {}.').format(branch_name, rule),
-                'warning')
+            message = _('Branch `{}` changes forbidden by rule {}.').format(
+                branch_name, rule)
+            h.flash(message, 'warning')
+
+            if json_mode:
+                return message
+
             files_url = h.route_path(
-                'repo_files:default_path',
-                repo_name=self.db_repo_name, commit_id='tip')
+                'repo_files:default_path', repo_name=self.db_repo_name, commit_id=commit_id)
+
             raise HTTPFound(files_url)
 
     def _get_commit_and_path(self):
@@ -146,8 +167,7 b' class RepoFilesView(RepoAppView):'
 
             _url = h.route_path(
                 'repo_files_add_file',
-                repo_name=self.db_repo_name, commit_id=0, f_path='',
-                _anchor='edit')
+                repo_name=self.db_repo_name, commit_id=0, f_path='')
 
             if h.HasRepoPermissionAny(
                     'repository.write', 'repository.admin')(self.db_repo_name):
@@ -185,8 +205,7 b' class RepoFilesView(RepoAppView):'
             h.flash(_('No such commit exists for this repository'), category='error')
             raise HTTPNotFound()
         except RepositoryError as e:
-            log.warning('Repository error while fetching '
-                        'filenode `%s`. Err:%s', path, e)
+            log.warning('Repository error while fetching filenode `%s`. Err:%s', path, e)
             h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPNotFound()
 
@@ -195,12 +214,7 b' class RepoFilesView(RepoAppView):'
     def _is_valid_head(self, commit_id, repo):
         branch_name = sha_commit_id = ''
         is_head = False
-
-        if h.is_svn(repo) and not repo.is_empty():
-            # Note: Subversion only has one head.
-            if commit_id == repo.get_commit(commit_idx=-1).raw_id:
-                is_head = True
-                return branch_name, sha_commit_id, is_head
+        log.debug('Checking if commit_id `%s` is a head for %s.', commit_id, repo)
 
         for _branch_name, branch_commit_id in repo.branches.items():
             # simple case we pass in branch name, it's a HEAD
@@ -216,8 +230,14 b' class RepoFilesView(RepoAppView):'
                 sha_commit_id = branch_commit_id
                 break
 
+        if h.is_svn(repo) and not repo.is_empty():
+            # Note: Subversion only has one head.
+            if commit_id == repo.get_commit(commit_idx=-1).raw_id:
+                is_head = True
+                return branch_name, sha_commit_id, is_head
+
         # checked branches, means we only need to try to get the branch/commit_sha
-        if not repo.is_empty:
+        if not repo.is_empty():
             commit = repo.get_commit(commit_id=commit_id)
             if commit:
                 branch_name = commit.branch
@@ -225,8 +245,7 b' class RepoFilesView(RepoAppView):'
 
         return branch_name, sha_commit_id, is_head
 
-    def _get_tree_at_commit(
-            self, c, commit_id, f_path, full_load=False):
+    def _get_tree_at_commit(self, c, commit_id, f_path, full_load=False):
 
         repo_id = self.db_repo.repo_id
         force_recache = self.get_recache_flag()
@@ -244,16 +263,16 b' class RepoFilesView(RepoAppView):'
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
                                                condition=cache_on)
-        def compute_file_tree(repo_id, commit_id, f_path, full_load):
-            log.debug('Generating cached file tree for repo_id: %s, %s, %s',
-                      repo_id, commit_id, f_path)
+        def compute_file_tree(ver, repo_id, commit_id, f_path, full_load):
+            log.debug('Generating cached file tree at ver:%s for repo_id: %s, %s, %s',
+                      ver, repo_id, commit_id, f_path)
 
             c.full_load = full_load
             return render(
                 'rhodecode:templates/files/files_browser_tree.mako',
                 self._get_template_context(c), self.request)
 
-        return compute_file_tree(self.db_repo.repo_id, commit_id, f_path, full_load)
+        return compute_file_tree('v1', self.db_repo.repo_id, commit_id, f_path, full_load)
 
     def _get_archive_spec(self, fname):
         log.debug('Detecting archive spec for: `%s`', fname)
@@ -261,8 +280,7 b' class RepoFilesView(RepoAppView):'
         fileformat = None
         ext = None
         content_type = None
-        for a_type, ext_data in settings.ARCHIVE_SPECS.items():
-            content_type, extension = ext_data
+        for a_type, content_type, extension in settings.ARCHIVE_SPECS:
 
             if fname.endswith(extension):
                 fileformat = a_type
@@ -278,6 +296,15 b' class RepoFilesView(RepoAppView):'
 
         return commit_id, ext, fileformat, content_type
 
+    def create_pure_path(self, *parts):
+        # Split paths and sanitize them, removing any ../ etc
+        sanitized_path = [
+            x for x in pathlib2.PurePath(*parts).parts
+            if x not in ['.', '..']]
+
+        pure_path = pathlib2.PurePath(*sanitized_path)
+        return pure_path
+
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
@@ -289,9 +316,10 b' class RepoFilesView(RepoAppView):'
         from rhodecode import CONFIG
         _ = self.request.translate
         self.load_default_context()
-
+        default_at_path = '/'
         fname = self.request.matchdict['fname']
         subrepos = self.request.GET.get('subrepos') == 'true'
+        at_path = self.request.GET.get('at_path') or default_at_path
 
         if not self.db_repo.enable_downloads:
             return Response(_('Downloads disabled'))
@@ -311,10 +339,31 b' class RepoFilesView(RepoAppView):'
         except EmptyRepositoryError:
             return Response(_('Empty repository'))
 
-        archive_name = '%s-%s%s%s' % (
-            safe_str(self.db_repo_name.replace('/', '_')),
-            '-sub' if subrepos else '',
-            safe_str(commit.short_id), ext)
+        try:
+            at_path = commit.get_node(at_path).path or default_at_path
+        except Exception:
+            return Response(_('No node at path {} for this repository').format(at_path))
+
+        path_sha = sha1(at_path)[:8]
+
+        # original backward compat name of archive
+        clean_name = safe_str(self.db_repo_name.replace('/', '_'))
+        short_sha = safe_str(commit.short_id)
+
+        if at_path == default_at_path:
+            archive_name = '{}-{}{}{}'.format(
+                clean_name,
+                '-sub' if subrepos else '',
+                short_sha,
+                ext)
+        # custom path and new name
+        else:
+            archive_name = '{}-{}{}-{}{}'.format(
+                clean_name,
+                '-sub' if subrepos else '',
+                short_sha,
+                path_sha,
+                ext)
 
         use_cached_archive = False
         archive_cache_enabled = CONFIG.get(
@@ -339,7 +388,8 b' class RepoFilesView(RepoAppView):'
             fd, archive = tempfile.mkstemp()
             log.debug('Creating new temp archive in %s', archive)
             try:
-                commit.archive_repo(archive, kind=fileformat, subrepos=subrepos)
+                commit.archive_repo(archive, kind=fileformat, subrepos=subrepos,
+                                    archive_at_path=at_path)
             except ImproperArchiveTypeError:
                 return _('Unknown archive type')
             if archive_cache_enabled:
@@ -632,8 +682,7 b' class RepoFilesView(RepoAppView):'
                 c.authors = []
                 # this loads a simple tree without metadata to speed things up
                 # later via ajax we call repo_nodetree_full and fetch whole
-                c.file_tree = self._get_tree_at_commit(
-                    c, c.commit.raw_id, f_path)
+                c.file_tree = self._get_tree_at_commit(c, c.commit.raw_id, f_path)
 
         except RepositoryError as e:
             h.flash(safe_str(h.escape(e)), category='error')
@@ -875,18 +924,17 b' class RepoFilesView(RepoAppView):'
             self.db_repo_name, self.db_repo.repo_id, commit.raw_id, f_path)
         return {'nodes': metadata}
 
-    def _create_references(
-            self, branches_or_tags, symbolic_reference, f_path):
+    def _create_references(self, branches_or_tags, symbolic_reference, f_path, ref_type):
         items = []
         for name, commit_id in branches_or_tags.items():
-            sym_ref = symbolic_reference(commit_id, name, f_path)
-            items.append((sym_ref, name))
+            sym_ref = symbolic_reference(commit_id, name, f_path, ref_type)
+            items.append((sym_ref, name, ref_type))
         return items
 
-    def _symbolic_reference(self, commit_id, name, f_path):
+    def _symbolic_reference(self, commit_id, name, f_path, ref_type):
         return commit_id
 
-    def _symbolic_reference_svn(self, commit_id, name, f_path):
+    def _symbolic_reference_svn(self, commit_id, name, f_path, ref_type):
         new_f_path = vcspath.join(name, f_path)
         return u'%s@%s' % (new_f_path, commit_id)
 
@@ -916,7 +964,7 b' class RepoFilesView(RepoAppView):'
         for commit in commits:
             branch = ' (%s)' % commit.branch if commit.branch else ''
             n_desc = 'r%s:%s%s' % (commit.idx, commit.short_id, branch)
-            commits_group[0].append((commit.raw_id, n_desc,))
+            commits_group[0].append((commit.raw_id, n_desc, 'sha'))
         history.append(commits_group)
 
         symbolic_reference = self._symbolic_reference
@@ -932,11 +980,11 b' class RepoFilesView(RepoAppView):'
                 symbolic_reference = self._symbolic_reference_svn
 
         branches = self._create_references(
-            self.rhodecode_vcs_repo.branches, symbolic_reference, f_path)
+            self.rhodecode_vcs_repo.branches, symbolic_reference, f_path, 'branch')
         branches_group = (branches, _("Branches"))
 
         tags = self._create_references(
-            self.rhodecode_vcs_repo.tags, symbolic_reference, f_path)
+            self.rhodecode_vcs_repo.tags, symbolic_reference, f_path, 'tag')
         tags_group = (tags, _("Tags"))
 
         history.append(branches_group)
@@ -964,7 +1012,7 b' class RepoFilesView(RepoAppView):'
             for obj in file_history:
                 res.append({
                     'text': obj[1],
-                    'children': [{'id': o[0], 'text': o[1]} for o in obj[0]]
+                    'children': [{'id': o[0], 'text': o[1], 'type': o[2]} for o in obj[0]]
                 })
 
             data = {
@@ -1035,15 +1083,9 b' class RepoFilesView(RepoAppView):'
         _branch_name, _sha_commit_id, is_head = \
             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        if not is_head:
-            h.flash(_('You can only delete files with commit '
-                      'being a valid branch head.'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name, commit_id='tip',
-                             f_path=f_path))
+        self.forbid_non_head(is_head, f_path)
+        self.check_branch_permission(_branch_name)
 
-        self.check_branch_permission(_branch_name)
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
@@ -1069,13 +1111,7 b' class RepoFilesView(RepoAppView):'
         _branch_name, _sha_commit_id, is_head = \
             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        if not is_head:
-            h.flash(_('You can only delete files with commit '
-                      'being a valid branch head.'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name, commit_id='tip',
-                             f_path=f_path))
+        self.forbid_non_head(is_head, f_path)
         self.check_branch_permission(_branch_name)
 
         c.commit = self._get_commit_or_redirect(commit_id)
@@ -1125,14 +1161,8 b' class RepoFilesView(RepoAppView):'
         _branch_name, _sha_commit_id, is_head = \
             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        if not is_head:
-            h.flash(_('You can only edit files with commit '
-                      'being a valid branch head.'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name, commit_id='tip',
-                             f_path=f_path))
-        self.check_branch_permission(_branch_name)
+        self.forbid_non_head(is_head, f_path, commit_id=commit_id)
+        self.check_branch_permission(_branch_name, commit_id=commit_id)
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
@@ -1144,8 +1174,7 b' class RepoFilesView(RepoAppView):'
                 commit_id=c.commit.raw_id, f_path=f_path)
             raise HTTPFound(files_url)
 
-        c.default_message = _(
-            'Edited file {} via RhodeCode Enterprise').format(f_path)
+        c.default_message = _('Edited file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
 
         return self._get_template_context(c)
@@ -1162,32 +1191,23 b' class RepoFilesView(RepoAppView):'
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
-        _branch_name, _sha_commit_id, is_head = \
-            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
-
-        if not is_head:
-            h.flash(_('You can only edit files with commit '
-                      'being a valid branch head.'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name, commit_id='tip',
-                             f_path=f_path))
-
-        self.check_branch_permission(_branch_name)
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
         if c.file.is_binary:
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name,
-                             commit_id=c.commit.raw_id,
-                             f_path=f_path))
+            raise HTTPFound(h.route_path('repo_files', repo_name=self.db_repo_name,
+                                         commit_id=c.commit.raw_id, f_path=f_path))
+
+        _branch_name, _sha_commit_id, is_head = \
+            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        c.default_message = _(
-            'Edited file {} via RhodeCode Enterprise').format(f_path)
+        self.forbid_non_head(is_head, f_path, commit_id=commit_id)
+        self.check_branch_permission(_branch_name, commit_id=commit_id)
+
+        c.default_message = _('Edited file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
+
         old_content = c.file.content
         sl = old_content.splitlines(1)
         first_line = sl[0] if sl else ''
@@ -1198,20 +1218,25 b' class RepoFilesView(RepoAppView):'
         content = convert_line_endings(r_post.get('content', ''), line_ending_mode)
 
         message = r_post.get('message') or c.default_message
-        org_f_path = c.file.unicode_path
+        org_node_path = c.file.unicode_path
         filename = r_post['filename']
-        org_filename = c.file.name
+
+        root_path = c.file.dir_path
+        pure_path = self.create_pure_path(root_path, filename)
+        node_path = safe_unicode(bytes(pure_path))
 
-        if content == old_content and filename == org_filename:
-            h.flash(_('No changes'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_commit', repo_name=self.db_repo_name,
-                             commit_id='tip'))
+        default_redirect_url = h.route_path('repo_commit', repo_name=self.db_repo_name,
+                                            commit_id=commit_id)
+        if content == old_content and node_path == org_node_path:
+            h.flash(_('No changes detected on {}').format(org_node_path),
+                    category='warning')
+            raise HTTPFound(default_redirect_url)
+
         try:
             mapping = {
-                org_f_path: {
-                    'org_filename': org_f_path,
-                    'filename': os.path.join(c.file.dir_path, filename),
+                org_node_path: {
+                    'org_filename': org_node_path,
+                    'filename': node_path,
                     'content': content,
                     'lexer': '',
                     'op': 'mod',
@@ -1219,7 +1244,7 b' class RepoFilesView(RepoAppView):'
                 }
             }
 
-            ScmModel().update_nodes(
+            commit = ScmModel().update_nodes(
                 user=self._rhodecode_db_user.user_id,
                 repo=self.db_repo,
                 message=message,
@@ -1227,21 +1252,25 b' class RepoFilesView(RepoAppView):'
                 parent_commit=c.commit,
             )
 
-            h.flash(
-                _('Successfully committed changes to file `{}`').format(
+            h.flash(_('Successfully committed changes to file `{}`').format(
                     h.escape(f_path)), category='success')
+            default_redirect_url = h.route_path(
+                'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
+
         except Exception:
             log.exception('Error occurred during commit')
             h.flash(_('Error occurred during commit'), category='error')
-        raise HTTPFound(
-            h.route_path('repo_commit', repo_name=self.db_repo_name,
-                         commit_id='tip'))
+
+        raise HTTPFound(default_redirect_url)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_add_file', request_method='GET',
         renderer='rhodecode:templates/files/files_add.mako')
+    @view_config(
+        route_name='repo_files_upload_file', request_method='GET',
+        renderer='rhodecode:templates/files/files_upload.mako')
     def repo_files_add_file(self):
         _ = self.request.translate
         c = self.load_default_context()
@@ -1252,27 +1281,20 b' class RepoFilesView(RepoAppView):'
         c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
         if c.commit is None:
             c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
-        c.default_message = (_('Added file via RhodeCode Enterprise'))
-        c.f_path = f_path.lstrip('/')  # ensure not relative path
 
-        if self.rhodecode_vcs_repo.is_empty:
+        if self.rhodecode_vcs_repo.is_empty():
             # for empty repository we cannot check for current branch, we rely on
             # c.commit.branch instead
-            _branch_name = c.commit.branch
-            is_head = True
+            _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
         else:
             _branch_name, _sha_commit_id, is_head = \
                 self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        if not is_head:
-            h.flash(_('You can only add files with commit '
-                      'being a valid branch head.'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name, commit_id='tip',
-                             f_path=f_path))
+        self.forbid_non_head(is_head, f_path, commit_id=commit_id)
+        self.check_branch_permission(_branch_name, commit_id=commit_id)
 
-        self.check_branch_permission(_branch_name)
+        c.default_message = (_('Added file via RhodeCode Enterprise'))
+        c.f_path = f_path.lstrip('/')  # ensure not relative path
 
         return self._get_template_context(c)
 
@@ -1289,86 +1311,62 b' class RepoFilesView(RepoAppView):'
 
         self._ensure_not_locked()
 
-        r_post = self.request.POST
-
-        c.commit = self._get_commit_or_redirect(
-            commit_id, redirect_after=False)
+        c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
         if c.commit is None:
             c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
 
-        if self.rhodecode_vcs_repo.is_empty:
-            # for empty repository we cannot check for current branch, we rely on
-            # c.commit.branch instead
-            _branch_name = c.commit.branch
-            is_head = True
-        else:
-            _branch_name, _sha_commit_id, is_head = \
-                self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
-
-        if not is_head:
-            h.flash(_('You can only add files with commit '
-                      'being a valid branch head.'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name, commit_id='tip',
-                             f_path=f_path))
-
-        self.check_branch_permission(_branch_name)
-
-        c.default_message = (_('Added file via RhodeCode Enterprise'))
-        c.f_path = f_path
-        unix_mode = 0
-        content = convert_line_endings(r_post.get('content', ''), unix_mode)
-
-        message = r_post.get('message') or c.default_message
-        filename = r_post.get('filename')
-        location = r_post.get('location', '')  # dir location
-        file_obj = r_post.get('upload_file', None)
-
-        if file_obj is not None and hasattr(file_obj, 'filename'):
-            filename = r_post.get('filename_upload')
-            content = file_obj.file
-
-            if hasattr(content, 'file'):
-                # non posix systems store real file under file attr
-                content = content.file
-
-        if self.rhodecode_vcs_repo.is_empty:
+        # calculate redirect URL
+        if self.rhodecode_vcs_repo.is_empty():
             default_redirect_url = h.route_path(
                 'repo_summary', repo_name=self.db_repo_name)
         else:
             default_redirect_url = h.route_path(
                 'repo_commit', repo_name=self.db_repo_name, commit_id='tip')
 
-        # If there's no commit, redirect to repo summary
-        if type(c.commit) is EmptyCommit:
-            redirect_url = h.route_path(
-                'repo_summary', repo_name=self.db_repo_name)
+        if self.rhodecode_vcs_repo.is_empty():
+            # for empty repository we cannot check for current branch, we rely on
+            # c.commit.branch instead
+            _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
         else:
-            redirect_url = default_redirect_url
+            _branch_name, _sha_commit_id, is_head = \
+                self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+
+        self.forbid_non_head(is_head, f_path, commit_id=commit_id)
+        self.check_branch_permission(_branch_name, commit_id=commit_id)
+
+        c.default_message = (_('Added file via RhodeCode Enterprise'))
+        c.f_path = f_path
+
+        r_post = self.request.POST
+        message = r_post.get('message') or c.default_message
+        filename = r_post.get('filename')
+        unix_mode = 0
+        content = convert_line_endings(r_post.get('content', ''), unix_mode)
 
         if not filename:
-            h.flash(_('No filename'), category='warning')
+            # If there's no commit, redirect to repo summary
+            if type(c.commit) is EmptyCommit:
+                redirect_url = h.route_path(
+                    'repo_summary', repo_name=self.db_repo_name)
+            else:
+                redirect_url = default_redirect_url
+            h.flash(_('No filename specified'), category='warning')
             raise HTTPFound(redirect_url)
 
-        # extract the location from filename,
-        # allows using foo/bar.txt syntax to create subdirectories
-        subdir_loc = filename.rsplit('/', 1)
-        if len(subdir_loc) == 2:
-            location = os.path.join(location, subdir_loc[0])
+        root_path = f_path
+        pure_path = self.create_pure_path(root_path, filename)
+        node_path = safe_unicode(bytes(pure_path).lstrip('/'))
 
-        # strip all crap out of file, just leave the basename
-        filename = os.path.basename(filename)
-        node_path = os.path.join(location, filename)
         author = self._rhodecode_db_user.full_contact
+        nodes = {
+            node_path: {
+                'content': content
+            }
+        }
 
         try:
-            nodes = {
-                node_path: {
-                    'content': content
-                }
-            }
-            ScmModel().create_nodes(
+
+            commit = ScmModel().create_nodes(
                 user=self._rhodecode_db_user.user_id,
                 repo=self.db_repo,
                 message=message,
@@ -1377,14 +1375,16 b' class RepoFilesView(RepoAppView):'
                 author=author,
             )
 
-            h.flash(
-                _('Successfully committed new file `{}`').format(
+            h.flash(_('Successfully committed new file `{}`').format(
                     h.escape(node_path)), category='success')
+
+            default_redirect_url = h.route_path(
+                'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
+
         except NonRelativePathError:
             log.exception('Non Relative path found')
-            h.flash(_(
-                'The location specified must be a relative path and must not '
-                'contain .. in the path'), category='warning')
+            h.flash(_('The location specified must be a relative path and must not '
+                      'contain .. in the path'), category='warning')
             raise HTTPFound(default_redirect_url)
         except (NodeError, NodeAlreadyExistsError) as e:
             h.flash(_(h.escape(e)), category='error')
@@ -1393,3 +1393,134 b' class RepoFilesView(RepoAppView):'
             h.flash(_('Error occurred during commit'), category='error')
 
         raise HTTPFound(default_redirect_url)
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='repo_files_upload_file', request_method='POST',
+        renderer='json_ext')
+    def repo_files_upload_file(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        commit_id, f_path = self._get_commit_and_path()
+
+        self._ensure_not_locked()
+
+        c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
+        if c.commit is None:
+            c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
+
+        # calculate redirect URL
+        if self.rhodecode_vcs_repo.is_empty():
+            default_redirect_url = h.route_path(
+                'repo_summary', repo_name=self.db_repo_name)
+        else:
+            default_redirect_url = h.route_path(
+                'repo_commit', repo_name=self.db_repo_name, commit_id='tip')
+
+        if self.rhodecode_vcs_repo.is_empty():
+            # for empty repository we cannot check for current branch, we rely on
+            # c.commit.branch instead
+            _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
+        else:
+            _branch_name, _sha_commit_id, is_head = \
+                self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+
+        error = self.forbid_non_head(is_head, f_path, json_mode=True)
+        if error:
+            return {
+                'error': error,
+                'redirect_url': default_redirect_url
+            }
+        error = self.check_branch_permission(_branch_name, json_mode=True)
+        if error:
+            return {
+                'error': error,
+                'redirect_url': default_redirect_url
+            }
+
+        c.default_message = (_('Uploaded file via RhodeCode Enterprise'))
+        c.f_path = f_path
+
+        r_post = self.request.POST
+
+        message = c.default_message
+        user_message = r_post.getall('message')
+        if isinstance(user_message, list) and user_message:
+            # we take the first from duplicated results if it's not empty
+            message = user_message[0] if user_message[0] else message
+
+        nodes = {}
+
+        for file_obj in r_post.getall('files_upload') or []:
+            content = file_obj.file
+            filename = file_obj.filename
+
+            root_path = f_path
+            pure_path = self.create_pure_path(root_path, filename)
+            node_path = safe_unicode(bytes(pure_path).lstrip('/'))
+
+            nodes[node_path] = {
+                'content': content
+            }
+
+        if not nodes:
+            error = 'missing files'
+            return {
+                'error': error,
+                'redirect_url': default_redirect_url
+            }
+
+        author = self._rhodecode_db_user.full_contact
+
+        try:
+            commit = ScmModel().create_nodes(
+                user=self._rhodecode_db_user.user_id,
+                repo=self.db_repo,
+                message=message,
+                nodes=nodes,
+                parent_commit=c.commit,
+                author=author,
+            )
+            if len(nodes) == 1:
+                flash_message = _('Successfully committed {} new files').format(len(nodes))
+            else:
+                flash_message = _('Successfully committed 1 new file')
+
+            h.flash(flash_message, category='success')
+
+            default_redirect_url = h.route_path(
+                'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
+
+        except NonRelativePathError:
+            log.exception('Non Relative path found')
+            error = _('The location specified must be a relative path and must not '
+                      'contain .. in the path')
+            h.flash(error, category='warning')
+
+            return {
+                'error': error,
+                'redirect_url': default_redirect_url
+            }
+        except (NodeError, NodeAlreadyExistsError) as e:
+            error = h.escape(e)
+            h.flash(error, category='error')
+
+            return {
+                'error': error,
+                'redirect_url': default_redirect_url
+            }
+        except Exception:
+            log.exception('Error occurred during commit')
+            error = _('Error occurred during commit')
+            h.flash(error, category='error')
+            return {
+                'error': error,
+                'redirect_url': default_redirect_url
+            }
+
+        return {
+            'error': None,
+            'redirect_url': default_redirect_url
+        }

rhodecode/apps/repository/views/repo_summary.py

@@ -72,6 +72,7 b' class RepoSummaryView(RepoAppView):'
                 log.debug("Searching for a README file.")
                 readme_node = ReadmeFinder(_renderer_type).search(commit)
             if readme_node:
+                log.debug('Found README node: %s', readme_node)
                 relative_urls = {
                     'raw': h.route_path(
                         'repo_file_raw', repo_name=_repo_name,
@@ -82,7 +83,8 b' class RepoSummaryView(RepoAppView):'
                 }
                 readme_data = self._render_readme_or_none(
                     commit, readme_node, relative_urls)
-                readme_filename = readme_node.path
+                readme_filename = readme_node.unicode_path
+
             return readme_data, readme_filename
 
         inv_context_manager = rc_cache.InvalidationContext(
@@ -152,6 +154,26 b' class RepoSummaryView(RepoAppView):'
         c.comments = self.db_repo.get_comments(page_ids)
         c.statuses = self.db_repo.statuses(page_ids)
 
+    def _prepare_and_set_clone_url(self, c):
+        username = ''
+        if self._rhodecode_user.username != User.DEFAULT_USER:
+            username = safe_str(self._rhodecode_user.username)
+
+        _def_clone_uri = _def_clone_uri_id = c.clone_uri_tmpl
+        _def_clone_uri_ssh = c.clone_uri_ssh_tmpl
+
+        if '{repo}' in _def_clone_uri:
+            _def_clone_uri_id = _def_clone_uri.replace('{repo}', '_{repoid}')
+        elif '{repoid}' in _def_clone_uri:
+            _def_clone_uri_id = _def_clone_uri.replace('_{repoid}', '{repo}')
+
+        c.clone_repo_url = self.db_repo.clone_url(
+            user=username, uri_tmpl=_def_clone_uri)
+        c.clone_repo_url_id = self.db_repo.clone_url(
+            user=username, uri_tmpl=_def_clone_uri_id)
+        c.clone_repo_url_ssh = self.db_repo.clone_url(
+            uri_tmpl=_def_clone_uri_ssh, ssh=True)
+
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
@@ -160,6 +182,7 b' class RepoSummaryView(RepoAppView):'
         renderer='rhodecode:templates/summary/summary_commits.mako')
     def summary_commits(self):
         c = self.load_default_context()
+        self._prepare_and_set_clone_url(c)
         self._load_commits_context(c)
         return self._get_template_context(c)
 
@@ -179,26 +202,11 b' class RepoSummaryView(RepoAppView):'
         c = self.load_default_context()
 
         # Prepare the clone URL
-        username = ''
-        if self._rhodecode_user.username != User.DEFAULT_USER:
-            username = safe_str(self._rhodecode_user.username)
-
-        _def_clone_uri = _def_clone_uri_id = c.clone_uri_tmpl
-        _def_clone_uri_ssh = c.clone_uri_ssh_tmpl
+        self._prepare_and_set_clone_url(c)
 
-        if '{repo}' in _def_clone_uri:
-            _def_clone_uri_id = _def_clone_uri.replace(
-                '{repo}', '_{repoid}')
-        elif '{repoid}' in _def_clone_uri:
-            _def_clone_uri_id = _def_clone_uri.replace(
-                '_{repoid}', '{repo}')
-
-        c.clone_repo_url = self.db_repo.clone_url(
-            user=username, uri_tmpl=_def_clone_uri)
-        c.clone_repo_url_id = self.db_repo.clone_url(
-            user=username, uri_tmpl=_def_clone_uri_id)
-        c.clone_repo_url_ssh = self.db_repo.clone_url(
-            uri_tmpl=_def_clone_uri_ssh, ssh=True)
+        # update every 5 min
+        if self.db_repo.last_commit_cache_update_diff > 60 * 5:
+            self.db_repo.update_commit_cache()
 
         # If enabled, get statistics data
 
@@ -231,8 +239,6 b' class RepoSummaryView(RepoAppView):'
         c.enable_downloads = self.db_repo.enable_downloads
         c.repository_followers = scm_model.get_followers(self.db_repo)
         c.repository_forks = scm_model.get_forks(self.db_repo)
-        c.repository_is_user_following = scm_model.is_following_repo(
-            self.db_repo_name, self._rhodecode_user.user_id)
 
         # first interaction with the VCS instance after here...
         if c.repository_requirements_missing:
@@ -317,8 +323,7 b' class RepoSummaryView(RepoAppView):'
             (_("Tag"), repo.tags, 'tag'),
             (_("Bookmark"), repo.bookmarks, 'book'),
         ]
-        res = self._create_reference_data(
-            repo, self.db_repo_name, refs_to_create)
+        res = self._create_reference_data(repo, self.db_repo_name, refs_to_create)
         data = {
             'more': False,
             'results': res
@@ -365,8 +370,7 b' class RepoSummaryView(RepoAppView):'
                 })
         return result
 
-    def _create_reference_items(self, repo, full_repo_name, refs, ref_type,
-                                format_ref_id):
+    def _create_reference_items(self, repo, full_repo_name, refs, ref_type, format_ref_id):
         result = []
         is_svn = h.is_svn(repo)
         for ref_name, raw_id in refs.iteritems():
@@ -378,6 +382,7 b' class RepoSummaryView(RepoAppView):'
                 'raw_id': raw_id,
                 'type': ref_type,
                 'files_url': files_url,
+                'idx': 0,
             })
         return result
 

rhodecode/apps/ssh_support/lib/backends/hg.py

@@ -20,12 +20,13 b''
 
 import os
 import sys
-import shutil
 import logging
 import tempfile
 import textwrap
-
+import collections
 from .base import VcsServer
+from rhodecode.model.db import RhodeCodeUi
+from rhodecode.model.settings import VcsSettingsModel
 
 log = logging.getLogger(__name__)
 
@@ -37,62 +38,46 b' class MercurialTunnelWrapper(object):'
         self.server = server
         self.stdin = sys.stdin
         self.stdout = sys.stdout
-        self.svn_conf_fd, self.svn_conf_path = tempfile.mkstemp()
-        self.hooks_env_fd, self.hooks_env_path = tempfile.mkstemp()
+        self.hooks_env_fd, self.hooks_env_path = tempfile.mkstemp(prefix='hgrc_rhodecode_')
 
     def create_hooks_env(self):
+        repo_name = self.server.repo_name
+        hg_flags = self.server.config_to_hgrc(repo_name)
 
         content = textwrap.dedent(
             '''
-            # SSH hooks version=1.0.0
-            [hooks]
-            pretxnchangegroup.ssh_auth=python:vcsserver.hooks.pre_push_ssh_auth
-            pretxnchangegroup.ssh=python:vcsserver.hooks.pre_push_ssh
-            changegroup.ssh=python:vcsserver.hooks.post_push_ssh
-            
-            preoutgoing.ssh=python:vcsserver.hooks.pre_pull_ssh
-            outgoing.ssh=python:vcsserver.hooks.post_pull_ssh
+            # RhodeCode SSH hooks version=2.0.0
+            {custom}
+            '''
+        ).format(custom='\n'.join(hg_flags))
 
-            '''
-        )
+        root = self.server.get_root_store()
+        hgrc_custom = os.path.join(root, repo_name, '.hg', 'hgrc_rhodecode')
+        hgrc_main = os.path.join(root, repo_name, '.hg', 'hgrc')
 
+        # cleanup custom hgrc file
+        if os.path.isfile(hgrc_custom):
+            with open(hgrc_custom, 'wb') as f:
+                f.write('')
+            log.debug('Cleanup custom hgrc file under %s', hgrc_custom)
+
+        # write temp
         with os.fdopen(self.hooks_env_fd, 'w') as hooks_env_file:
             hooks_env_file.write(content)
-        root = self.server.get_root_store()
 
-        hgrc_custom = os.path.join(
-            root, self.server.repo_name, '.hg', 'hgrc_rhodecode')
-        log.debug('Wrote custom hgrc file under %s', hgrc_custom)
-        shutil.move(
-            self.hooks_env_path, hgrc_custom)
-
-        hgrc_main = os.path.join(
-            root, self.server.repo_name, '.hg', 'hgrc')
-        include_marker = '%include hgrc_rhodecode'
+        return self.hooks_env_path
 
-        if not os.path.isfile(hgrc_main):
-            os.mknod(hgrc_main)
-
-        with open(hgrc_main, 'rb') as f:
-            data = f.read()
-            has_marker = include_marker in data
+    def remove_configs(self):
+        os.remove(self.hooks_env_path)
 
-        if not has_marker:
-            log.debug('Adding include marker for hooks')
-            with open(hgrc_main, 'wa') as f:
-                f.write(textwrap.dedent('''
-                # added by RhodeCode
-                {}
-                '''.format(include_marker)))
-
-    def command(self):
+    def command(self, hgrc_path):
         root = self.server.get_root_store()
 
         command = (
-            "cd {root}; {hg_path} -R {root}{repo_name} "
+            "cd {root}; HGRCPATH={hgrc} {hg_path} -R {root}{repo_name} "
             "serve --stdio".format(
                 root=root, hg_path=self.server.hg_path,
-                repo_name=self.server.repo_name))
+                repo_name=self.server.repo_name, hgrc=hgrc_path))
         log.debug("Final CMD: %s", command)
         return command
 
@@ -102,22 +87,61 b' class MercurialTunnelWrapper(object):'
         action = '?'
         # permissions are check via `pre_push_ssh_auth` hook
         self.server.update_environment(action=action, extras=extras)
-        self.create_hooks_env()
-        return os.system(self.command())
+        custom_hgrc_file = self.create_hooks_env()
+
+        try:
+            return os.system(self.command(custom_hgrc_file))
+        finally:
+            self.remove_configs()
 
 
 class MercurialServer(VcsServer):
     backend = 'hg'
+    cli_flags = ['phases', 'largefiles', 'extensions', 'experimental', 'hooks']
 
-    def __init__(self, store, ini_path, repo_name,
-                 user, user_permissions, config, env):
-        super(MercurialServer, self).\
-            __init__(user, user_permissions, config, env)
+    def __init__(self, store, ini_path, repo_name, user, user_permissions, config, env):
+        super(MercurialServer, self).__init__(user, user_permissions, config, env)
 
         self.store = store
         self.ini_path = ini_path
         self.repo_name = repo_name
-        self._path = self.hg_path = config.get(
-            'app:main', 'ssh.executable.hg')
+        self._path = self.hg_path = config.get('app:main', 'ssh.executable.hg')
+        self.tunnel = MercurialTunnelWrapper(server=self)
+
+    def config_to_hgrc(self, repo_name):
+        ui_sections = collections.defaultdict(list)
+        ui = VcsSettingsModel(repo=repo_name).get_ui_settings(section=None, key=None)
+
+        # write default hooks
+        default_hooks = [
+            ('pretxnchangegroup.ssh_auth', 'python:vcsserver.hooks.pre_push_ssh_auth'),
+            ('pretxnchangegroup.ssh', 'python:vcsserver.hooks.pre_push_ssh'),
+            ('changegroup.ssh', 'python:vcsserver.hooks.post_push_ssh'),
+
+            ('preoutgoing.ssh', 'python:vcsserver.hooks.pre_pull_ssh'),
+            ('outgoing.ssh', 'python:vcsserver.hooks.post_pull_ssh'),
+        ]
+
+        for k, v in default_hooks:
+            ui_sections['hooks'].append((k, v))
 
-        self.tunnel = MercurialTunnelWrapper(server=self)
+        for entry in ui:
+            if not entry.active:
+                continue
+            sec = entry.section
+            key = entry.key
+
+            if sec in self.cli_flags:
+                # we want only custom hooks, so we skip builtins
+                if sec == 'hooks' and key in RhodeCodeUi.HOOKS_BUILTIN:
+                    continue
+
+                ui_sections[sec].append([key, entry.value])
+
+        flags = []
+        for _sec, key_val in ui_sections.items():
+            flags.append(' ')
+            flags.append('[{}]'.format(_sec))
+            for key, val in key_val:
+                flags.append('{}= {}'.format(key, val))
+        return flags

rhodecode/apps/ssh_support/tests/test_server_hg.py

@@ -18,6 +18,7 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import os
 import mock
 import pytest
 
@@ -68,14 +69,16 b' def hg_server(app):'
 
 class TestMercurialServer(object):
 
-    def test_command(self, hg_server):
+    def test_command(self, hg_server, tmpdir):
         server = hg_server.create()
+        custom_hgrc = os.path.join(str(tmpdir), 'hgrc')
         expected_command = (
-            'cd {root}; {hg_path} -R {root}{repo_name} serve --stdio'.format(
-                root=hg_server.root, hg_path=hg_server.hg_path,
+            'cd {root}; HGRCPATH={custom_hgrc} {hg_path} -R {root}{repo_name} serve --stdio'.format(
+                root=hg_server.root, custom_hgrc=custom_hgrc, hg_path=hg_server.hg_path,
                 repo_name=hg_server.repo_name)
         )
-        assert expected_command == server.tunnel.command()
+        server_command = server.tunnel.command(custom_hgrc)
+        assert expected_command == server_command
 
     @pytest.mark.parametrize('permissions, action, code', [
         ({}, 'pull', -2),

rhodecode/config/licenses.json

@@ -28,23 +28,16 b''
     {
         "license": [
             {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-coverage-3.7.1"
-    },
-    {
-        "license": [
-            {
                 "fullName": "MIT License",
                 "shortName": "mit",
                 "spdxId": "MIT",
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
+        "name": "python2.7-beautifulsoup4-4.6.3"
+    },
+    {
+        "license": "UNKNOWN",
         "name": "python2.7-bootstrapped-pip-9.0.1"
     },
     {
@@ -56,29 +49,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-cov-core-1.15.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-webtest-2.0.29"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-beautifulsoup4-4.6.3"
+        "name": "python2.7-webtest-2.0.32"
     },
     {
         "license": [
@@ -100,7 +71,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-webob-1.7.4"
+        "name": "python2.7-webob-1.8.4"
     },
     {
         "license": [
@@ -116,6 +87,28 b''
     {
         "license": [
             {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-coverage-4.5.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-cov-core-1.15.0"
+    },
+    {
+        "license": [
+            {
                 "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
                 "shortName": "bsdOriginal",
                 "spdxId": "BSD-4-Clause",
@@ -127,6 +120,17 b''
     {
         "license": [
             {
+                "fullName": "GNU Lesser General Public License v3 or later (LGPLv3+)"
+            },
+            {
+                "fullName": "LGPL"
+            }
+        ],
+        "name": "python2.7-gprof2dot-2017.9.19"
+    },
+    {
+        "license": [
+            {
                 "fullName": "MIT License",
                 "shortName": "mit",
                 "spdxId": "MIT",
@@ -136,7 +140,7 b''
                 "fullName": "DFSG approved"
             }
         ],
-        "name": "python2.7-pytest-timeout-1.2.1"
+        "name": "python2.7-pytest-timeout-1.3.2"
     },
     {
         "license": [
@@ -147,7 +151,32 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pytest-3.6.0"
+        "name": "python2.7-pytest-3.8.2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pathlib2-2.3.3"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "New BSD License"
+            }
+        ],
+        "name": "python2.7-scandir-1.9.0"
     },
     {
         "license": [
@@ -172,7 +201,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pluggy-0.6.0"
+        "name": "python2.7-pluggy-0.9.0"
     },
     {
         "license": [
@@ -183,7 +212,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-atomicwrites-1.1.5"
+        "name": "python2.7-atomicwrites-1.2.1"
     },
     {
         "license": [
@@ -194,7 +223,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-more-itertools-4.3.0"
+        "name": "python2.7-more-itertools-5.0.0"
     },
     {
         "license": [
@@ -205,7 +234,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-attrs-18.1.0"
+        "name": "python2.7-attrs-18.2.0"
     },
     {
         "license": [
@@ -216,18 +245,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-py-1.5.3"
-    },
-    {
-        "license": [
-            {
-                "fullName": "GNU Lesser General Public License v3 or later (LGPLv3+)"
-            },
-            {
-                "fullName": "LGPL"
-            }
-        ],
-        "name": "python2.7-gprof2dot-2017.9.19"
+        "name": "python2.7-py-1.6.0"
     },
     {
         "license": [
@@ -254,17 +272,6 b''
     {
         "license": [
             {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-setuptools-scm-2.1.0"
-    },
-    {
-        "license": [
-            {
                 "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
                 "shortName": "bsdOriginal",
                 "spdxId": "BSD-4-Clause",
@@ -299,7 +306,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pytest-cov-2.5.1"
+        "name": "python2.7-pytest-cov-2.6.0"
     },
     {
         "license": [
@@ -310,7 +317,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-appenlight-client-0.6.25"
+        "name": "python2.7-appenlight-client-0.6.26"
     },
     {
         "license": [
@@ -326,10 +333,107 b''
     {
         "license": [
             {
-                "fullName": "AGPLv3 and Proprietary"
+                "fullName": "Apache 2.0 and Proprietary"
+            }
+        ],
+        "name": "python2.7-rhodecode-tools-1.2.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch1-dsl-0.0.12"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch1-1.10.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-rhodecode-tools-0.16.0"
+        "name": "python2.7-urllib3-1.24.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            },
+            {
+                "fullName": "Dual License"
+            }
+        ],
+        "name": "python2.7-python-dateutil-2.8.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch2-2.5.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch-dsl-6.3.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            }
+        ],
+        "name": "python2.7-ipaddress-1.0.22"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch-6.3.1"
     },
     {
         "license": [
@@ -351,66 +455,13 b''
     {
         "license": [
             {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-urllib3-1.21"
-    },
-    {
-        "license": [
-            {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            }
-        ],
-        "name": "python2.7-elasticsearch-dsl-2.2.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            }
-        ],
-        "name": "python2.7-elasticsearch-2.3.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            },
-            {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            },
-            {
-                "fullName": "Dual License"
-            }
-        ],
-        "name": "python2.7-python-dateutil-2.7.3"
-    },
-    {
-        "license": [
-            {
                 "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
                 "shortName": "bsdOriginal",
                 "spdxId": "BSD-4-Clause",
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-markupsafe-1.0"
+        "name": "python2.7-markupsafe-1.1.0"
     },
     {
         "license": [
@@ -443,29 +494,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-click-6.6"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-bottle-0.12.13"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-cprofilev-1.0.7"
+        "name": "python2.7-click-7.0"
     },
     {
         "license": [
@@ -519,31 +548,6 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pathlib2-2.3.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            },
-            {
-                "fullName": "New BSD License"
-            }
-        ],
-        "name": "python2.7-scandir-1.9.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
         "name": "python2.7-backports.shutil-get-terminal-size-1.0.0"
     },
     {
@@ -555,7 +559,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-pygments-2.2.0"
+        "name": "python2.7-pygments-2.3.1"
     },
     {
         "license": [
@@ -646,7 +650,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pickleshare-0.7.4"
+        "name": "python2.7-pickleshare-0.7.5"
     },
     {
         "license": [
@@ -690,7 +694,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-greenlet-0.4.13"
+        "name": "python2.7-greenlet-0.4.15"
     },
     {
         "license": [
@@ -701,7 +705,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-gevent-1.3.5"
+        "name": "python2.7-gevent-1.4.0"
     },
     {
         "license": [
@@ -712,7 +716,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-psutil-5.4.6"
+        "name": "python2.7-psutil-5.5.1"
     },
     {
         "license": [
@@ -745,7 +749,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-alembic-0.9.9"
+        "name": "python2.7-alembic-1.0.5"
     },
     {
         "license": {
@@ -754,7 +758,7 b''
             "spdxId": "Apache-2.0",
             "url": "http://spdx.org/licenses/Apache-2.0.html"
         },
-        "name": "python2.7-python-editor-1.0.3"
+        "name": "python2.7-python-editor-1.0.4"
     },
     {
         "license": [
@@ -842,39 +846,6 b''
     {
         "license": [
             {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            }
-        ],
-        "name": "python2.7-bleach-2.1.4"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-html5lib-1.0.1"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-webencodings-0.5.1"
-    },
-    {
-        "license": [
-            {
                 "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
                 "shortName": "bsdOriginal",
                 "spdxId": "BSD-4-Clause",
@@ -892,7 +863,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-testpath-0.3.1"
+        "name": "python2.7-testpath-0.4.2"
     },
     {
         "license": [
@@ -908,6 +879,28 b''
     {
         "license": [
             {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-bleach-3.1.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-webencodings-0.5.1"
+    },
+    {
+        "license": [
+            {
                 "fullName": "MIT License",
                 "shortName": "mit",
                 "spdxId": "MIT",
@@ -925,7 +918,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-configparser-3.5.0"
+        "name": "python2.7-configparser-3.7.3"
     },
     {
         "license": [
@@ -947,7 +940,73 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-mistune-0.8.3"
+        "name": "python2.7-mistune-0.8.4"
+    },
+    {
+        "license": {
+            "fullName": "GNU Lesser General Public License v3.0 or later",
+            "shortName": "lgpl3Plus",
+            "spdxId": "LGPL-3.0+",
+            "url": "http://spdx.org/licenses/LGPL-3.0+.html"
+        },
+        "name": "python2.7-psycopg2-2.7.7"
+    },
+    {
+        "license": {
+            "fullName": "PostgreSQL License",
+            "shortName": "postgresql",
+            "spdxId": "PostgreSQL",
+            "url": "http://spdx.org/licenses/PostgreSQL.html"
+        },
+        "name": "postgresql-9.6.10"
+    },
+    {
+        "license": [
+            {
+                "fullName": "zlib License",
+                "shortName": "zlib",
+                "spdxId": "Zlib",
+                "url": "http://spdx.org/licenses/Zlib.html"
+            },
+            {
+                "fullName": "libpng License",
+                "shortName": "libpng",
+                "spdxId": "Libpng",
+                "url": "http://spdx.org/licenses/Libpng.html"
+            }
+        ],
+        "name": "python2.7-pysqlite-2.8.3"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pymysql-0.8.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "GNU General Public License v1.0 only",
+                "shortName": "gpl1",
+                "spdxId": "GPL-1.0",
+                "url": "http://spdx.org/licenses/GPL-1.0.html"
+            }
+        ],
+        "name": "python2.7-mysql-python-1.2.5"
+    },
+    {
+        "license": {
+            "fullName": "GNU Library General Public License v2.1 only",
+            "shortName": "lgpl21",
+            "spdxId": "LGPL-2.1",
+            "url": "http://spdx.org/licenses/LGPL-2.1.html"
+        },
+        "name": "mariadb-connector-c-2.3.4"
     },
     {
         "license": [
@@ -958,7 +1017,7 b''
                 "url": "http://spdx.org/licenses/ZPL-2.1.html"
             }
         ],
-        "name": "python2.7-zope.interface-4.5.0"
+        "name": "python2.7-zope.interface-4.6.0"
     },
     {
         "license": [
@@ -969,7 +1028,7 b''
                 "url": "http://spdx.org/licenses/ZPL-2.1.html"
             }
         ],
-        "name": "python2.7-zope.event-4.3.0"
+        "name": "python2.7-zope.event-4.4"
     },
     {
         "license": [
@@ -980,7 +1039,7 b''
                 "url": "http://spdx.org/licenses/ZPL-2.1.html"
             }
         ],
-        "name": "python2.7-zope.deprecation-4.3.0"
+        "name": "python2.7-zope.deprecation-4.4.0"
     },
     {
         "license": [
@@ -1043,7 +1102,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-paste-2.0.3"
+        "name": "python2.7-paste-3.0.5"
     },
     {
         "license": [
@@ -1061,7 +1120,7 b''
             "fullName": "Repoze License",
             "url": "http://www.repoze.org/LICENSE.txt"
         },
-        "name": "python2.7-venusian-1.1.0"
+        "name": "python2.7-venusian-1.2.0"
     },
     {
         "license": {
@@ -1072,17 +1131,6 b''
         "name": "python2.7-urlobject-2.4.3"
     },
     {
-        "license": [
-            {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            }
-        ],
-        "name": "python2.7-trollius-1.0.4"
-    },
-    {
         "license": {
             "fullName": "Repoze License",
             "url": "http://www.repoze.org/LICENSE.txt"
@@ -1095,7 +1143,7 b''
                 "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
             }
         ],
-        "name": "python2.7-supervisor-3.3.4"
+        "name": "python2.7-supervisor-3.3.5"
     },
     {
         "license": [
@@ -1114,7 +1162,7 b''
                 "url": "http://spdx.org/licenses/Python-2.0.html"
             }
         ],
-        "name": "python2.7-subprocess32-3.5.1"
+        "name": "python2.7-subprocess32-3.5.3"
     },
     {
         "license": [
@@ -1125,7 +1173,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-sshpubkeys-2.2.0"
+        "name": "python2.7-sshpubkeys-3.1.0"
     },
     {
         "license": [
@@ -1141,11 +1189,55 b''
     {
         "license": [
             {
-                "fullName": "Public Domain",
-                "shortName": "publicDomain"
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "BSD or Apache License, Version 2.0"
+            },
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
             }
         ],
-        "name": "python2.7-pycrypto-2.6.1"
+        "name": "python2.7-cryptography-2.5"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-cffi-1.12.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-pycparser-2.19"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-asn1crypto-0.24.0"
     },
     {
         "license": [
@@ -1159,18 +1251,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-simplejson-3.11.1"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-setproctitle-1.1.10"
+        "name": "python2.7-simplejson-3.16.0"
     },
     {
         "license": [
@@ -1210,7 +1291,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-py-gfm-0.1.3"
+        "name": "python2.7-py-gfm-0.1.4"
     },
     {
         "license": [
@@ -1248,6 +1329,72 b''
     {
         "license": [
             {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-python-saml-2.4.2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            }
+        ],
+        "name": "python2.7-defusedxml-0.5.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-isodate-0.6.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-dm.xmlsec.binding-1.3.7"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-lxml-4.2.5"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-wheel-0.30.0"
+    },
+    {
+        "license": [
+            {
                 "fullName": "License :: OSI Approved :: MIT License"
             },
             {
@@ -1260,14 +1407,7 b''
         "name": "python2.7-python-pam-1.8.4"
     },
     {
-        "license": [
-            {
-                "fullName": "GNU General Public License v1.0 only",
-                "shortName": "gpl1",
-                "spdxId": "GPL-1.0",
-                "url": "http://spdx.org/licenses/GPL-1.0.html"
-            }
-        ],
+        "license": "UNKNOWN",
         "name": "linux-pam-1.3.0"
     },
     {
@@ -1302,9 +1442,7 b''
         "name": "libkrb5-1.15.2"
     },
     {
-        "license":{
-            "fullName": "BSD-derived (https://www.openldap.org/software/release/license.html)"
-        },
+        "license": "UNKNOWN",
         "name": "openldap-2.4.45"
     },
     {
@@ -1316,7 +1454,18 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-pyasn1-modules-0.2.2"
+        "name": "python2.7-pyasn1-modules-0.2.4"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-pyasn1-0.4.5"
     },
     {
         "license": [
@@ -1327,42 +1476,36 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-pyasn1-0.4.4"
+        "name": "python2.7-pyramid-mailer-0.15.1"
     },
     {
         "license": [
             {
-                "fullName": "zlib License",
-                "shortName": "zlib",
-                "spdxId": "Zlib",
-                "url": "http://spdx.org/licenses/Zlib.html"
-            },
-            {
-                "fullName": "libpng License",
-                "shortName": "libpng",
-                "spdxId": "Libpng",
-                "url": "http://spdx.org/licenses/Libpng.html"
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
             }
         ],
-        "name": "python2.7-pysqlite-2.8.3"
+        "name": "python2.7-transaction-2.4.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
+            }
+        ],
+        "name": "python2.7-repoze.sendmail-4.4.1"
     },
     {
         "license": {
             "fullName": "Repoze License",
             "url": "http://www.repoze.org/LICENSE.txt"
         },
-        "name": "python2.7-pyramid-1.9.2"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-hupper-1.3"
+        "name": "python2.7-pyramid-1.10.1"
     },
     {
         "license": [
@@ -1395,7 +1538,18 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pastedeploy-1.5.2"
+        "name": "python2.7-pastedeploy-2.0.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-hupper-1.5"
     },
     {
         "license": {
@@ -1428,18 +1582,7 b''
                 "url": "http://www.repoze.org/LICENSE.txt"
             }
         ],
-        "name": "python2.7-pyramid-debugtoolbar-4.4"
-    },
-    {
-        "license": [
-            {
-                "fullName": "Python Software Foundation License version 2",
-                "shortName": "psfl",
-                "spdxId": "Python-2.0",
-                "url": "http://spdx.org/licenses/Python-2.0.html"
-            }
-        ],
-        "name": "python2.7-ipaddress-1.0.22"
+        "name": "python2.7-pyramid-debugtoolbar-4.5"
     },
     {
         "license": {
@@ -1468,29 +1611,16 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pyparsing-1.5.7"
+        "name": "python2.7-pyparsing-2.3.0"
     },
     {
         "license": [
             {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
+                "fullName": "Public Domain",
+                "shortName": "publicDomain"
             }
         ],
-        "name": "python2.7-pygments-markdown-lexer-0.1.0.dev39"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-pyflakes-0.8.1"
+        "name": "python2.7-pycrypto-2.6.1"
     },
     {
         "license": {
@@ -1513,30 +1643,12 b''
         "name": "python2.7-py-bcrypt-0.4"
     },
     {
-        "license": {
-            "fullName": "GNU Lesser General Public License v3.0 or later",
-            "shortName": "lgpl3Plus",
-            "spdxId": "LGPL-3.0+",
-            "url": "http://spdx.org/licenses/LGPL-3.0+.html"
-        },
-        "name": "python2.7-psycopg2-2.7.4"
-    },
-    {
-        "license": {
-            "fullName": "PostgreSQL License",
-            "shortName": "postgresql",
-            "spdxId": "PostgreSQL",
-            "url": "http://spdx.org/licenses/PostgreSQL.html"
-        },
-        "name": "postgresql-9.6.10"
-    },
-    {
         "license": [
             {
                 "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
             }
         ],
-        "name": "python2.7-peppercorn-0.5"
+        "name": "python2.7-peppercorn-0.6"
     },
     {
         "license": [
@@ -1547,7 +1659,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pastescript-2.0.2"
+        "name": "python2.7-pastescript-3.0.0"
     },
     {
         "license": [
@@ -1569,60 +1681,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-objgraph-3.1.1"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-graphviz-0.9"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-pyotp-2.2.6"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-pymysql-0.8.1"
-    },
-    {
-        "license": [
-            {
-                "fullName": "GNU General Public License v1.0 only",
-                "shortName": "gpl1",
-                "spdxId": "GPL-1.0",
-                "url": "http://spdx.org/licenses/GPL-1.0.html"
-            }
-        ],
-        "name": "python2.7-mysql-python-1.2.5"
-    },
-    {
-        "license": {
-            "fullName": "GNU Library General Public License v2.1 only",
-            "shortName": "lgpl21",
-            "spdxId": "LGPL-2.1",
-            "url": "http://spdx.org/licenses/LGPL-2.1.html"
-        },
-        "name": "mariadb-connector-c-2.3.4"
+        "name": "python2.7-pyotp-2.2.7"
     },
     {
         "license": [
@@ -1644,29 +1703,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-lxml-3.7.3"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-wheel-0.30.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-kombu-4.2.0"
+        "name": "python2.7-kombu-4.2.1"
     },
     {
         "license": [
@@ -1688,18 +1725,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-vine-1.1.4"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-billiard-3.5.0.3"
+        "name": "python2.7-vine-1.2.0"
     },
     {
         "license": [
@@ -1721,7 +1747,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-iso8601-0.1.11"
+        "name": "python2.7-iso8601-0.1.12"
     },
     {
         "license": [
@@ -1765,7 +1791,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-dogpile.cache-0.6.6"
+        "name": "python2.7-dogpile.cache-0.7.1"
     },
     {
         "license": {
@@ -1779,17 +1805,20 b''
     {
         "license": [
             {
+                "fullName": "Repoze Public License"
+            },
+            {
                 "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
             }
         ],
-        "name": "python2.7-deform-2.0.5"
+        "name": "python2.7-deform-2.0.7"
     },
     {
         "license": {
             "fullName": "Repoze License",
             "url": "http://www.repoze.org/LICENSE.txt"
         },
-        "name": "python2.7-colander-1.4"
+        "name": "python2.7-colander-1.7.0"
     },
     {
         "license": [
@@ -1863,6 +1892,17 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
+        "name": "python2.7-billiard-3.5.0.3"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
         "name": "python2.7-babel-1.3"
     },
     {
@@ -1877,25 +1917,7 b''
         "name": "python2.7-authomatic-0.1.0.post1"
     },
     {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "node-grunt-cli-1.2.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
+        "license": "UNKNOWN",
         "name": "python2.7-rhodecode-testdata-0.10.0"
     }
 ]

rhodecode/config/middleware.py

@@ -250,7 +250,7 b' def includeme(config):'
 
     # Includes which are required. The application would fail without them.
     config.include('pyramid_mako')
-    config.include('pyramid_beaker')
+    config.include('rhodecode.lib.rc_beaker')
     config.include('rhodecode.lib.rc_cache')
 
     config.include('rhodecode.apps._base.navigation')

rhodecode/config/rcextensions/examples/validate_pushed_files_name_and_size.py

@@ -28,8 +28,8 b' def _pre_push_hook(*args, **kwargs):'
     [{u'hg_env|git_env': ...,
       u'multiple_heads': [],
       u'name': u'default',
-      u'new_rev': u'd0befe0692e722e01d5677f27a104631cf798b69',
-      u'old_rev': u'd0befe0692e722e01d5677f27a104631cf798b69',
+      u'new_rev': u'd0b2ae0692e722e01d5677f27a104631cf798b69',
+      u'old_rev': u'd0b1ae0692e722e01d5677f27a104631cf798b69',
       u'ref': u'',
       u'total_commits': 2,
       u'type': u'branch'}]
@@ -47,13 +47,17 b' def _pre_push_hook(*args, **kwargs):'
     forbid_files = repo_extra_fields.get('forbid_files_glob', {}).get('field_value')
     forbid_files = aslist(forbid_files)
 
+    # forbid_files = ['*']  # example pattern
+
     # optionally get bytes limit for a single file, e.g 1024 for 1KB
     forbid_size_over = repo_extra_fields.get('forbid_size_over', {}).get('field_value')
     forbid_size_over = int(forbid_size_over or 0)
 
+    # forbid_size_over = 1024  # example 1024
+
     def validate_file_name_and_size(file_data, forbidden_files=None, size_limit=None):
         """
-        This function validates commited files against some sort of rules.
+        This function validates comited files against some sort of rules.
         It should return a valid boolean, and a reason for failure
 
         file_data =[
@@ -87,7 +91,10 b' def _pre_push_hook(*args, **kwargs):'
 
         # validate A(dded) files and size
         if size_limit and operation == 'A':
-            size = len(file_data['raw_diff'])
+            if 'file_size' in file_data:
+                size = file_data['file_size']
+            else:
+                size = len(file_data['raw_diff'])
 
             reason = 'File {} size of {} bytes exceeds limit {}'.format(
                 file_name, format_byte_size_binary(size),

rhodecode/config/rcextensions/helpers/extract_pre_files.py

@@ -34,12 +34,51 b' from rhodecode.lib.vcs.backends.hg.diff '
 from rhodecode.lib.vcs.backends.git.diff import GitDiff
 
 
-def get_hg_files(repo, refs):
+def get_svn_files(repo, vcs_repo, refs):
+    txn_id = refs[0]
+    files = []
+    stdout, stderr = vcs_repo.run_svn_command(
+        ['svnlook', 'changed', repo.repo_full_path, '--transaction', txn_id])
+
+    svn_op_to_rc_op = {
+        'A': 'A',
+        'U': 'M',
+        'D': 'D',
+    }
+
+    for entry in stdout.splitlines():
+        parsed_entry = {
+            'raw_diff': '',
+            'filename': '',
+            'chunks': [],
+            'ops': {},
+            'file_size': 0
+        }
+
+        op = entry[0]
+        path = entry[1:].strip()
+
+        rc_op = svn_op_to_rc_op.get(op) or '?'
+        parsed_entry['filename'] = path
+        parsed_entry['operation'] = rc_op
+
+        if rc_op in ['A', 'M']:
+            stdout, stderr = vcs_repo.run_svn_command(
+                ['svnlook', 'filesize', repo.repo_full_path, path, '--transaction', txn_id])
+            file_size = int(stdout.strip())
+            parsed_entry['file_size'] = file_size
+
+        files.append(parsed_entry)
+
+    return files
+
+
+def get_hg_files(repo, vcs_repo, refs):
     files = []
     return files
 
 
-def get_git_files(repo, refs):
+def get_git_files(repo, vcs_repo, refs):
     files = []
 
     for data in refs:
@@ -57,7 +96,7 b' def get_git_files(repo, refs):'
             'diff', old_rev, new_rev
         ]
 
-        stdout, stderr = repo.run_git_command(cmd, extra_env=git_env)
+        stdout, stderr = vcs_repo.run_git_command(cmd, extra_env=git_env)
         vcs_diff = GitDiff(stdout)
 
         diff_processor = diffs.DiffProcessor(vcs_diff, format='newdiff')
@@ -86,11 +125,14 b' def run(*args, **kwargs):'
     if vcs_type == 'git':
         for rev_data in kwargs['commit_ids']:
             new_environ = dict((k, v) for k, v in rev_data['git_env'])
-        files = get_git_files(vcs_repo, kwargs['commit_ids'])
+        files = get_git_files(repo, vcs_repo, kwargs['commit_ids'])
 
     if vcs_type == 'hg':
         for rev_data in kwargs['commit_ids']:
             new_environ = dict((k, v) for k, v in rev_data['hg_env'])
-        files = get_hg_files(vcs_repo, kwargs['commit_ids'])
+        files = get_hg_files(repo, vcs_repo, kwargs['commit_ids'])
+
+    if vcs_type == 'svn':
+        files = get_svn_files(repo, vcs_repo, kwargs['commit_ids'])
 
     return files

rhodecode/integrations/views.py

@@ -402,7 +402,8 b' class RepoIntegrationsView(IntegrationSe'
         c.rhodecode_db_repo = self.repo
         c.repo_name = self.db_repo.repo_name
         c.repository_pull_requests = ScmModel().get_pull_requests(self.repo)
-
+        c.repository_is_user_following = ScmModel().is_following_repo(
+            c.repo_name, self._rhodecode_user.user_id)
         c.has_origin_repo_read_perm = False
         if self.db_repo.fork:
             c.has_origin_repo_read_perm = h.HasRepoPermissionAny(

rhodecode/lib/audit_logger.py

@@ -92,6 +92,9 b' ACTIONS_V1 = {'
     'repo.commit.comment.delete': {'data': {}},
     'repo.commit.vote': '',
 
+    'repo.artifact.add': '',
+    'repo.artifact.delete': '',
+
     'repo_group.create': {'data': {}},
     'repo_group.edit': {'old_data': {}},
     'repo_group.edit.permissions': {},

rhodecode/lib/auth.py

@@ -2078,8 +2078,7 b' class HasRepoPermissionAny(PermsFunction'
 class HasRepoGroupPermissionAny(PermsFunction):
     def __call__(self, group_name=None, check_location='', user=None):
         self.repo_group_name = group_name
-        return super(HasRepoGroupPermissionAny, self).__call__(
-            check_location, user)
+        return super(HasRepoGroupPermissionAny, self).__call__(check_location, user)
 
     def check_permissions(self, user):
         perms = user.permissions
@@ -2095,8 +2094,7 b' class HasRepoGroupPermissionAny(PermsFun'
 class HasRepoGroupPermissionAll(PermsFunction):
     def __call__(self, group_name=None, check_location='', user=None):
         self.repo_group_name = group_name
-        return super(HasRepoGroupPermissionAll, self).__call__(
-            check_location, user)
+        return super(HasRepoGroupPermissionAll, self).__call__(check_location, user)
 
     def check_permissions(self, user):
         perms = user.permissions
@@ -2112,8 +2110,7 b' class HasRepoGroupPermissionAll(PermsFun'
 class HasUserGroupPermissionAny(PermsFunction):
     def __call__(self, user_group_name=None, check_location='', user=None):
         self.user_group_name = user_group_name
-        return super(HasUserGroupPermissionAny, self).__call__(
-            check_location, user)
+        return super(HasUserGroupPermissionAny, self).__call__(check_location, user)
 
     def check_permissions(self, user):
         perms = user.permissions
@@ -2129,8 +2126,7 b' class HasUserGroupPermissionAny(PermsFun'
 class HasUserGroupPermissionAll(PermsFunction):
     def __call__(self, user_group_name=None, check_location='', user=None):
         self.user_group_name = user_group_name
-        return super(HasUserGroupPermissionAll, self).__call__(
-            check_location, user)
+        return super(HasUserGroupPermissionAll, self).__call__(check_location, user)
 
     def check_permissions(self, user):
         perms = user.permissions

rhodecode/lib/base.py

@@ -288,7 +288,6 b' def attach_context_attributes(context, r'
     """
     config = request.registry.settings
 
-
     rc_config = SettingsModel().get_all_settings(cache=True)
 
     context.rhodecode_version = rhodecode.__version__
@@ -375,20 +374,25 b' def attach_context_attributes(context, r'
         "sideside": "sideside"
     }.get(request.GET.get('diffmode'))
 
-    if diffmode and diffmode != request.session.get('rc_user_session_attr.diffmode'):
-        request.session['rc_user_session_attr.diffmode'] = diffmode
-
-    # session settings per user
+    is_api = hasattr(request, 'rpc_user')
     session_attrs = {
         # defaults
         "clone_url_format": "http",
         "diffmode": "sideside"
     }
-    for k, v in request.session.items():
-        pref = 'rc_user_session_attr.'
-        if k and k.startswith(pref):
-            k = k[len(pref):]
-            session_attrs[k] = v
+
+    if not is_api:
+        # don't access pyramid session for API calls
+        if diffmode and diffmode != request.session.get('rc_user_session_attr.diffmode'):
+            request.session['rc_user_session_attr.diffmode'] = diffmode
+
+        # session settings per user
+
+        for k, v in request.session.items():
+            pref = 'rc_user_session_attr.'
+            if k and k.startswith(pref):
+                k = k[len(pref):]
+                session_attrs[k] = v
 
     context.user_session_attrs = session_attrs
 
@@ -420,8 +424,12 b' def attach_context_attributes(context, r'
         'extra': {'plugins': {}}
     }
     # END CONFIG VARS
+    if is_api:
+        csrf_token = None
+    else:
+        csrf_token = auth.get_csrf_token(session=request.session)
 
-    context.csrf_token = auth.get_csrf_token(session=request.session)
+    context.csrf_token = csrf_token
     context.backends = rhodecode.BACKENDS.keys()
     context.backends.sort()
     unread_count = 0
@@ -537,7 +545,7 b' def bootstrap_config(request):'
 
     # allow pyramid lookup in testing
     config.include('pyramid_mako')
-    config.include('pyramid_beaker')
+    config.include('rhodecode.lib.rc_beaker')
     config.include('rhodecode.lib.rc_cache')
 
     add_events_routes(config)

rhodecode/lib/db_manage.py

@@ -375,6 +375,27 b' class DbManage(object):'
         hgevolve.ui_active = False
         self.sa.add(hgevolve)
 
+        hgevolve = RhodeCodeUi()
+        hgevolve.ui_section = 'experimental'
+        hgevolve.ui_key = 'evolution'
+        hgevolve.ui_value = ''
+        hgevolve.ui_active = False
+        self.sa.add(hgevolve)
+
+        hgevolve = RhodeCodeUi()
+        hgevolve.ui_section = 'experimental'
+        hgevolve.ui_key = 'evolution.exchange'
+        hgevolve.ui_value = ''
+        hgevolve.ui_active = False
+        self.sa.add(hgevolve)
+
+        hgevolve = RhodeCodeUi()
+        hgevolve.ui_section = 'extensions'
+        hgevolve.ui_key = 'topic'
+        hgevolve.ui_value = ''
+        hgevolve.ui_active = False
+        self.sa.add(hgevolve)
+
         # enable hggit disabled by default
         hggit = RhodeCodeUi()
         hggit.ui_section = 'extensions'
@@ -464,9 +485,6 b' class DbManage(object):'
             self.populate_default_permissions()
         return fixed
 
-    def update_repo_info(self):
-        RepoModel.update_repoinfo()
-
     def config_prompt(self, test_repo_path='', retries=3):
         defaults = self.cli_args
         _path = defaults.get('repos_location')

rhodecode/lib/dbmigrate/schema/db_1_6_0.py

@@ -614,7 +614,7 b' class Repository(Base, BaseModel):'
         if (cs_cache != self.changeset_cache or not self.changeset_cache):
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s', self.repo_name, cs_cache)
+            log.debug('updated repo %s with new commit cache %s', self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache
             Session().add(self)

rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py

@@ -38,8 +38,6 b' from sqlalchemy.orm import relationship,'
 from sqlalchemy.exc import OperationalError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
-from Crypto.Cipher import AES
-from Crypto import Random
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
 from rhodecode.translation import _

rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py

@@ -2164,7 +2164,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py

@@ -2230,7 +2230,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py

@@ -2278,7 +2278,7 b' class Repository(Base, BaseModel):'
                 # if yes, we use the current timestamp instead. Imagine you get
                 # old commit pushed 1y ago, we'd set last update 1y to ago.
                 last_change = _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py

@@ -2301,7 +2301,7 b' class Repository(Base, BaseModel):'
                 # if yes, we use the current timestamp instead. Imagine you get
                 # old commit pushed 1y ago, we'd set last update 1y to ago.
                 last_change = _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py

@@ -2301,7 +2301,7 b' class Repository(Base, BaseModel):'
                 # if yes, we use the current timestamp instead. Imagine you get
                 # old commit pushed 1y ago, we'd set last update 1y to ago.
                 last_change = _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py

@@ -1865,7 +1865,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py

@@ -1868,7 +1868,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py

@@ -1867,7 +1867,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py

@@ -1869,7 +1869,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py

@@ -1869,7 +1869,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py

@@ -1912,7 +1912,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py

@@ -1913,7 +1913,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py

@@ -2100,7 +2100,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/encrypt.py

@@ -111,4 +111,28 b' class AESCipher(object):'
 
     @staticmethod
     def _unpad(s):
-        return s[:-ord(s[len(s)-1:])]
  No newline at end of file
+        return s[:-ord(s[len(s)-1:])]
+
+
+def validate_and_get_enc_data(enc_data, enc_key, enc_strict_mode):
+    parts = enc_data.split('$', 3)
+    if not len(parts) == 3:
+        # probably not encrypted values
+        return enc_data
+    else:
+        if parts[0] != 'enc':
+            # parts ok but without our header ?
+            return enc_data
+
+        # at that stage we know it's our encryption
+        if parts[1] == 'aes':
+            decrypted_data = AESCipher(enc_key).decrypt(parts[2])
+        elif parts[1] == 'aes_hmac':
+            decrypted_data = AESCipher(
+                enc_key, hmac=True,
+                strict_verification=enc_strict_mode).decrypt(parts[2])
+        else:
+            raise ValueError(
+                'Encryption type part is wrong, must be `aes` '
+                'or `aes_hmac`, got `%s` instead' % (parts[1]))
+        return decrypted_data

rhodecode/lib/helpers.py

@@ -199,6 +199,7 b' class _GetError(object):'
         if form_errors and field_name in form_errors:
             return literal(tmpl % form_errors.get(field_name))
 
+
 get_error = _GetError()
 
 
@@ -214,38 +215,45 b' class _ToolTip(object):'
         tooltip_title = escape(tooltip_title)
         tooltip_title = tooltip_title.replace('<', '&lt;').replace('>', '&gt;')
         return tooltip_title
+
+
 tooltip = _ToolTip()
 
+files_icon = u'<i class="file-breadcrumb-copy tooltip icon-clipboard clipboard-action" data-clipboard-text="{}" title="Copy the full path"></i>'
 
-def files_breadcrumbs(repo_name, commit_id, file_path):
+
+def files_breadcrumbs(repo_name, commit_id, file_path, at_ref=None, limit_items=False, linkify_last_item=False):
     if isinstance(file_path, str):
         file_path = safe_unicode(file_path)
 
-    # TODO: johbo: Is this always a url like path, or is this operating
-    # system dependent?
-    path_segments = file_path.split('/')
+    route_qry = {'at': at_ref} if at_ref else None
 
-    repo_name_html = escape(repo_name)
-    if len(path_segments) == 1 and path_segments[0] == '':
-        url_segments = [repo_name_html]
-    else:
-        url_segments = [
-            link_to(
-                repo_name_html,
-                route_path(
-                    'repo_files',
-                    repo_name=repo_name,
-                    commit_id=commit_id,
-                    f_path=''),
-                class_='pjax-link')]
+    # first segment is a `..` link to repo files
+    root_name = literal(u'<i class="icon-home"></i>')
+    url_segments = [
+        link_to(
+            root_name,
+            route_path(
+                'repo_files',
+                repo_name=repo_name,
+                commit_id=commit_id,
+                f_path='',
+                _query=route_qry),
+        )]
 
+    path_segments = file_path.split('/')
     last_cnt = len(path_segments) - 1
     for cnt, segment in enumerate(path_segments):
         if not segment:
             continue
         segment_html = escape(segment)
 
-        if cnt != last_cnt:
+        last_item = cnt == last_cnt
+
+        if last_item and linkify_last_item is False:
+            # plain version
+            url_segments.append(segment_html)
+        else:
             url_segments.append(
                 link_to(
                     segment_html,
@@ -253,12 +261,32 b' def files_breadcrumbs(repo_name, commit_'
                         'repo_files',
                         repo_name=repo_name,
                         commit_id=commit_id,
-                        f_path='/'.join(path_segments[:cnt + 1])),
-                    class_='pjax-link'))
-        else:
-            url_segments.append(segment_html)
+                        f_path='/'.join(path_segments[:cnt + 1]),
+                        _query=route_qry),
+                ))
+
+    limited_url_segments = url_segments[:1] + ['...'] + url_segments[-5:]
+    if limit_items and len(limited_url_segments) < len(url_segments):
+        url_segments = limited_url_segments
 
-    return literal('/'.join(url_segments))
+    full_path = file_path
+    icon = files_icon.format(escape(full_path))
+    if file_path == '':
+        return root_name
+    else:
+        return literal(' / '.join(url_segments) + icon)
+
+
+def files_url_data(request):
+    matchdict = request.matchdict
+
+    if 'f_path' not in matchdict:
+        matchdict['f_path'] = ''
+
+    if 'commit_id' not in matchdict:
+        matchdict['commit_id'] = 'tip'
+
+    return json.dumps(matchdict)
 
 
 def code_highlight(code, lexer, formatter, use_hl_filter=False):
@@ -1196,7 +1224,7 b' class InitialsGravatar(object):'
             </text>
         </svg>""".format(
             size=self.size,
-            f_size=self.size/1.85,  # scale the text inside the box nicely
+            f_size=self.size/2.05,  # scale the text inside the box nicely
             background=self.background,
             text_color=self.text_color,
             text=initials.upper(),
@@ -1486,10 +1514,12 b' def breadcrumb_repo_link(repo):'
     """
 
     path = [
-        link_to(group.name, route_path('repo_group_home', repo_group_name=group.group_name))
+        link_to(group.name, route_path('repo_group_home', repo_group_name=group.group_name),
+                title='last change:{}'.format(format_date(group.last_commit_change)))
         for group in repo.groups_with_parents
     ] + [
-        link_to(repo.just_name, route_path('repo_summary', repo_name=repo.repo_name))
+        link_to(repo.just_name, route_path('repo_summary', repo_name=repo.repo_name),
+                title='last change:{}'.format(format_date(repo.last_commit_change)))
     ]
 
     return literal(' &raquo; '.join(path))
@@ -1507,11 +1537,13 b' def breadcrumb_repo_group_link(repo_grou'
 
     path = [
         link_to(group.name,
-                route_path('repo_group_home', repo_group_name=group.group_name))
+                route_path('repo_group_home', repo_group_name=group.group_name),
+                title='last change:{}'.format(format_date(group.last_commit_change)))
         for group in repo_group.parents
     ] + [
         link_to(repo_group.name,
-                route_path('repo_group_home', repo_group_name=repo_group.group_name))
+                route_path('repo_group_home', repo_group_name=repo_group.group_name),
+                title='last change:{}'.format(format_date(repo_group.last_commit_change)))
     ]
 
     return literal(' &raquo; '.join(path))
@@ -1907,23 +1939,26 b' def secure_form(form_url, method="POST",'
 
 def dropdownmenu(name, selected, options, enable_filter=False, **attrs):
     select_html = select(name, selected, options, **attrs)
+
     select2 = """
         <script>
             $(document).ready(function() {
                   $('#%s').select2({
-                      containerCssClass: 'drop-menu',
+                      containerCssClass: 'drop-menu %s',
                       dropdownCssClass: 'drop-menu-dropdown',
                       dropdownAutoWidth: true%s
                   });
             });
         </script>
     """
+
     filter_option = """,
                         minimumResultsForSearch: -1
     """
     input_id = attrs.get('id') or name
+    extra_classes = ' '.join(attrs.pop('extra_classes', []))
     filter_enabled = "" if enable_filter else filter_option
-    select_script = literal(select2 % (input_id, filter_enabled))
+    select_script = literal(select2 % (input_id, extra_classes, filter_enabled))
 
     return literal(select_html+select_script)
 
@@ -1944,7 +1979,7 b' def get_visual_attr(tmpl_context_var, at'
 
 def get_last_path_part(file_node):
     if not file_node.path:
-        return u''
+        return u'/'
 
     path = safe_unicode(file_node.path.split('/')[-1])
     return u'../' + path
@@ -2033,10 +2068,11 b' def reviewer_as_json(*args, **kwargs):'
 def get_repo_view_type(request):
     route_name = request.matched_route.name
     route_to_view_type = {
-        'repo_changelog': 'changelog',
+        'repo_changelog': 'commits',
+        'repo_commits': 'commits',
         'repo_files': 'files',
         'repo_summary': 'summary',
         'repo_commit': 'commit'
+    }
 
-    }
     return route_to_view_type.get(route_name)

rhodecode/lib/hooks_utils.py

@@ -80,7 +80,7 b' def trigger_log_create_pull_request_hook'
     extras = _get_rc_scm_extras(username, repo_name, repo_alias,
                                 'create_pull_request')
     events.trigger(events.PullRequestCreateEvent(pull_request))
-    extras.update(pull_request.get_api_data())
+    extras.update(pull_request.get_api_data(with_merge_state=False))
     hooks_base.log_create_pull_request(**extras)
 
 

rhodecode/lib/index/__init__.py

@@ -80,6 +80,13 b' class BaseSearcher(object):'
     def extract_search_tags(query):
         return []
 
+    @staticmethod
+    def escape_specials(val):
+        """
+        Handle and escape reserved chars for search
+        """
+        return val
+
 
 def search_config(config, prefix='search.'):
     _config = {}

rhodecode/lib/markdown_ext.py

@@ -20,7 +20,55 b''
 
 import markdown
 
-from mdx_gfm import GithubFlavoredMarkdownExtension  # pragma: no cover
+from markdown.extensions import Extension
+from markdown.extensions.fenced_code import FencedCodeExtension
+from markdown.extensions.smart_strong import SmartEmphasisExtension
+from markdown.extensions.tables import TableExtension
+from markdown.extensions.nl2br import Nl2BrExtension
+
+import gfm
+
+
+class GithubFlavoredMarkdownExtension(Extension):
+    """
+    An extension that is as compatible as possible with GitHub-flavored
+    Markdown (GFM).
+
+    This extension aims to be compatible with the variant of GFM that GitHub
+    uses for Markdown-formatted gists and files (including READMEs). This
+    variant seems to have all the extensions described in the `GFM
+    documentation`_, except:
+
+    - Newlines in paragraphs are not transformed into ``br`` tags.
+    - Intra-GitHub links to commits, repositories, and issues are not
+      supported.
+
+    If you need support for features specific to GitHub comments and issues,
+    please use :class:`mdx_gfm.GithubFlavoredMarkdownExtension`.
+
+    .. _GFM documentation: https://guides.github.com/features/mastering-markdown/
+    """
+
+    def extendMarkdown(self, md, md_globals):
+        # Built-in extensions
+        FencedCodeExtension().extendMarkdown(md, md_globals)
+        SmartEmphasisExtension().extendMarkdown(md, md_globals)
+        TableExtension().extendMarkdown(md, md_globals)
+
+        # Custom extensions
+        gfm.AutolinkExtension().extendMarkdown(md, md_globals)
+        gfm.AutomailExtension().extendMarkdown(md, md_globals)
+        gfm.HiddenHiliteExtension([
+            ('guess_lang', 'False'),
+            ('css_class', 'highlight')
+        ]).extendMarkdown(md, md_globals)
+        gfm.SemiSaneListExtension().extendMarkdown(md, md_globals)
+        gfm.SpacedLinkExtension().extendMarkdown(md, md_globals)
+        gfm.StrikethroughExtension().extendMarkdown(md, md_globals)
+        gfm.TaskListExtension([
+            ('list_attrs', {'class': 'checkbox'})
+        ]).extendMarkdown(md, md_globals)
+        Nl2BrExtension().extendMarkdown(md, md_globals)
 
 
 # Global Vars

rhodecode/lib/markup_renderer.py

@@ -500,38 +500,38 b' class MarkupRenderer(object):'
             (body, resources) = html_exporter.from_notebook_node(notebook)
             header = '<!-- ## IPYTHON NOTEBOOK RENDERING ## -->'
             js = MakoTemplate(r'''
-            <!-- Load mathjax -->
-                <!-- MathJax configuration -->
-                <script type="text/x-mathjax-config">
-                MathJax.Hub.Config({
-                    jax: ["input/TeX","output/HTML-CSS", "output/PreviewHTML"],
-                    extensions: ["tex2jax.js","MathMenu.js","MathZoom.js", "fast-preview.js", "AssistiveMML.js", "[Contrib]/a11y/accessibility-menu.js"],
-                    TeX: {
-                        extensions: ["AMSmath.js","AMSsymbols.js","noErrors.js","noUndefined.js"]
-                    },
-                    tex2jax: {
-                        inlineMath: [ ['$','$'], ["\\(","\\)"] ],
-                        displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
-                        processEscapes: true,
-                        processEnvironments: true
-                    },
-                    // Center justify equations in code and markdown cells. Elsewhere
-                    // we use CSS to left justify single line equations in code cells.
-                    displayAlign: 'center',
-                    "HTML-CSS": {
-                        styles: {'.MathJax_Display': {"margin": 0}},
-                        linebreaks: { automatic: true },
-                        availableFonts: ["STIX", "TeX"]
-                    },
-                    showMathMenu: false
-                });
-                </script>
-                <!-- End of mathjax configuration -->
-                <script src="${h.asset('js/src/math_jax/MathJax.js')}"></script>
+            <!-- MathJax configuration -->
+            <script type="text/x-mathjax-config">
+            MathJax.Hub.Config({
+                jax: ["input/TeX","output/HTML-CSS", "output/PreviewHTML"],
+                extensions: ["tex2jax.js","MathMenu.js","MathZoom.js", "fast-preview.js", "AssistiveMML.js", "[Contrib]/a11y/accessibility-menu.js"],
+                TeX: {
+                    extensions: ["AMSmath.js","AMSsymbols.js","noErrors.js","noUndefined.js"]
+                },
+                tex2jax: {
+                    inlineMath: [ ['$','$'], ["\\(","\\)"] ],
+                    displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
+                    processEscapes: true,
+                    processEnvironments: true
+                },
+                // Center justify equations in code and markdown cells. Elsewhere
+                // we use CSS to left justify single line equations in code cells.
+                displayAlign: 'center',
+                "HTML-CSS": {
+                    styles: {'.MathJax_Display': {"margin": 0}},
+                    linebreaks: { automatic: true },
+                    availableFonts: ["STIX", "TeX"]
+                },
+                showMathMenu: false
+            });
+            </script>
+            <!-- End of MathJax configuration -->
+            <script src="${h.asset('js/src/math_jax/MathJax.js')}"></script>
             ''').render(h=helpers)
 
-            css = '<style>{}</style>'.format(
-                ''.join(_sanitize_resources(resources['inlining']['css'])))
+            css = MakoTemplate(r'''
+            <link rel="stylesheet" type="text/css" href="${h.asset('css/style-ipython.css', ver=ver)}" media="screen"/>
+            ''').render(h=helpers, ver='ver1')
 
             body = '\n'.join([header, css, js, body])
             return body, resources

rhodecode/lib/middleware/simplegit.py

@@ -142,7 +142,7 b' class SimpleGit(simplevcs.SimpleVCS):'
         return self.scm_app.create_git_wsgi_app(
             repo_path, repo_name, config)
 
-    def _create_config(self, extras, repo_name):
+    def _create_config(self, extras, repo_name, scheme='http'):
         extras['git_update_server_info'] = utils2.str2bool(
             rhodecode.CONFIG.get('git_update_server_info'))
 
@@ -152,4 +152,5 b' class SimpleGit(simplevcs.SimpleVCS):'
         extras['git_lfs_enabled'] = utils2.str2bool(
             config.get('vcs_git_lfs', 'enabled'))
         extras['git_lfs_store_path'] = custom_store or default_lfs_store()
+        extras['git_lfs_http_scheme'] = scheme
         return extras

rhodecode/lib/middleware/simplehg.py

@@ -153,7 +153,7 b' class SimpleHg(simplevcs.SimpleVCS):'
     def _create_wsgi_app(self, repo_path, repo_name, config):
         return self.scm_app.create_hg_wsgi_app(repo_path, repo_name, config)
 
-    def _create_config(self, extras, repo_name):
+    def _create_config(self, extras, repo_name, scheme='http'):
         config = utils.make_db_config(repo=repo_name)
         config.set('rhodecode', 'RC_SCM_DATA', json.dumps(extras))
 

rhodecode/lib/middleware/simplesvn.py

@@ -87,20 +87,22 b' class SimpleSvnApp(object):'
             stream = True
 
         stream = stream
-        log.debug(
-            'Calling SVN PROXY: method:%s via `%s`, Stream: %s',
-            req_method, path_info, stream)
-        response = requests.request(
-            req_method, path_info,
-            data=data, headers=request_headers, stream=stream)
+        log.debug('Calling SVN PROXY at `%s`, using method:%s. Stream: %s',
+                  path_info, req_method, stream)
+        try:
+            response = requests.request(
+                req_method, path_info,
+                data=data, headers=request_headers, stream=stream)
+        except requests.ConnectionError:
+            log.exception('ConnectionError occurred for endpoint %s', path_info)
+            raise
 
         if response.status_code not in [200, 401]:
+            text = '\n{}'.format(response.text) if response.text else ''
             if response.status_code >= 500:
-                log.error('Got SVN response:%s with text:\n`%s`',
-                          response, response.text)
+                log.error('Got SVN response:%s with text:`%s`', response, text)
             else:
-                log.debug('Got SVN response:%s with text:\n`%s`',
-                          response, response.text)
+                log.debug('Got SVN response:%s with text:`%s`', response, text)
         else:
             log.debug('got response code: %s', response.status_code)
 
@@ -217,7 +219,7 b' class SimpleSvn(simplevcs.SimpleVCS):'
         conf = self.repo_vcs_config
         return str2bool(conf.get('vcs_svn_proxy', 'http_requests_enabled'))
 
-    def _create_config(self, extras, repo_name):
+    def _create_config(self, extras, repo_name, scheme='http'):
         conf = self.repo_vcs_config
         server_url = conf.get('vcs_svn_proxy', 'http_server_url')
         server_url = server_url or self.DEFAULT_HTTP_SERVER

rhodecode/lib/middleware/simplevcs.py

@@ -360,6 +360,13 b' class SimpleVCS(object):'
 
         return perm_result
 
+    def _get_http_scheme(self, environ):
+        try:
+            return environ['wsgi.url_scheme']
+        except Exception:
+            log.exception('Failed to read http scheme')
+            return 'http'
+
     def _check_ssl(self, environ, start_response):
         """
         Checks the SSL check flag and returns False if SSL is not present
@@ -597,7 +604,9 b' class SimpleVCS(object):'
             extras, environ, action, txn_id=txn_id)
         log.debug('HOOKS extras is %s', extras)
 
-        config = self._create_config(extras, self.acl_repo_name)
+        http_scheme = self._get_http_scheme(environ)
+
+        config = self._create_config(extras, self.acl_repo_name, scheme=http_scheme)
         app = self._create_wsgi_app(repo_path, self.url_repo_name, config)
         with callback_daemon:
             app.rc_extras = extras
@@ -643,7 +652,7 b' class SimpleVCS(object):'
         """Return the WSGI app that will finally handle the request."""
         raise NotImplementedError()
 
-    def _create_config(self, extras, repo_name):
+    def _create_config(self, extras, repo_name, scheme='http'):
         """Create a safe config representation."""
         raise NotImplementedError()
 

rhodecode/lib/user_sessions.py

@@ -23,6 +23,7 b' import re'
 import time
 import datetime
 import dateutil
+import pickle
 
 from rhodecode.model.db import DbSession, Session
 
@@ -142,7 +143,6 b' class FileAuthSessions(BaseAuthSessions)'
         return stats['callbacks']
 
 
-
 class MemcachedAuthSessions(BaseAuthSessions):
     SESSION_TYPE = 'ext:memcached'
     _key_regex = re.compile(r'ITEM (.*_session) \[(.*); (.*)\]')
@@ -195,6 +195,43 b' class MemcachedAuthSessions(BaseAuthSess'
         raise CleanupCommand('Cleanup for this session type not yet available')
 
 
+class RedisAuthSessions(BaseAuthSessions):
+    SESSION_TYPE = 'ext:redis'
+
+    def _get_client(self):
+        import redis
+        args = {
+            'socket_timeout': 60,
+            'url': self.config.get('beaker.session.url')
+        }
+
+        client = redis.StrictRedis.from_url(**args)
+        return client
+
+    def get_count(self):
+        client = self._get_client()
+        return len(client.keys('beaker_cache:*'))
+
+    def get_expired_count(self, older_than_seconds=None):
+        expiry_date = self._seconds_to_date(older_than_seconds)
+        return self.NOT_AVAILABLE
+
+    def clean_sessions(self, older_than_seconds=None):
+        client = self._get_client()
+        expiry_time = time.time() - older_than_seconds
+        deleted_keys = 0
+        for key in client.keys('beaker_cache:*'):
+            data = client.get(key)
+            if data:
+                json_data = pickle.loads(data)
+                accessed_time = json_data['_accessed_time']
+                if accessed_time < expiry_time:
+                    client.delete(key)
+                    deleted_keys += 1
+
+        return deleted_keys
+
+
 class MemoryAuthSessions(BaseAuthSessions):
     SESSION_TYPE = 'memory'
 
@@ -212,6 +249,7 b' def get_session_handler(session_type):'
     types = {
         'file': FileAuthSessions,
         'ext:memcached': MemcachedAuthSessions,
+        'ext:redis': RedisAuthSessions,
         'ext:database': DbAuthSessions,
         'memory': MemoryAuthSessions
     }

rhodecode/lib/utils.py

@@ -371,7 +371,8 b' def config_data_from_db(clear_session=Tr'
             config.append((
                 safe_str(setting.section), safe_str(setting.key), False))
     log.debug(
-        'settings ui from db: %s',
+        'settings ui from db@repo[%s]: %s',
+        repo,
         ','.join(map(lambda s: '[{}] {}={}'.format(*s), ui_data)))
     if clear_session:
         meta.Session.remove()

rhodecode/lib/vcs/backends/base.py

@@ -33,6 +33,8 b' import collections'
 import warnings
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
+from zope.cachedescriptors.property import CachedProperty
+
 from pyramid import compat
 
 from rhodecode.translation import lazy_ugettext
@@ -53,6 +55,7 b' log = logging.getLogger(__name__)'
 
 FILEMODE_DEFAULT = 0o100644
 FILEMODE_EXECUTABLE = 0o100755
+EMPTY_COMMIT_ID = '0' * 40
 
 Reference = collections.namedtuple('Reference', ('type', 'name', 'commit_id'))
 
@@ -161,7 +164,7 b' class MergeResponse(object):'
             u'This pull request cannot be merged because the source contains '
             u'more branches than the target.'),
         MergeFailureReason.HG_TARGET_HAS_MULTIPLE_HEADS: lazy_ugettext(
-            u'This pull request cannot be merged because the target '
+            u'This pull request cannot be merged because the target `{target_ref.name}` '
             u'has multiple heads: `{heads}`.'),
         MergeFailureReason.TARGET_IS_LOCKED: lazy_ugettext(
             u'This pull request cannot be merged because the target repository is '
@@ -261,6 +264,7 b' class BaseRepository(object):'
     EMPTY_COMMIT_ID = '0' * 40
 
     path = None
+    _commit_ids_ver = 0
 
     def __init__(self, repo_path, config=None, create=False, **kwargs):
         """
@@ -309,6 +313,9 b' class BaseRepository(object):'
     def _remote(self):
         raise NotImplementedError
 
+    def _heads(self, branch=None):
+        return []
+
     @LazyProperty
     def EMPTY_COMMIT(self):
         return EmptyCommit(self.EMPTY_COMMIT_ID)
@@ -380,7 +387,7 b' class BaseRepository(object):'
         return commit.size
 
     def is_empty(self):
-        return not bool(self.commit_ids)
+        return self._remote.is_empty()
 
     @staticmethod
     def check_url(url, config):
@@ -401,6 +408,15 b' class BaseRepository(object):'
     # COMMITS
     # ==========================================================================
 
+    @CachedProperty('_commit_ids_ver')
+    def commit_ids(self):
+        raise NotImplementedError
+
+    def append_commit_id(self, commit_id):
+        if commit_id not in self.commit_ids:
+            self._rebuild_cache(self.commit_ids + [commit_id])
+            self._commit_ids_ver = time.time()
+
     def get_commit(self, commit_id=None, commit_idx=None, pre_load=None, translate_tag=None):
         """
         Returns instance of `BaseCommit` class. If `commit_id` and `commit_idx`
@@ -1091,12 +1107,12 b' class BaseCommit(object):'
         """
         return None
 
-    def archive_repo(self, file_path, kind='tgz', subrepos=None,
-                     prefix=None, write_metadata=False, mtime=None):
+    def archive_repo(self, archive_dest_path, kind='tgz', subrepos=None,
+                     prefix=None, write_metadata=False, mtime=None, archive_at_path='/'):
         """
         Creates an archive containing the contents of the repository.
 
-        :param file_path: path to the file which to create the archive.
+        :param archive_dest_path: path to the file which to create the archive.
         :param kind: one of following: ``"tbz2"``, ``"tgz"``, ``"zip"``.
         :param prefix: name of root directory in archive.
             Default is repository name and commit's short_id joined with dash:
@@ -1104,10 +1120,11 b' class BaseCommit(object):'
         :param write_metadata: write a metadata file into archive.
         :param mtime: custom modification time for archive creation, defaults
             to time.time() if not given.
+        :param archive_at_path: pack files at this path (default '/')
 
         :raise VCSError: If prefix has a problem.
         """
-        allowed_kinds = settings.ARCHIVE_SPECS.keys()
+        allowed_kinds = [x[0] for x in settings.ARCHIVE_SPECS]
         if kind not in allowed_kinds:
             raise ImproperArchiveTypeError(
                 'Archive kind (%s) not supported use one of %s' %
@@ -1115,11 +1132,11 b' class BaseCommit(object):'
 
         prefix = self._validate_archive_prefix(prefix)
 
-        mtime = mtime or time.mktime(self.date.timetuple())
+        mtime = mtime is not None or time.mktime(self.date.timetuple())
 
         file_info = []
         cur_rev = self.repository.get_commit(commit_id=self.raw_id)
-        for _r, _d, files in cur_rev.walk('/'):
+        for _r, _d, files in cur_rev.walk(archive_at_path):
             for f in files:
                 f_path = os.path.join(prefix, f.path)
                 file_info.append(
@@ -1128,15 +1145,15 b' class BaseCommit(object):'
         if write_metadata:
             metadata = [
                 ('repo_name', self.repository.name),
-                ('rev', self.raw_id),
-                ('create_time', mtime),
+                ('commit_id', self.raw_id),
+                ('mtime', mtime),
                 ('branch', self.branch),
                 ('tags', ','.join(self.tags)),
             ]
             meta = ["%s:%s" % (f_name, value) for f_name, value in metadata]
             file_info.append(('.archival.txt', 0o644, False, '\n'.join(meta)))
 
-        connection.Hg.archive_repo(file_path, mtime, file_info, kind)
+        connection.Hg.archive_repo(archive_dest_path, mtime, file_info, kind)
 
     def _validate_archive_prefix(self, prefix):
         if prefix is None:
@@ -1505,9 +1522,7 b' class BaseInMemoryCommit(object):'
                 "Cannot remove node at %s from "
                 "following parents: %s" % (not_removed, parents))
 
-    def commit(
-            self, message, author, parents=None, branch=None, date=None,
-            **kwargs):
+    def commit(self, message, author, parents=None, branch=None, date=None, **kwargs):
         """
         Performs in-memory commit (doesn't check workdir in any way) and
         returns newly created :class:`BaseCommit`. Updates repository's
@@ -1555,7 +1570,7 b' class EmptyCommit(BaseCommit):'
     """
 
     def __init__(
-            self, commit_id='0' * 40, repo=None, alias=None, idx=-1,
+            self, commit_id=EMPTY_COMMIT_ID, repo=None, alias=None, idx=-1,
             message='', author='', date=None):
         self._empty_commit_id = commit_id
         # TODO: johbo: Solve idx parameter, default value does not make
@@ -1615,7 +1630,7 b' class EmptyChangeset(EmptyCommit):'
             "Use EmptyCommit instead of EmptyChangeset", DeprecationWarning)
         return super(EmptyCommit, cls).__new__(cls, *args, **kwargs)
 
-    def __init__(self, cs='0' * 40, repo=None, requested_revision=None,
+    def __init__(self, cs=EMPTY_COMMIT_ID, repo=None, requested_revision=None,
                  alias=None, revision=-1, message='', author='', date=None):
         if requested_revision is not None:
             warnings.warn(

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

@@ -234,8 +234,7 b' class GitCommit(base.BaseCommit):'
         path = self._fix_path(path)
         if self._get_kind(path) != NodeKind.FILE:
             raise CommitError(
-                "File does not exist for commit %s at  '%s'" %
-                (self.raw_id, path))
+                "File does not exist for commit %s at  '%s'" % (self.raw_id, path))
         return path
 
     def _get_file_nodes(self):
@@ -353,8 +352,7 b' class GitCommit(base.BaseCommit):'
     def get_nodes(self, path):
         if self._get_kind(path) != NodeKind.DIR:
             raise CommitError(
-                "Directory does not exist for commit %s at "
-                " '%s'" % (self.raw_id, path))
+                "Directory does not exist for commit %s at '%s'" % (self.raw_id, path))
         path = self._fix_path(path)
         id_, _ = self._get_id_for_path(path)
         tree_id = self._remote[id_]['id']

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

@@ -29,8 +29,7 b' from rhodecode.lib.vcs.backends import b'
 
 class GitInMemoryCommit(base.BaseInMemoryCommit):
 
-    def commit(self, message, author, parents=None, branch=None, date=None,
-               **kwargs):
+    def commit(self, message, author, parents=None, branch=None, date=None, **kwargs):
         """
         Performs in-memory commit (doesn't check workdir in any way) and
         returns newly created `GitCommit`. Updates repository's
@@ -94,12 +93,12 b' class GitInMemoryCommit(base.BaseInMemor'
             commit_data, branch, commit_tree, updated, removed)
 
         # Update vcs repository object
-        self.repository.commit_ids.append(commit_id)
-        self.repository._rebuild_cache(self.repository.commit_ids)
+        self.repository.append_commit_id(commit_id)
 
         # invalidate parsed refs after commit
         self.repository._refs = self.repository._get_refs()
         self.repository.branches = self.repository._get_branches()
-        tip = self.repository.get_commit()
+        tip = self.repository.get_commit(commit_id)
+
         self.reset()
         return tip

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

@@ -25,8 +25,10 b' GIT repository module'
 import logging
 import os
 import re
+import time
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
+from zope.cachedescriptors.property import CachedProperty
 
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.datelib import (
@@ -69,6 +71,9 b' class GitRepository(BaseRepository):'
         # caches
         self._commit_ids = {}
 
+        # dependent that trigger re-computation of  commit_ids
+        self._commit_ids_ver = 0
+
     @LazyProperty
     def _remote(self):
         return connection.Git(self.path, self.config, with_wire=self.with_wire)
@@ -81,7 +86,7 b' class GitRepository(BaseRepository):'
     def head(self):
         return self._remote.head()
 
-    @LazyProperty
+    @CachedProperty('_commit_ids_ver')
     def commit_ids(self):
         """
         Returns list of commit ids, in ascending order.  Being lazy
@@ -222,13 +227,10 b' class GitRepository(BaseRepository):'
             return []
         return output.splitlines()
 
-    def _get_commit_id(self, commit_id_or_idx):
+    def _lookup_commit(self, commit_id_or_idx, translate_tag=True):
         def is_null(value):
             return len(value) == commit_id_or_idx.count('0')
 
-        if self.is_empty():
-            raise EmptyRepositoryError("There are no commits yet")
-
         if commit_id_or_idx in (None, '', 'tip', 'HEAD', 'head', -1):
             return self.commit_ids[-1]
 
@@ -238,8 +240,7 b' class GitRepository(BaseRepository):'
             try:
                 commit_id_or_idx = self.commit_ids[int(commit_id_or_idx)]
             except Exception:
-                msg = "Commit %s does not exist for %s" % (
-                    commit_id_or_idx, self)
+                msg = "Commit {} does not exist for `{}`".format(commit_id_or_idx, self.name)
                 raise CommitDoesNotExistError(msg)
 
         elif is_bstr:
@@ -261,8 +262,7 b' class GitRepository(BaseRepository):'
 
             if (not SHA_PATTERN.match(commit_id_or_idx) or
                     commit_id_or_idx not in self.commit_ids):
-                msg = "Commit %s does not exist for %s" % (
-                    commit_id_or_idx, self)
+                msg = "Commit {} does not exist for `{}`".format(commit_id_or_idx, self.name)
                 raise CommitDoesNotExistError(msg)
 
         # Ensure we return full id
@@ -431,19 +431,42 b' class GitRepository(BaseRepository):'
         Returns `GitCommit` object representing commit from git repository
         at the given `commit_id` or head (most recent commit) if None given.
         """
+        if self.is_empty():
+            raise EmptyRepositoryError("There are no commits yet")
+
         if commit_id is not None:
             self._validate_commit_id(commit_id)
+            try:
+                # we have cached idx, use it without contacting the remote
+                idx = self._commit_ids[commit_id]
+                return GitCommit(self, commit_id, idx, pre_load=pre_load)
+            except KeyError:
+                pass
+
         elif commit_idx is not None:
             self._validate_commit_idx(commit_idx)
-            commit_id = commit_idx
-        commit_id = self._get_commit_id(commit_id)
+            try:
+                _commit_id = self.commit_ids[commit_idx]
+                if commit_idx < 0:
+                    commit_idx = self.commit_ids.index(_commit_id)
+                return GitCommit(self, _commit_id, commit_idx, pre_load=pre_load)
+            except IndexError:
+                commit_id = commit_idx
+        else:
+            commit_id = "tip"
+
+        commit_id = self._lookup_commit(commit_id)
+        remote_idx = None
+        if translate_tag:
+            # Need to call remote to translate id for tagging scenario
+            remote_data = self._remote.get_object(commit_id)
+            commit_id = remote_data["commit_id"]
+            remote_idx = remote_data["idx"]
+
         try:
-            if translate_tag:
-                # Need to call remote to translate id for tagging scenario
-                commit_id = self._remote.get_object(commit_id)["commit_id"]
             idx = self._commit_ids[commit_id]
         except KeyError:
-            raise RepositoryError("Cannot get object with id %s" % commit_id)
+            idx = remote_idx or 0
 
         return GitCommit(self, commit_id, idx, pre_load=pre_load)
 
@@ -472,6 +495,7 b' class GitRepository(BaseRepository):'
         """
         if self.is_empty():
             raise EmptyRepositoryError("There are no commits yet")
+
         self._validate_branch_name(branch_name)
 
         if start_id is not None:
@@ -479,9 +503,9 b' class GitRepository(BaseRepository):'
         if end_id is not None:
             self._validate_commit_id(end_id)
 
-        start_raw_id = self._get_commit_id(start_id)
+        start_raw_id = self._lookup_commit(start_id)
         start_pos = self._commit_ids[start_raw_id] if start_id else None
-        end_raw_id = self._get_commit_id(end_id)
+        end_raw_id = self._lookup_commit(end_id)
         end_pos = max(0, self._commit_ids[end_raw_id]) if end_id else None
 
         if None not in [start_id, end_id] and start_pos > end_pos:
@@ -589,8 +613,9 b' class GitRepository(BaseRepository):'
         commit = commit.parents[0]
         self._remote.set_refs('refs/heads/%s' % branch_name, commit.raw_id)
 
-        self.commit_ids = self._get_all_commit_ids()
-        self._rebuild_cache(self.commit_ids)
+        self._commit_ids_ver = time.time()
+        # we updated _commit_ids_ver so accessing self.commit_ids will re-compute it
+        return len(self.commit_ids)
 
     def get_common_ancestor(self, commit_id1, commit_id2, repo2):
         if commit_id1 == commit_id2:

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

@@ -193,13 +193,6 b' class MercurialCommit(base.BaseCommit):'
         children = self._remote.ctx_children(self.idx)
         return self._make_commits(children)
 
-    def diff(self, ignore_whitespace=True, context=3):
-        result = self._remote.ctx_diff(
-            self.idx,
-            git=True, ignore_whitespace=ignore_whitespace, context=context)
-        diff = ''.join(result)
-        return MercurialDiff(diff)
-
     def _fix_path(self, path):
         """
         Mercurial keeps filenodes as str so we need to encode from unicode

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

@@ -30,8 +30,7 b' from rhodecode.lib.vcs.exceptions import'
 
 class MercurialInMemoryCommit(BaseInMemoryCommit):
 
-    def commit(self, message, author, parents=None, branch=None, date=None,
-               **kwargs):
+    def commit(self, message, author, parents=None, branch=None, date=None, **kwargs):
         """
         Performs in-memory commit (doesn't check workdir in any way) and
         returns newly created `MercurialCommit`. Updates repository's
@@ -83,15 +82,14 b' class MercurialInMemoryCommit(BaseInMemo'
 
         date, tz = date_to_timestamp_plus_offset(date)
 
-        new_id = self.repository._remote.commitctx(
+        commit_id = self.repository._remote.commitctx(
             message=message, parents=parent_ids,
             commit_time=date, commit_timezone=tz, user=author,
             files=self.get_paths(), extra=kwargs, removed=removed,
             updated=updated)
+        self.repository.append_commit_id(commit_id)
 
-        self.repository.commit_ids.append(new_id)
-        self.repository._rebuild_cache(self.repository.commit_ids)
         self.repository.branches = self.repository._get_branches()
-        tip = self.repository.get_commit()
+        tip = self.repository.get_commit(commit_id)
         self.reset()
         return tip

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

@@ -24,9 +24,11 b' HG repository module'
 import os
 import logging
 import binascii
+import time
 import urllib
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
+from zope.cachedescriptors.property import CachedProperty
 
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.datelib import (
@@ -85,11 +87,14 b' class MercurialRepository(BaseRepository'
         # caches
         self._commit_ids = {}
 
+        # dependent that trigger re-computation of  commit_ids
+        self._commit_ids_ver = 0
+
     @LazyProperty
     def _remote(self):
         return connection.Hg(self.path, self.config, with_wire=self.with_wire)
 
-    @LazyProperty
+    @CachedProperty('_commit_ids_ver')
     def commit_ids(self):
         """
         Returns list of commit ids, in ascending order.  Being lazy
@@ -157,8 +162,7 b' class MercurialRepository(BaseRepository'
 
         return OrderedDict(sorted(_tags, key=get_name, reverse=True))
 
-    def tag(self, name, user, commit_id=None, message=None, date=None,
-            **kwargs):
+    def tag(self, name, user, commit_id=None, message=None, date=None, **kwargs):
         """
         Creates and returns a tag for the given ``commit_id``.
 
@@ -172,6 +176,7 b' class MercurialRepository(BaseRepository'
         """
         if name in self.tags:
             raise TagAlreadyExistError("Tag %s already exists" % name)
+
         commit = self.get_commit(commit_id=commit_id)
         local = kwargs.setdefault('local', False)
 
@@ -180,8 +185,7 b' class MercurialRepository(BaseRepository'
 
         date, tz = date_to_timestamp_plus_offset(date)
 
-        self._remote.tag(
-            name, commit.raw_id, message, local, user, date, tz)
+        self._remote.tag(name, commit.raw_id, message, local, user, date, tz)
         self._remote.invalidate_vcs_cache()
 
         # Reinitialize tags
@@ -203,6 +207,7 b' class MercurialRepository(BaseRepository'
         """
         if name not in self.tags:
             raise TagDoesNotExistError("Tag %s does not exist" % name)
+
         if message is None:
             message = "Removed tag %s" % name
         local = False
@@ -271,8 +276,9 b' class MercurialRepository(BaseRepository'
         self._remote.strip(commit_id, update=False, backup="none")
 
         self._remote.invalidate_vcs_cache()
-        self.commit_ids = self._get_all_commit_ids()
-        self._rebuild_cache(self.commit_ids)
+        self._commit_ids_ver = time.time()
+        # we updated _commit_ids_ver so accessing self.commit_ids will re-compute it
+        return len(self.commit_ids)
 
     def verify(self):
         verify = self._remote.verify()
@@ -425,18 +431,20 b' class MercurialRepository(BaseRepository'
         if commit_id is not None:
             self._validate_commit_id(commit_id)
             try:
+                # we have cached idx, use it without contacting the remote
                 idx = self._commit_ids[commit_id]
                 return MercurialCommit(self, commit_id, idx, pre_load=pre_load)
             except KeyError:
                 pass
+
         elif commit_idx is not None:
             self._validate_commit_idx(commit_idx)
             try:
-                id_ = self.commit_ids[commit_idx]
+                _commit_id = self.commit_ids[commit_idx]
                 if commit_idx < 0:
-                    commit_idx += len(self.commit_ids)
-                return MercurialCommit(
-                    self, id_, commit_idx, pre_load=pre_load)
+                    commit_idx = self.commit_ids.index(_commit_id)
+
+                return MercurialCommit(self, _commit_id, commit_idx, pre_load=pre_load)
             except IndexError:
                 commit_id = commit_idx
         else:
@@ -448,8 +456,8 b' class MercurialRepository(BaseRepository'
         try:
             raw_id, idx = self._remote.lookup(commit_id, both=True)
         except CommitDoesNotExistError:
-            msg = "Commit %s does not exist for %s" % (
-                commit_id, self)
+            msg = "Commit {} does not exist for `{}`".format(
+                *map(safe_str, [commit_id, self.name]))
             raise CommitDoesNotExistError(msg)
 
         return MercurialCommit(self, raw_id, idx, pre_load=pre_load)
@@ -477,11 +485,11 b' class MercurialRepository(BaseRepository'
           ``end`` could not be found.
         """
         # actually we should check now if it's not an empty repo
-        branch_ancestors = False
         if self.is_empty():
             raise EmptyRepositoryError("There are no commits yet")
         self._validate_branch_name(branch_name)
 
+        branch_ancestors = False
         if start_id is not None:
             self._validate_commit_id(start_id)
             c_start = self.get_commit(commit_id=start_id)
@@ -715,11 +723,16 b' class MercurialRepository(BaseRepository'
 
         try:
             if target_ref.type == 'branch' and len(self._heads(target_ref.name)) != 1:
-                heads = ','.join(self._heads(target_ref.name))
+                heads = '\n,'.join(self._heads(target_ref.name))
+                metadata = {
+                    'target_ref': target_ref,
+                    'source_ref': source_ref,
+                    'heads': heads
+                }
                 return MergeResponse(
                     False, False, None,
                     MergeFailureReason.HG_TARGET_HAS_MULTIPLE_HEADS,
-                    metadata={'heads': heads})
+                    metadata=metadata)
         except CommitDoesNotExistError:
             log.exception('Failure when looking up branch heads on hg target')
             return MergeResponse(
@@ -892,11 +905,15 b' class MercurialRepository(BaseRepository'
 
         def read_patterns(suffix):
             svalue = None
-            try:
-                svalue = hgacl.get('narrowhgacl', username + suffix)
-            except configparser.NoOptionError:
+            for section, option in [
+                ('narrowacl', username + suffix),
+                ('narrowacl', 'default' + suffix),
+                ('narrowhgacl', username + suffix),
+                ('narrowhgacl', 'default' + suffix)
+            ]:
                 try:
-                    svalue = hgacl.get('narrowhgacl', 'default' + suffix)
+                    svalue = hgacl.get(section, option)
+                    break  # stop at the first value we find
                 except configparser.NoOptionError:
                     pass
             if not svalue:

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

@@ -30,8 +30,7 b' from rhodecode.lib.vcs.backends import b'
 
 class SubversionInMemoryCommit(base.BaseInMemoryCommit):
 
-    def commit(self, message, author, parents=None, branch=None, date=None,
-               **kwargs):
+    def commit(self, message, author, parents=None, branch=None, date=None, **kwargs):
         if branch not in (None, self.repository.DEFAULT_BRANCH_NAME):
             raise NotImplementedError("Branches are not yet supported")
 
@@ -74,8 +73,7 b' class SubversionInMemoryCommit(base.Base'
         # we should not add the commit_id, if it is already evaluated, it
         # will not be evaluated again.
         commit_id = str(svn_rev)
-        if commit_id not in self.repository.commit_ids:
-            self.repository.commit_ids.append(commit_id)
+        self.repository.append_commit_id(commit_id)
         tip = self.repository.get_commit()
         self.reset()
         return tip

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

@@ -27,6 +27,7 b' import os'
 import urllib
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
+from zope.cachedescriptors.property import CachedProperty
 
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.datelib import date_astimestamp
@@ -75,6 +76,9 b' class SubversionRepository(base.BaseRepo'
 
         self._init_repo(create, src_url)
 
+        # dependent that trigger re-computation of  commit_ids
+        self._commit_ids_ver = 0
+
     @LazyProperty
     def _remote(self):
         return connection.Svn(self.path, self.config)
@@ -93,11 +97,31 b' class SubversionRepository(base.BaseRepo'
         else:
             self._check_path()
 
-    @LazyProperty
+    @CachedProperty('_commit_ids_ver')
     def commit_ids(self):
         head = self._remote.lookup(None)
         return [str(r) for r in xrange(1, head + 1)]
 
+    def _rebuild_cache(self, commit_ids):
+        pass
+
+    def run_svn_command(self, cmd, **opts):
+        """
+        Runs given ``cmd`` as svn command and returns tuple
+        (stdout, stderr).
+
+        :param cmd: full svn command to be executed
+        :param opts: env options to pass into Subprocess command
+        """
+        if not isinstance(cmd, list):
+            raise ValueError('cmd must be a list, got %s instead' % type(cmd))
+
+        skip_stderr_log = opts.pop('skip_stderr_log', False)
+        out, err = self._remote.run_svn_command(cmd, **opts)
+        if err and not skip_stderr_log:
+            log.debug('Stderr output of svn command "%s":\n%s', cmd, err)
+        return out, err
+
     @LazyProperty
     def branches(self):
         return self._tags_or_branches('vcs_svn_branch')
@@ -260,7 +284,7 b' class SubversionRepository(base.BaseRepo'
             try:
                 commit_id = self.commit_ids[commit_idx]
             except IndexError:
-                raise CommitDoesNotExistError
+                raise CommitDoesNotExistError('No commit with idx: {}'.format(commit_idx))
 
         commit_id = self._sanitize_commit_id(commit_id)
         commit = SubversionCommit(repository=self, commit_id=commit_id)

rhodecode/lib/vcs/conf/settings.py

@@ -42,12 +42,16 b' BACKENDS = {'
     'svn': 'rhodecode.lib.vcs.backends.svn.SubversionRepository',
 }
 
-# TODO: Remove once controllers/files.py is adjusted
-ARCHIVE_SPECS = {
-    'tbz2': ('application/x-bzip2', '.tar.bz2'),
-    'tgz': ('application/x-gzip', '.tar.gz'),
-    'zip': ('application/zip', '.zip'),
-}
+
+ARCHIVE_SPECS = [
+    ('tbz2', 'application/x-bzip2', 'tbz2'),
+    ('tbz2', 'application/x-bzip2', '.tar.bz2'),
+
+    ('tgz', 'application/x-gzip', '.tgz'),
+    ('tgz', 'application/x-gzip', '.tar.gz'),
+
+    ('zip', 'application/zip', '.zip'),
+]
 
 HOOKS_PROTOCOL = None
 HOOKS_DIRECT_CALLS = False

rhodecode/lib/vcs/utils/helpers.py

@@ -101,23 +101,35 b' def parse_datetime(text):'
     :param text: string of desired date/datetime or something more verbose,
       like *yesterday*, *2weeks 3days*, etc.
     """
+    if not text:
+        raise ValueError('Wrong date: "%s"' % text)
 
-    text = text.strip().lower()
+    if isinstance(text, datetime.datetime):
+        return text
 
-    INPUT_FORMATS = (
+    # we limit a format to no include microseconds e.g 2017-10-17t17:48:23.XXXX
+    text = text.strip().lower()[:19]
+
+    input_formats = (
         '%Y-%m-%d %H:%M:%S',
+        '%Y-%m-%dt%H:%M:%S',
         '%Y-%m-%d %H:%M',
+        '%Y-%m-%dt%H:%M',
         '%Y-%m-%d',
         '%m/%d/%Y %H:%M:%S',
+        '%m/%d/%Yt%H:%M:%S',
         '%m/%d/%Y %H:%M',
+        '%m/%d/%Yt%H:%M',
         '%m/%d/%Y',
         '%m/%d/%y %H:%M:%S',
+        '%m/%d/%yt%H:%M:%S',
         '%m/%d/%y %H:%M',
+        '%m/%d/%yt%H:%M',
         '%m/%d/%y',
     )
-    for format in INPUT_FORMATS:
+    for format_def in input_formats:
         try:
-            return datetime.datetime(*time.strptime(text, format)[:6])
+            return datetime.datetime(*time.strptime(text, format_def)[:6])
         except ValueError:
             pass
 

rhodecode/model/db.py

@@ -25,6 +25,7 b' Database Models for RhodeCode Enterprise'
 import re
 import os
 import time
+import string
 import hashlib
 import logging
 import datetime
@@ -39,7 +40,7 b' from sqlalchemy import ('
     Index, Sequence, UniqueConstraint, ForeignKey, CheckConstraint, Column,
     Boolean, String, Unicode, UnicodeText, DateTime, Integer, LargeBinary,
     Text, Float, PickleType)
-from sqlalchemy.sql.expression import true, false
+from sqlalchemy.sql.expression import true, false, case
 from sqlalchemy.sql.functions import coalesce, count  # pragma: no cover
 from sqlalchemy.orm import (
     relationship, joinedload, class_mapper, validates, aliased)
@@ -50,6 +51,7 b' from sqlalchemy.dialects.mysql import LO'
 from zope.cachedescriptors.property import Lazy as LazyProperty
 from pyramid import compat
 from pyramid.threadlocal import get_current_request
+from webhelpers.text import collapse, remove_formatting
 
 from rhodecode.translation import _
 from rhodecode.lib.vcs import get_vcs_instance
@@ -57,13 +59,13 b' from rhodecode.lib.vcs.backends.base imp'
 from rhodecode.lib.utils2 import (
     str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe,
     time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
-    glob2re, StrictAttributeDict, cleaned_uri)
+    glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time, OrderedDefaultDict)
 from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
     JsonRaw
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.caching_query import FromCache
-from rhodecode.lib.encrypt import AESCipher
-
+from rhodecode.lib.encrypt import AESCipher, validate_and_get_enc_data
+from rhodecode.lib.encrypt2 import Encryptor
 from rhodecode.model.meta import Base, Session
 
 URL_SEP = '/'
@@ -159,44 +161,46 b' class EncryptedTextValue(TypeDecorator):'
     impl = Text
 
     def process_bind_param(self, value, dialect):
-        if not value:
-            return value
-        if value.startswith('enc$aes$') or value.startswith('enc$aes_hmac$'):
-            # protect against double encrypting if someone manually starts
-            # doing
-            raise ValueError('value needs to be in unencrypted format, ie. '
-                             'not starting with enc$aes')
-        return 'enc$aes_hmac$%s' % AESCipher(
-            ENCRYPTION_KEY, hmac=True).encrypt(value)
-
-    def process_result_value(self, value, dialect):
+        """
+        Setter for storing value
+        """
         import rhodecode
-
         if not value:
             return value
 
-        parts = value.split('$', 3)
-        if not len(parts) == 3:
-            # probably not encrypted values
-            return value
+        # protect against double encrypting if values is already encrypted
+        if value.startswith('enc$aes$') \
+                or value.startswith('enc$aes_hmac$') \
+                or value.startswith('enc2$'):
+            raise ValueError('value needs to be in unencrypted format, '
+                             'ie. not starting with enc$ or enc2$')
+
+        algo = rhodecode.CONFIG.get('rhodecode.encrypted_values.algorithm') or 'aes'
+        if algo == 'aes':
+            return 'enc$aes_hmac$%s' % AESCipher(ENCRYPTION_KEY, hmac=True).encrypt(value)
+        elif algo == 'fernet':
+            return Encryptor(ENCRYPTION_KEY).encrypt(value)
         else:
-            if parts[0] != 'enc':
-                # parts ok but without our header ?
-                return value
-            enc_strict_mode = str2bool(rhodecode.CONFIG.get(
-                'rhodecode.encrypted_values.strict') or True)
-            # at that stage we know it's our encryption
-            if parts[1] == 'aes':
-                decrypted_data = AESCipher(ENCRYPTION_KEY).decrypt(parts[2])
-            elif parts[1] == 'aes_hmac':
-                decrypted_data = AESCipher(
-                    ENCRYPTION_KEY, hmac=True,
-                    strict_verification=enc_strict_mode).decrypt(parts[2])
-            else:
-                raise ValueError(
-                    'Encryption type part is wrong, must be `aes` '
-                    'or `aes_hmac`, got `%s` instead' % (parts[1]))
-            return decrypted_data
+            ValueError('Bad encryption algorithm, should be fernet or aes, got: {}'.format(algo))
+
+    def process_result_value(self, value, dialect):
+        """
+        Getter for retrieving value
+        """
+
+        import rhodecode
+        if not value:
+            return value
+
+        algo = rhodecode.CONFIG.get('rhodecode.encrypted_values.algorithm') or 'aes'
+        enc_strict_mode = str2bool(rhodecode.CONFIG.get('rhodecode.encrypted_values.strict') or True)
+        if algo == 'aes':
+            decrypted_data = validate_and_get_enc_data(value, ENCRYPTION_KEY, enc_strict_mode)
+        elif algo == 'fernet':
+            return Encryptor(ENCRYPTION_KEY).decrypt(value)
+        else:
+            ValueError('Bad encryption algorithm, should be fernet or aes, got: {}'.format(algo))
+        return decrypted_data
 
 
 class BaseModel(object):
@@ -407,6 +411,15 b' class RhodeCodeUi(Base, BaseModel):'
     HOOK_PUSH = 'changegroup.push_logger'
     HOOK_PUSH_KEY = 'pushkey.key_push'
 
+    HOOKS_BUILTIN = [
+        HOOK_PRE_PULL,
+        HOOK_PULL,
+        HOOK_PRE_PUSH,
+        HOOK_PRETX_PUSH,
+        HOOK_PUSH,
+        HOOK_PUSH_KEY,
+    ]
+
     # TODO: johbo: Unify way how hooks are configured for git and hg,
     # git part is currently hardcoded.
 
@@ -1665,11 +1678,12 b' class Repository(Base, BaseModel):'
         cascade="all, delete, delete-orphan")
     ui = relationship('RepoRhodeCodeUi', cascade="all")
     settings = relationship('RepoRhodeCodeSetting', cascade="all")
-    integrations = relationship('Integration',
-                                cascade="all, delete, delete-orphan")
+    integrations = relationship('Integration', cascade="all, delete, delete-orphan")
 
     scoped_tokens = relationship('UserApiKeys', cascade="all")
 
+    artifacts = relationship('FileStore', cascade="all")
+
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,
                                    safe_unicode(self.repo_name))
@@ -1717,7 +1731,9 b' class Repository(Base, BaseModel):'
         from rhodecode.lib.vcs.backends.base import EmptyCommit
         dummy = EmptyCommit().__json__()
         if not self._changeset_cache:
-            return dummy
+            dummy['source_repo_id'] = self.repo_id
+            return json.loads(json.dumps(dummy))
+
         try:
             return json.loads(self._changeset_cache)
         except TypeError:
@@ -2170,6 +2186,20 b' class Repository(Base, BaseModel):'
         return make_lock, currently_locked, lock_info
 
     @property
+    def last_commit_cache_update_diff(self):
+        return time.time() - (safe_int(self.changeset_cache.get('updated_on')) or 0)
+
+    @property
+    def last_commit_change(self):
+        from rhodecode.lib.vcs.utils.helpers import parse_datetime
+        empty_date = datetime.datetime.fromtimestamp(0)
+        date_latest = self.changeset_cache.get('date', empty_date)
+        try:
+            return parse_datetime(date_latest)
+        except Exception:
+            return empty_date
+
+    @property
     def last_db_change(self):
         return self.updated_on
 
@@ -2262,6 +2292,7 b' class Repository(Base, BaseModel):'
         """
         Update cache of last changeset for repository, keys should be::
 
+            source_repo_id
             short_id
             raw_id
             revision
@@ -2269,15 +2300,15 b' class Repository(Base, BaseModel):'
             message
             date
             author
-
-        :param cs_cache:
+            updated_on
+
         """
         from rhodecode.lib.vcs.backends.base import BaseChangeset
         if cs_cache is None:
             # use no-cache version here
             scm_repo = self.scm_instance(cache=False, config=config)
 
-            empty = not scm_repo or scm_repo.is_empty()
+            empty = scm_repo is None or scm_repo.is_empty()
             if not empty:
                 cs_cache = scm_repo.get_commit(
                     pre_load=["author", "date", "message", "parents"])
@@ -2297,18 +2328,28 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.utcnow()
             last_change = cs_cache.get('date') or _default
-            if self.updated_on and self.updated_on > last_change:
-                # we check if last update is newer than the new value
-                # if yes, we use the current timestamp instead. Imagine you get
-                # old commit pushed 1y ago, we'd set last update 1y to ago.
-                last_change = _default
-            log.debug('updated repo %s with new cs cache %s',
-                      self.repo_name, cs_cache)
-            self.updated_on = last_change
+            # we check if last update is newer than the new value
+            # if yes, we use the current timestamp instead. Imagine you get
+            # old commit pushed 1y ago, we'd set last update 1y to ago.
+            last_change_timestamp = datetime_to_time(last_change)
+            current_timestamp = datetime_to_time(last_change)
+            if last_change_timestamp > current_timestamp:
+                cs_cache['date'] = _default
+
+            cs_cache['updated_on'] = time.time()
             self.changeset_cache = cs_cache
             Session().add(self)
             Session().commit()
+
+            log.debug('updated repo %s with new commit cache %s',
+                      self.repo_name, cs_cache)
         else:
+            cs_cache = self.changeset_cache
+            cs_cache['updated_on'] = time.time()
+            self.changeset_cache = cs_cache
+            Session().add(self)
+            Session().commit()
+
             log.debug('Skipping update_commit_cache for repo:`%s` '
                       'commit already with latest changes', self.repo_name)
 
@@ -2397,6 +2438,7 b' class Repository(Base, BaseModel):'
         # control over cache behaviour
         if cache is None and full_cache and not config:
             return self._get_instance_cached()
+        # cache here is sent to the "vcs server"
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
@@ -2425,8 +2467,7 b' class Repository(Base, BaseModel):'
             else:
                 instance = get_instance_cached(*args)
 
-            log.debug(
-                'Repo instance fetched in %.3fs', inv_context_manager.compute_time)
+            log.debug('Repo instance fetched in %.3fs', inv_context_manager.compute_time)
             return instance
 
     def _get_instance(self, cache=True, config=None):
@@ -2440,7 +2481,8 b' class Repository(Base, BaseModel):'
             with_wire=custom_wire,
             create=False,
             _vcs_alias=self.repo_type)
-
+        if repo is not None:
+            repo.count()  # cache rebuild
         return repo
 
     def __json__(self):
@@ -2467,7 +2509,8 b' class RepoGroup(Base, BaseModel):'
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
-    group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
+    _group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
+    group_name_hash = Column("repo_group_name_hash", String(1024), nullable=False, unique=False)
     group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
     group_description = Column("group_description", String(10000), nullable=True, unique=None, default=None)
     enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
@@ -2475,6 +2518,8 b' class RepoGroup(Base, BaseModel):'
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     updated_on = Column('updated_on', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
     personal = Column('personal', Boolean(), nullable=True, unique=None, default=None)
+    _changeset_cache = Column(
+        "changeset_cache", LargeBinary(), nullable=True)  # JSON data
 
     repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
     users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
@@ -2490,6 +2535,38 b' class RepoGroup(Base, BaseModel):'
         return u"<%s('id:%s:%s')>" % (
             self.__class__.__name__, self.group_id, self.group_name)
 
+    @hybrid_property
+    def group_name(self):
+        return self._group_name
+
+    @group_name.setter
+    def group_name(self, value):
+        self._group_name = value
+        self.group_name_hash = self.hash_repo_group_name(value)
+
+    @hybrid_property
+    def changeset_cache(self):
+        from rhodecode.lib.vcs.backends.base import EmptyCommit
+        dummy = EmptyCommit().__json__()
+        if not self._changeset_cache:
+            dummy['source_repo_id'] = ''
+            return json.loads(json.dumps(dummy))
+
+        try:
+            return json.loads(self._changeset_cache)
+        except TypeError:
+            return dummy
+        except Exception:
+            log.error(traceback.format_exc())
+            return dummy
+
+    @changeset_cache.setter
+    def changeset_cache(self, val):
+        try:
+            self._changeset_cache = json.dumps(val)
+        except Exception:
+            log.error(traceback.format_exc())
+
     @validates('group_parent_id')
     def validate_group_parent_id(self, key, val):
         """
@@ -2506,6 +2583,18 b' class RepoGroup(Base, BaseModel):'
         return h.escape(self.group_description)
 
     @classmethod
+    def hash_repo_group_name(cls, repo_group_name):
+        val = remove_formatting(repo_group_name)
+        val = safe_str(val).lower()
+        chars = []
+        for c in val:
+            if c not in string.ascii_letters:
+                c = str(ord(c))
+            chars.append(c)
+
+        return ''.join(chars)
+
+    @classmethod
     def _generate_choice(cls, repo_group):
         from webhelpers.html import literal as _literal
         _name = lambda k: _literal(cls.CHOICES_SEPARATOR.join(k))
@@ -2573,8 +2662,7 b' class RepoGroup(Base, BaseModel):'
         return q.all()
 
     @property
-    def parents(self):
-        parents_recursion_limit = 10
+    def parents(self, parents_recursion_limit = 10):
         groups = []
         if self.parent_group is None:
             return groups
@@ -2597,6 +2685,20 b' class RepoGroup(Base, BaseModel):'
         return groups
 
     @property
+    def last_commit_cache_update_diff(self):
+        return time.time() - (safe_int(self.changeset_cache.get('updated_on')) or 0)
+
+    @property
+    def last_commit_change(self):
+        from rhodecode.lib.vcs.utils.helpers import parse_datetime
+        empty_date = datetime.datetime.fromtimestamp(0)
+        date_latest = self.changeset_cache.get('date', empty_date)
+        try:
+            return parse_datetime(date_latest)
+        except Exception:
+            return empty_date
+
+    @property
     def last_db_change(self):
         return self.updated_on
 
@@ -2635,7 +2737,7 b' class RepoGroup(Base, BaseModel):'
 
         return cnt + children_count(self)
 
-    def _recursive_objects(self, include_repos=True):
+    def _recursive_objects(self, include_repos=True, include_groups=True):
         all_ = []
 
         def _get_members(root_gr):
@@ -2645,11 +2747,16 b' class RepoGroup(Base, BaseModel):'
             childs = root_gr.children.all()
             if childs:
                 for gr in childs:
-                    all_.append(gr)
+                    if include_groups:
+                        all_.append(gr)
                     _get_members(gr)
 
+        root_group = []
+        if include_groups:
+            root_group = [self]
+
         _get_members(self)
-        return [self] + all_
+        return root_group + all_
 
     def recursive_groups_and_repos(self):
         """
@@ -2663,6 +2770,12 b' class RepoGroup(Base, BaseModel):'
         """
         return self._recursive_objects(include_repos=False)
 
+    def recursive_repos(self):
+        """
+        Returns all children repositories for this group
+        """
+        return self._recursive_objects(include_groups=False)
+
     def get_new_name(self, group_name):
         """
         returns new full group name based on parent and new name
@@ -2673,6 +2786,63 b' class RepoGroup(Base, BaseModel):'
                        self.parent_group else [])
         return RepoGroup.url_sep().join(path_prefix + [group_name])
 
+    def update_commit_cache(self, config=None):
+        """
+        Update cache of last changeset for newest repository inside this group, keys should be::
+
+            source_repo_id
+            short_id
+            raw_id
+            revision
+            parents
+            message
+            date
+            author
+
+        """
+        from rhodecode.lib.vcs.utils.helpers import parse_datetime
+
+        def repo_groups_and_repos():
+            all_entries = OrderedDefaultDict(list)
+
+            def _get_members(root_gr, pos=0):
+
+                for repo in root_gr.repositories:
+                    all_entries[root_gr].append(repo)
+
+                # fill in all parent positions
+                for parent_group in root_gr.parents:
+                    all_entries[parent_group].extend(all_entries[root_gr])
+
+                children_groups = root_gr.children.all()
+                if children_groups:
+                    for cnt, gr in enumerate(children_groups, 1):
+                        _get_members(gr, pos=pos+cnt)
+
+            _get_members(root_gr=self)
+            return all_entries
+
+        empty_date = datetime.datetime.fromtimestamp(0)
+        for repo_group, repos in repo_groups_and_repos().items():
+
+            latest_repo_cs_cache = {}
+            for repo in repos:
+                repo_cs_cache = repo.changeset_cache
+                date_latest = latest_repo_cs_cache.get('date', empty_date)
+                date_current = repo_cs_cache.get('date', empty_date)
+                current_timestamp = datetime_to_time(parse_datetime(date_latest))
+                if current_timestamp < datetime_to_time(parse_datetime(date_current)):
+                    latest_repo_cs_cache = repo_cs_cache
+                    latest_repo_cs_cache['source_repo_id'] = repo.repo_id
+
+            latest_repo_cs_cache['updated_on'] = time.time()
+            repo_group.changeset_cache = latest_repo_cs_cache
+            Session().add(repo_group)
+            Session().commit()
+
+            log.debug('updated repo group %s with new commit cache %s',
+                      repo_group.group_name, latest_repo_cs_cache)
+
     def permissions(self, with_admins=True, with_owner=True,
                     expand_from_user_groups=False):
         """
@@ -2768,6 +2938,13 b' class RepoGroup(Base, BaseModel):'
         }
         return data
 
+    def get_dict(self):
+        # Since we transformed `group_name` to a hybrid property, we need to
+        # keep compatibility with the code which uses `group_name` field.
+        result = super(RepoGroup, self).get_dict()
+        result['group_name'] = result.pop('_group_name', None)
+        return result
+
 
 class Permission(Base, BaseModel):
     __tablename__ = 'permissions'
@@ -4258,9 +4435,16 b' class Gist(Base, BaseModel):'
     # SCM functions
 
     def scm_instance(self, **kwargs):
+        """
+        Get an instance of VCS Repository
+
+        :param kwargs:
+        """
+        from rhodecode.model.gist import GistModel
         full_repo_path = os.path.join(self.base_path(), self.gist_access_id)
         return get_vcs_instance(
-            repo_path=safe_str(full_repo_path), create=False)
+            repo_path=safe_str(full_repo_path), create=False,
+            _vcs_alias=GistModel.vcs_backend)
 
 
 class ExternalIdentity(Base, BaseModel):
@@ -4904,8 +5088,8 b' class FileStore(Base, BaseModel):'
 
     @classmethod
     def create(cls, file_uid, filename, file_hash, file_size, file_display_name='',
-               file_description='', enabled=True, check_acl=True,
-               user_id=None, scope_repo_id=None, scope_repo_group_id=None):
+               file_description='', enabled=True, check_acl=True, user_id=None,
+               scope_user_id=None, scope_repo_id=None, scope_repo_group_id=None):
 
         store_entry = FileStore()
         store_entry.file_uid = file_uid
@@ -4919,6 +5103,7 b' class FileStore(Base, BaseModel):'
         store_entry.enabled = enabled
 
         store_entry.user_id = user_id
+        store_entry.scope_user_id = scope_user_id
         store_entry.scope_repo_id = scope_repo_id
         store_entry.scope_repo_group_id = scope_repo_group_id
         return store_entry

rhodecode/model/forms.py

@@ -618,7 +618,7 b' def PullRequestForm(localizer, repo_id):'
         revisions = All(#v.NotReviewedRevisions(localizer, repo_id)(),
                         v.UniqueList(localizer)(not_empty=True))
         review_members = formencode.ForEach(ReviewerForm())
-        pullrequest_title = v.UnicodeString(strip=True, required=True, min=3, max=255)
+        pullrequest_title = v.UnicodeString(strip=True, required=True, min=1, max=255)
         pullrequest_desc = v.UnicodeString(strip=True, required=False)
         description_renderer = v.UnicodeString(strip=True, required=False)
 

rhodecode/model/gist.py

@@ -47,6 +47,7 b" GIST_METADATA_FILE = '.rc_gist_metadata'"
 
 class GistModel(BaseModel):
     cls = Gist
+    vcs_backend = 'hg'
 
     def _get_gist(self, gist):
         """
@@ -145,7 +146,7 b' class GistModel(BaseModel):'
         gist_repo_path = os.path.join(GIST_STORE_LOC, gist_id)
         log.debug('Creating new %s GIST repo in %s', gist_type, gist_repo_path)
         repo = RepoModel()._create_filesystem_repo(
-            repo_name=gist_id, repo_type='hg', repo_group=GIST_STORE_LOC,
+            repo_name=gist_id, repo_type=self.vcs_backend, repo_group=GIST_STORE_LOC,
             use_global_config=True)
 
         # now create single multifile commit

rhodecode/model/pull_request.py

@@ -683,6 +683,7 b' class PullRequestModel(BaseModel):'
 
         # source repo
         source_repo = pull_request.source_repo.scm_instance()
+
         try:
             source_commit = source_repo.get_commit(commit_id=source_ref_name)
         except CommitDoesNotExistError:
@@ -696,6 +697,7 b' class PullRequestModel(BaseModel):'
 
         # target repo
         target_repo = pull_request.target_repo.scm_instance()
+
         try:
             target_commit = target_repo.get_commit(commit_id=target_ref_name)
         except CommitDoesNotExistError:
@@ -752,8 +754,8 b' class PullRequestModel(BaseModel):'
             target_commit.raw_id, source_commit.raw_id, source_repo, merge=True,
             pre_load=pre_load)
 
-        ancestor = target_repo.get_common_ancestor(
-            target_commit.raw_id, source_commit.raw_id, source_repo)
+        ancestor = source_repo.get_common_ancestor(
+            source_commit.raw_id, target_commit.raw_id, target_repo)
 
         pull_request.source_ref = '%s:%s:%s' % (
             source_ref_type, source_ref_name, source_commit.raw_id)
@@ -1314,10 +1316,21 b' class PullRequestModel(BaseModel):'
             merge_state = self._refresh_merge_state(
                 pull_request, target_vcs, target_ref)
         else:
-            possible = pull_request.\
-                last_merge_status == MergeFailureReason.NONE
+            possible = pull_request.last_merge_status == MergeFailureReason.NONE
+            metadata = {
+                'target_ref': pull_request.target_ref_parts,
+                'source_ref': pull_request.source_ref_parts,
+            }
+            if not possible and target_ref.type == 'branch':
+                # NOTE(marcink): case for mercurial multiple heads on branch
+                heads = target_vcs._heads(target_ref.name)
+                if len(heads) != 1:
+                    heads = '\n,'.join(target_vcs._heads(target_ref.name))
+                    metadata.update({
+                        'heads': heads
+                    })
             merge_state = MergeResponse(
-                possible, False, None, pull_request.last_merge_status)
+                possible, False, None, pull_request.last_merge_status, metadata=metadata)
 
         return merge_state
 
@@ -1326,6 +1339,7 b' class PullRequestModel(BaseModel):'
             name_or_id = reference.name
         else:
             name_or_id = reference.commit_id
+
         refreshed_commit = vcs_repository.get_commit(name_or_id)
         refreshed_reference = Reference(
             reference.type, reference.name, refreshed_commit.raw_id)

rhodecode/model/repo.py

@@ -192,14 +192,14 b' class RepoModel(BaseModel):'
         return repo_log
 
     @classmethod
-    def update_repoinfo(cls, repositories=None):
+    def update_commit_cache(cls, repositories=None):
         if not repositories:
             repositories = Repository.getAll()
         for repo in repositories:
             repo.update_commit_cache()
 
     def get_repos_as_dict(self, repo_list=None, admin=False,
-                          super_user_actions=False):
+                          super_user_actions=False, short_name=None):
         _render = get_current_request().get_partial_renderer(
             'rhodecode:templates/data_table/_dt_elements.mako')
         c = _render.get_call_context()
@@ -208,8 +208,12 b' class RepoModel(BaseModel):'
             return _render('quick_menu', repo_name)
 
         def repo_lnk(name, rtype, rstate, private, archived, fork_of):
+            if short_name is not None:
+                short_name_var = short_name
+            else:
+                short_name_var = not admin
             return _render('repo_name', name, rtype, rstate, private, archived, fork_of,
-                           short_name=not admin, admin=False)
+                           short_name=short_name_var, admin=False)
 
         def last_change(last_change):
             if admin and isinstance(last_change, datetime.datetime) and not last_change.tzinfo:
@@ -250,8 +254,8 b' class RepoModel(BaseModel):'
                                  repo.private, repo.archived, repo.fork),
                 "name_raw": repo.repo_name.lower(),
 
-                "last_change": last_change(repo.last_db_change),
-                "last_change_raw": datetime_to_time(repo.last_db_change),
+                "last_change": last_change(repo.last_commit_change),
+                "last_change_raw": datetime_to_time(repo.last_commit_change),
 
                 "last_changeset": last_rev(repo.repo_name, cs_cache),
                 "last_changeset_raw": cs_cache.get('revision'),

rhodecode/model/repo_group.py

@@ -97,6 +97,8 b' class RepoGroupModel(BaseModel):'
         return string.Template(template).safe_substitute(
             username=user.username,
             user_id=user.user_id,
+            first_name=user.first_name,
+            last_name=user.last_name,
         )
 
     def create_personal_repo_group(self, user, commit_early=True):
@@ -307,6 +309,10 b' class RepoGroupModel(BaseModel):'
             # trigger the post hook
             from rhodecode.lib.hooks_base import log_create_repository_group
             repo_group = RepoGroup.get_by_group_name(group_name)
+
+            # update repo group commit caches initially
+            repo_group.update_commit_cache()
+
             log_create_repository_group(
                 created_by=user.username, **repo_group.get_dict())
 
@@ -684,6 +690,13 b' class RepoGroupModel(BaseModel):'
                 'revoked permission from usergroup: {} on repogroup: {}'.format(
                     group_name, repo_group), namespace='security.repogroup')
 
+    @classmethod
+    def update_commit_cache(cls, repo_groups=None):
+        if not repo_groups:
+            repo_groups = RepoGroup.getAll()
+        for repo_group in repo_groups:
+            repo_group.update_commit_cache()
+
     def get_repo_groups_as_dict(self, repo_group_list=None, admin=False,
                                 super_user_actions=False):
 
@@ -705,6 +718,11 b' class RepoGroupModel(BaseModel):'
                     (datetime.datetime.now() - datetime.datetime.utcnow()).seconds)
             return _render("last_change", last_change)
 
+        def last_rev(repo_name, cs_cache):
+            return _render('revision', repo_name, cs_cache.get('revision'),
+                           cs_cache.get('raw_id'), cs_cache.get('author'),
+                           cs_cache.get('message'), cs_cache.get('date'))
+
         def desc(desc, personal):
             return _render(
                 'repo_group_desc', desc, personal, c.visual.stylify_metatags)
@@ -721,13 +739,19 b' class RepoGroupModel(BaseModel):'
 
         repo_group_data = []
         for group in repo_group_list:
+            cs_cache = group.changeset_cache
+            last_repo_name = cs_cache.get('source_repo_name')
 
             row = {
                 "menu": quick_menu(group.group_name),
                 "name": repo_group_lnk(group.group_name),
                 "name_raw": group.group_name,
-                "last_change": last_change(group.last_db_change),
-                "last_change_raw": datetime_to_time(group.last_db_change),
+                "last_change": last_change(group.last_commit_change),
+                "last_change_raw": datetime_to_time(group.last_commit_change),
+
+                "last_changeset": "",
+                "last_changeset_raw": "",
+
                 "desc": desc(group.description_safe, group.personal),
                 "top_level_repos": 0,
                 "owner": user_profile(group.user.username)

rhodecode/model/scm.py

@@ -818,6 +818,8 b' class ScmModel(BaseModel):'
                 repo_name=repo.repo_name, repo_alias=scm_instance.alias,
                 commit_ids=[tip.raw_id])
 
+        return tip
+
     def delete_nodes(self, user, repo, message, nodes, parent_commit=None,
                      author=None, trigger_push_hook=True):
         """

rhodecode/model/settings.py

@@ -119,6 +119,7 b' class SettingsModel(BaseModel):'
         new_ui.ui_value = val
         new_ui.ui_active = active
 
+        repository_id = ''
         if self.repo:
             repo = self._get_repo(self.repo)
             repository_id = repo.repo_id
@@ -440,26 +441,39 b' class VcsSettingsModel(object):'
     HOOKS_SETTINGS = (
         ('hooks', 'changegroup.repo_size'),
         ('hooks', 'changegroup.push_logger'),
-        ('hooks', 'outgoing.pull_logger'),)
+        ('hooks', 'outgoing.pull_logger'),
+    )
     HG_SETTINGS = (
         ('extensions', 'largefiles'),
         ('phases', 'publish'),
-        ('extensions', 'evolve'),)
+        ('extensions', 'evolve'),
+        ('extensions', 'topic'),
+        ('experimental', 'evolution'),
+        ('experimental', 'evolution.exchange'),
+    )
     GIT_SETTINGS = (
-        ('vcs_git_lfs', 'enabled'),)
+        ('vcs_git_lfs', 'enabled'),
+    )
     GLOBAL_HG_SETTINGS = (
         ('extensions', 'largefiles'),
         ('largefiles', 'usercache'),
         ('phases', 'publish'),
         ('extensions', 'hgsubversion'),
-        ('extensions', 'evolve'),)
+        ('extensions', 'evolve'),
+        ('extensions', 'topic'),
+        ('experimental', 'evolution'),
+        ('experimental', 'evolution.exchange'),
+    )
+
     GLOBAL_GIT_SETTINGS = (
         ('vcs_git_lfs', 'enabled'),
-        ('vcs_git_lfs', 'store_location'))
+        ('vcs_git_lfs', 'store_location')
+    )
 
     GLOBAL_SVN_SETTINGS = (
         ('vcs_svn_proxy', 'http_requests_enabled'),
-        ('vcs_svn_proxy', 'http_server_url'))
+        ('vcs_svn_proxy', 'http_server_url')
+    )
 
     SVN_BRANCH_SECTION = 'vcs_svn_branch'
     SVN_TAG_SECTION = 'vcs_svn_tag'
@@ -574,12 +588,38 b' class VcsSettingsModel(object):'
     def create_repo_svn_settings(self, data):
         return self._create_svn_settings(self.repo_settings, data)
 
+    def _set_evolution(self, settings, is_enabled):
+        if is_enabled:
+            # if evolve is active set evolution=all
+
+            self._create_or_update_ui(
+                settings, *('experimental', 'evolution'), value='all',
+                active=True)
+            self._create_or_update_ui(
+                settings, *('experimental', 'evolution.exchange'), value='yes',
+                active=True)
+            # if evolve is active set topics server support
+            self._create_or_update_ui(
+                settings, *('extensions', 'topic'), value='',
+                active=True)
+
+        else:
+            self._create_or_update_ui(
+                settings, *('experimental', 'evolution'), value='',
+                active=False)
+            self._create_or_update_ui(
+                settings, *('experimental', 'evolution.exchange'), value='no',
+                active=False)
+            self._create_or_update_ui(
+                settings, *('extensions', 'topic'), value='',
+                active=False)
+
     @assert_repo_settings
     def create_or_update_repo_hg_settings(self, data):
         largefiles, phases, evolve = \
-            self.HG_SETTINGS
+            self.HG_SETTINGS[:3]
         largefiles_key, phases_key, evolve_key = \
-            self._get_settings_keys(self.HG_SETTINGS, data)
+            self._get_settings_keys(self.HG_SETTINGS[:3], data)
 
         self._create_or_update_ui(
             self.repo_settings, *largefiles, value='',
@@ -587,21 +627,22 b' class VcsSettingsModel(object):'
         self._create_or_update_ui(
             self.repo_settings, *evolve, value='',
             active=data[evolve_key])
+        self._set_evolution(self.repo_settings, is_enabled=data[evolve_key])
+
         self._create_or_update_ui(
             self.repo_settings, *phases, value=safe_str(data[phases_key]))
 
     def create_or_update_global_hg_settings(self, data):
         largefiles, largefiles_store, phases, hgsubversion, evolve \
-            = self.GLOBAL_HG_SETTINGS
+            = self.GLOBAL_HG_SETTINGS[:5]
         largefiles_key, largefiles_store_key, phases_key, subversion_key, evolve_key \
-            = self._get_settings_keys(self.GLOBAL_HG_SETTINGS, data)
+            = self._get_settings_keys(self.GLOBAL_HG_SETTINGS[:5], data)
 
         self._create_or_update_ui(
             self.global_settings, *largefiles, value='',
             active=data[largefiles_key])
         self._create_or_update_ui(
-            self.global_settings, *largefiles_store,
-            value=data[largefiles_store_key])
+            self.global_settings, *largefiles_store, value=data[largefiles_store_key])
         self._create_or_update_ui(
             self.global_settings, *phases, value=safe_str(data[phases_key]))
         self._create_or_update_ui(
@@ -609,9 +650,10 b' class VcsSettingsModel(object):'
         self._create_or_update_ui(
             self.global_settings, *evolve, value='',
             active=data[evolve_key])
+        self._set_evolution(self.global_settings, is_enabled=data[evolve_key])
 
     def create_or_update_repo_git_settings(self, data):
-        # NOTE(marcink): # comma make unpack work properly
+        # NOTE(marcink): # comma makes unpack work properly
         lfs_enabled, \
             = self.GIT_SETTINGS
 
@@ -675,6 +717,7 b' class VcsSettingsModel(object):'
     def get_repo_ui_settings(self, section=None, key=None):
         global_uis = self.global_settings.get_ui(section, key)
         repo_uis = self.repo_settings.get_ui(section, key)
+
         filtered_repo_uis = self._filter_ui_settings(repo_uis)
         filtered_repo_uis_keys = [
             (s.section, s.key) for s in filtered_repo_uis]

rhodecode/model/ssh_key.py

@@ -24,10 +24,15 b' import traceback'
 import sshpubkeys
 import sshpubkeys.exceptions
 
+from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.primitives import serialization as crypto_serialization
+from cryptography.hazmat.backends import default_backend as crypto_default_backend
+
 from rhodecode.model import BaseModel
 from rhodecode.model.db import UserSshKeys
 from rhodecode.model.meta import Session
 
+
 log = logging.getLogger(__name__)
 
 
@@ -62,16 +67,24 b' class SshKeyModel(BaseModel):'
             raise
 
     def generate_keypair(self, comment=None):
-        from Crypto.PublicKey import RSA
-
-        key = RSA.generate(2048)
-        private = key.exportKey('PEM')
 
-        pubkey = key.publickey()
-        public = pubkey.exportKey('OpenSSH')
+        key = rsa.generate_private_key(
+            backend=crypto_default_backend(),
+            public_exponent=65537,
+            key_size=2048
+        )
+        private_key = key.private_bytes(
+            crypto_serialization.Encoding.PEM,
+            crypto_serialization.PrivateFormat.PKCS8,
+            crypto_serialization.NoEncryption())
+        public_key = key.public_key().public_bytes(
+            crypto_serialization.Encoding.OpenSSH,
+            crypto_serialization.PublicFormat.OpenSSH
+        )
+
         if comment:
-            public = public + " " + comment
-        return private, public
+            public_key = public_key + " " + comment
+        return private_key, public_key
 
     def create(self, user, fingerprint, key_data, description):
         """

rhodecode/public/css/buttons.less

@@ -14,11 +14,11 b' input[type="button"] {'
     font-family: @text-light;
     text-decoration: none;
     text-shadow: none;
-    color: @grey4;
+    color: @grey2;
     background-color: white;
     background-image: none;
     border: none;
-    .border ( @border-thickness-buttons, @grey4 );
+    .border ( @border-thickness-buttons, @grey5 );
     .border-radius (@border-radius);
     cursor: pointer;
     white-space: nowrap;
@@ -26,6 +26,10 b' input[type="button"] {'
        -moz-transition: background .3s,color .3s;
          -o-transition: background .3s,color .3s;
             transition: background .3s,color .3s;
+            box-shadow: @button-shadow;
+    -webkit-box-shadow: @button-shadow;
+
+
 
     a {
         display: block;
@@ -44,8 +48,9 b' input[type="button"] {'
         outline:none;
     }
     &:hover {
-        color: white;
-        background-color: @grey4;
+        color: @rcdarkblue;
+        background-color: @white;
+        .border ( @border-thickness, @grey4 );
     }
 
     .icon-remove-sign {
@@ -70,26 +75,26 b' input[type="button"] {'
 
 
 .btn-default {
-    .border ( @border-thickness-buttons, @rcblue );
+    border: @border-thickness solid @grey5;
     background-image: none;
-    color: @rcblue;
+    color: @grey2;
 
     a {
-        color: @rcblue;
+        color: @grey2;
     }
 
     &:hover,
     &.active {
-        color: white;
-        background-color: @rcdarkblue;
-        .border ( @border-thickness, @rcdarkblue );
+        color: @rcdarkblue;
+        background-color: @white;
+        .border ( @border-thickness, @grey4 );
 
         a {
-            color: white;
+            color: @grey2;
         }
     }
     &:disabled {
-        .border ( @border-thickness-buttons, @grey4 );
+        .border ( @border-thickness-buttons, @grey5 );
         background-color: transparent;
     }
 }
@@ -326,6 +331,7 b' input[type="submit"] {'
         .border ( @border-thickness-buttons, @rcblue );
         background-color: @rcblue;
         color: white;
+        opacity: 0.5;
     }
 }
 
@@ -416,3 +422,23 b' input[type="reset"] {'
     }
 }
 
+
+.button-links {
+    float: left;
+    display: inline;
+    margin: 0;
+    padding-left: 0;
+    list-style: none;
+    text-align: right;
+
+    li {
+
+
+    }
+
+    li.active {
+        background-color: @grey6;
+        .border ( @border-thickness, @grey4 );
+    }
+
+}

rhodecode/public/css/code-block.less

@@ -404,12 +404,9 b' div.codeblock {'
 
     // TODO: johbo: Added interim to get rid of the margin around
     // Select2 widgets. This needs further cleanup.
-    margin-top: @padding;
-
     overflow: auto;
     padding: 0px;
-    border: @border-thickness solid @grey5;
-    background: @grey6;
+    border: @border-thickness solid @grey6;
     .border-radius(@border-radius);
 
     #remove_gist {
@@ -479,7 +476,7 b' div.codeblock {'
     }
 
     .code-body {
-        padding: @padding;
+        padding: 0.8em 1em;
         background-color: #ffffff;
         min-width: 100%;
         box-sizing: border-box;
@@ -492,6 +489,21 b' div.codeblock {'
             height: auto;
             width: 100%;
         }
+
+        .markdown-block {
+            padding: 1em 0;
+        }
+    }
+
+    .codeblock-header {
+        background: @grey7;
+        height: 36px;
+    }
+
+    .path {
+        border-bottom: 1px solid @grey6;
+        padding: .65em 1em;
+        height: 18px;
     }
 }
 

rhodecode/public/css/codemirror.less

@@ -27,7 +27,7 b''
 
 .CodeMirror-gutters {
   border-right: 1px solid #ddd;
-  background-color: @grey6;
+  background-color: white;
   white-space: nowrap;
 }
 .CodeMirror-linenumbers {}

rhodecode/public/css/comments.less

@@ -14,7 +14,7 b' tr.inline-comments div {'
     max-width: 100%;
 
     p {
-        white-space: normal; 
+        white-space: normal;
     }
 
     code, pre, .code, dd {
@@ -227,7 +227,7 b' tr.inline-comments div {'
     .delete-comment {
         display: inline-block;
         color: @rcblue;
-        
+
         &:hover {
             cursor: pointer;
         }
@@ -377,13 +377,13 b' form.comment-form {'
     position: relative;
     width: 100%;
     min-height: 42px;
-    
+
     .status_box,
     .cancel-button {
         float: left;
         display: inline-block;
     }
-    
+
     .action-buttons {
         float: right;
         display: inline-block;
@@ -426,10 +426,10 b' form.comment-form {'
 
 .comment-form-login {
     .comment-help {
-        padding: 0.9em; //same as the button
+        padding: 0.7em; //same as the button
     }
 
-    div.clearfix { 
+    div.clearfix {
         clear: both;
         width: 100%;
         display: block;

rhodecode/public/css/deform.less

@@ -38,7 +38,7 b''
 
   .form-control {
     width: 100%;
-    padding: 0.9em;
+    padding: 0.7em;
     border: 1px solid #979797;
     border-radius: 2px;
   }

rhodecode/public/css/forms.less

@@ -60,13 +60,13 b' form.rcform {'
         max-width: 500px;
         margin: 0 0 @padding -@legend-width;
         padding: 0 0 0 @legend-width;
-        
+
         .btn {
             display: inline-block;
             margin: 0 1em @padding 0;
         }
     }
-    
+
     input,
     textarea {
         float: left;
@@ -113,7 +113,7 b' form.rcform {'
         opacity: 0.5;
       }
     }
- 
+
     input[type="radio"]:not(#ie),
     input[type="checkbox"]:not(#ie) {
         // Hide the input, but have it still be clickable
@@ -187,13 +187,13 b' form.rcform {'
             filter: progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476); /* IE6,IE7 */
 
             -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"; /* IE8 */        }
-    
+
         & + .label {
           float: left;
           margin-top: 5px
         }
     }
-    
+
     input[type=checkbox]:not(#ie) {
       visibility: hidden;
       &:checked + label:after {
@@ -231,6 +231,11 b' form.rcform {'
 
     .drop-menu {
         float: left;
+
+        & + .last-item {
+            margin: 0;
+        }
+
         margin: 0 @input-padding 0 0;
     }
 
@@ -244,7 +249,7 b' form.rcform {'
     .error-message {
         margin-top: 5px;
     }
-  
+
     input[type=submit] {
         &:extend(.btn-primary);
 
@@ -271,14 +276,15 b' form.rcform {'
 .badged-field {
     .user-badge {
         line-height: 25px;
-        padding: 10px 5px;
+        padding: .4em;
         border-radius: @border-radius;
-        border-top: 1px solid @rclightblue;
-        border-left: 1px solid @rclightblue;
-        border-bottom: 1px solid @rclightblue;
+        border-top: 1px solid @grey4;
+        border-left: 1px solid @grey4;
+        border-bottom: 1px solid @grey4;
         font-size: 14px;
         font-style: normal;
         color: @text-light;
+        background: @grey7;
         display: inline-block;
         vertical-align: top;
         cursor: default;