release: Merge default into stable for release preparation

docs/admin/sec-sophos-umc.rst

@@ -0,0 +1,101 b''
+.. _sec-your-server:
+
+Securing Your Server via Sophos UTM 9
+-------------------------------------
+
+
+
+Below is an example configuration for Sophos UTM 9 Webserver Protection::
+
+    Sophos UTM 9 Webserver Protection
+    Web Application Firewall based on apache2 modesecurity2
+    --------------------------------------------------
+    1. Firewall Profiles -> Firewall Profile
+    --------------------------------------------------
+    Name: RhodeCode (can be anything)
+    Mode: Reject
+    Hardening & Signing:
+        [ ] Static URL hardeninig
+        [ ] Form hardening
+        [x] Cookie Signing
+    Filtering:
+        [x] Block clients with bad reputation
+        [x] Common Threats Filter
+        [ ] Rigid Filtering
+            Skip Filter Rules:
+                960015
+                950120
+                981173
+                970901
+                960010
+                960032
+                960035
+                958291
+                970903
+                970003
+    Common Threat Filter Categories:
+        [x] Protocol violations
+        [x] Protocol anomalies
+        [x] Request limit
+        [x] HTTP policy
+        [x] Bad robots
+        [x] Generic attacks
+        [x] SQL injection attacks
+        [x] XSS attacks
+        [x] Tight security
+        [x] Trojans
+        [x] Outbound
+    Scanning:
+        [ ] Enable antivirus scanning
+        [ ] Block uploads by MIME type
+    --------------------------------------------------
+    2. Web Application Firewall -> Real Webservers
+    --------------------------------------------------
+    Name: RhodeCode (can be anything)
+    Host: Your RhodeCode-Server (UTM object)
+    Type: Encrypted (HTTPS)
+    Port: 443
+    --------------------------------------------------
+    3. Web Application Firewall -> Virual Webservers
+    --------------------------------------------------
+    Name: RhodeCode (can be anything)
+    Interface: WAN (your WAN interface)
+    Type: Encrypted (HTTPS) & redirect
+    Certificate: Wildcard or matching domain certificate
+        Domains (in case of Wildcard certificate):
+            rhodecode.yourcompany.com (match your DNS configuration)
+            gist.yourcompany.com (match your DNS & RhodeCode configuration)
+    Real Webservers for path '/':
+        [x] RhodeCode (created in step 2)
+    Firewall: RhodeCode (created in step 1)
+    --------------------------------------------------
+    4. Firewall Profiles -> Exceptions
+    --------------------------------------------------
+    Name: RhodeCode exceptions (can be anything)
+    Skip these checks:
+        [ ] Cookie signing
+        [ ] Static URL Hardening
+        [ ] Form hardening
+        [x] Antivirus scanning
+        [x] True file type control
+        [ ] Block clients with bad reputation
+    Skip these categories:
+        [ ] Protocol violations
+        [x] Protocol anomalies
+        [x] Request limits
+        [ ] HTTP policy
+        [ ] Bad robots
+        [ ] Generic attacks
+        [ ] SQL injection attacks
+        [ ] XSS attacks
+        [ ] Tight security
+        [ ] Trojans
+        [x] Outbound
+    Virtual Webservers:
+        [x] RhodeCode (created in step 3)
+    For All Requests:
+        Web requests matching this pattern:
+            /_channelstream/ws
+            /Repository1/*
+            /Repository2/*
+            /Repository3/*
  No newline at end of file

docs/release-notes/release-notes-4.11.0.rst

@@ -0,0 +1,152 b''
+|RCE| 4.11.0 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2018-02-01
+
+
+New Features
+^^^^^^^^^^^^
+
+- Default reviewers(EE only): introduced new voting rule logic that allows
+  defining how many members of user group need to vote for approvals. E.g
+  adding 4 people group with security people, it can be specified that at least
+  1 (or all) need to vote for approval from that group.
+- Default reviewers(EE only): added source/target branch flow distinction and
+  option to add names to rules.
+- RhodeCode-Scheduler (Beta, EE only): after celery 4.X upgrade we introduced a
+  new scheduler option. RhodeCode scheduler now allows specifying via super-admin
+  interface periodic tasks that should be run crontab style.
+  Currently available tasks are:
+  - repo maintenance: (repo quality/git gc)
+  - repo remote code pull: pull changed on periodic bases from given url
+  - repo remote code push: push all changes on periodic bases to given url
+  - check for updates
+- Ui: a ssh clone uri was added to summary view for clone. This allows to
+  customize how the ssh clone url would look like, and also exposes SSH clone
+  url to summary page.
+- Integrations: parse pushed tags, and lightweight tags for git.
+    - now aggregated as 'tags' key
+    - handles the case for email/webhook integrations
+- Files browser: allow making a range selection of code lines with
+  shift-click from line numbers.
+- Pull requests: allow opening PR from changelog based on selected refs for
+  git as well as hg.
+- Process management: auto refresh option was added to the processes
+  page to live track usage.
+- Api: pull-requests added option to fetch comments from a pull requests.
+- Api: added new data called `permissions_summary` for user and
+  user_groups that expose the summary of permissions for each of those.
+
+
+General
+^^^^^^^
+
+- Core: removed all pylons dependencies and backward compatibility code.
+  RhodeCode is now 100% pyramid app.
+- Audit logs: added user.register audit log entry.
+- Celery: update celery support 4.X series.
+- Logging: log traceback for errors that are known to help debugging.
+- Pull requests: don't select first commit in case we don't have a default
+  branch for repository. Loading compare from commit 0 to something selected
+  is very heavy to compute. Now it's left to users to decide what
+  compare base to pick.
+- Dependencies: bumped Mercurial version to 4.4.2
+- Dependencies: bumped hgevolve to 7.0.1
+- Dependencies: bumped libs not explicitly set by requirements
+    - ws4py to 0.4.2
+    - scandir to 1.6
+    - plaster to 1.0
+    - mistune to 0.8
+    - jupyter-core to 4.4.0
+- Dependencies: pin to rhodecode-tools 0.14.0
+- Dependencies: bumped click to 6.6.0
+- Dependencies: bumped transifex-clients to 0.12.5
+- Dependencies: bumped six to 1.11.0
+- Dependencies: bumped waitress to 1.1.0
+- Dependencies: bumped setproctitle 1.1.10
+- Dependencies: bumped iso8601 to 0.1.12
+- Dependencies: bumped repoze.lru to 0.7.0
+- Dependencies: bumped python-ldap to 2.4.45
+- Dependencies: bumped gnureadline 6.3.8
+- Dependencies: bumped bottle to 0.12.13
+- Dependencies: bumped psycopg2 2.7.3.2
+- Dependencies: bumped alembic to 0.9.6
+- Dependencies: bumped sqlalchemy to 1.1.15
+- Dependencies: bumped markupsafe to 1.0.0
+- Dependencies: bumped markdown to 2.6.9
+- Dependencies: bumped objgraph to 3.1.1
+- Dependencies: bumped psutil to 5.4.0
+- Dependencies: bumped docutils to 0.14.0
+- Dependencies: bumped decorator to 4.1.2
+- Dependencies: bumped pyramid-jinja to 2.7.0
+- Dependencies: bumped jinja to 2.9.6
+- Dependencies: bumped colander to 1.4.0
+- Dependencies: bumped mistune to 0.8.1
+- Dependencies: bumped webob to 1.7.4
+- Dependencies: dropped nose dependency.
+
+
+Security
+^^^^^^^^
+
+- Security(low): fix self xss on repo downloads picker for svn case.
+
+
+Performance
+^^^^^^^^^^^
+
+- Pyramid: removed pylons layer, this should result in general speed
+  improvement over previous version.
+- Authentication: use cache_ttl for anonymous access taken from the
+  rhodecode main auth plugin. For operations like svn this boosts performance
+  significantly with anonymous access enabled.
+- Issue trackers: cache the fetched issue tracker patterns in changelog
+  page before loop iteration to speed up fetching and parsing the tracker
+  patterns.
+
+
+Fixes
+^^^^^
+
+- Slack: expose the FULL message instead of title.
+  Slack uses it's own trim, we should avoid sending trimmed data and
+  let users via Slack trim logic control the data.
+- Comments: place the left over comments (outdated/misplaced) to the left or
+  right side-by-side pane. This way the original context where they were
+  placed is kept.
+- Comments: allow to properly initialize outdated comments that are attached
+  to the end of diffs. This allows resolving TODOs that are outdated.
+- Git: handle cases of git push without branch specified in the eventing system.
+- Git: merge simulation fixes. Fetch other branch data if it's different
+  from target. This prevents potentially missing commits error when doing a test merge.
+  Also fix edge cases using .gitattributes file modification that could
+  lead to the same problem.
+- Age component: use local flag to fix the problem of wrongly reported last
+  update times on repository groups.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+Please note that this release is first in series that drops completely pylons
+dependency. This means that certain `paster` commands are no longer available.
+
+Commands changed after dropping pylons compatibility layer:
+  - paster upgrade-db /path/ini_file  => rc-upgrade-db /path/ini_file
+  - paster setup-app /path/ini_file   => rc-setup-app /path/ini_file
+  - paster ishell /path/ini_file      => rc-ishell /path/ini_file
+  - paster celeryd /path/ini_file     => celery worker --app rhodecode.lib.celerylib.loader /path/ini_file
+
+Commands no longer available:
+ - paster make-config (replaced by rhodecode-config from rhodecode-tools package)
+ - paster update-repoinfo (replaced by API calls)
+ - paster cache-keys, no equivalent available, this command was removed.
+
+
+RhodeCode 4.11 uses latest Celery 4.X series. This means that there's a new way to
+run the celery workers. To upgrade to latest simply run
+`rccontrol enable-module celery` to convert the currently running celery setup
+into a new version that also powers the RhodeCode scheduler.

docs/requirements_docs.txt

@@ -0,0 +1,8 b''
+Sphinx==1.6.5
+six==1.11.0
+sphinx_rtd_theme==0.2.5b1
+docutils==0.14.0
+Pygments==2.2.0
+MarkupSafe==1.0.0
+Jinja2==2.9.6
+pytz
  No newline at end of file

rhodecode/api/tests/test_get_pull_request_comments.py

@@ -0,0 +1,82 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2018 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
+import urlobject
+
+from rhodecode.api.tests.utils import (
+    build_data, api_call, assert_error, assert_ok)
+from rhodecode.lib import helpers as h
+from rhodecode.lib.utils2 import safe_unicode
+
+pytestmark = pytest.mark.backends("git", "hg")
+
+
[e-mail]("testuser_api", "app")
+class TestGetPullRequestComments(object):
+
+    def test_api_get_pull_request_comments(self, pr_util, http_host_only_stub):
+        from rhodecode.model.pull_request import PullRequestModel
+
+        pull_request = pr_util.create_pull_request(mergeable=True)
+        id_, params = build_data(
+            self.apikey, 'get_pull_request_comments',
+            pullrequestid=pull_request.pull_request_id)
+
+        response = api_call(self.app, params)
+
+        assert response.status == '200 OK'
+        resp_date = response.json['result'][0]['comment_created_on']
+        resp_comment_id = response.json['result'][0]['comment_id']
+
+        expected = [
+            {'comment_author': {'active': True,
+                                'full_name_or_username': 'RhodeCode Admin',
+                                'username': 'test_admin'},
+             'comment_created_on': resp_date,
+             'comment_f_path': None,
+             'comment_id': resp_comment_id,
+             'comment_lineno': None,
+             'comment_status': {'status': 'under_review',
+                                'status_lbl': 'Under Review'},
+             'comment_text': 'Auto status change to |new_status|\n\n.. |new_status| replace:: *"Under Review"*',
+             'comment_type': 'note',
+             'pull_request_version': None}
+        ]
+        assert_ok(id_, expected, response.body)
+
+    def test_api_get_pull_request_comments_repo_error(self, pr_util):
+        pull_request = pr_util.create_pull_request()
+        id_, params = build_data(
+            self.apikey, 'get_pull_request_comments',
+            repoid=666, pullrequestid=pull_request.pull_request_id)
+        response = api_call(self.app, params)
+
+        expected = 'repository `666` does not exist'
+        assert_error(id_, expected, given=response.body)
+
+    def test_api_get_pull_request_comments_pull_request_error(self):
+        id_, params = build_data(
+            self.apikey, 'get_pull_request_comments', pullrequestid=666)
+        response = api_call(self.app, params)
+
+        expected = 'pull request `666` does not exist'
+        assert_error(id_, expected, given=response.body)

rhodecode/apps/admin/views/settings.py

@@ -0,0 +1,764 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2018 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
+import collections
+
+import datetime
+import formencode
+import formencode.htmlfill
+
+import rhodecode
+from pyramid.view import view_config
+from pyramid.httpexceptions import HTTPFound, HTTPNotFound
+from pyramid.renderers import render
+from pyramid.response import Response
+
+from rhodecode.apps._base import BaseAppView
+from rhodecode.apps.admin.navigation import navigation_list
+from rhodecode.apps.svn_support.config_keys import generate_config
+from rhodecode.lib import helpers as h
+from rhodecode.lib.auth import (
+    LoginRequired, HasPermissionAllDecorator, CSRFRequired)
+from rhodecode.lib.celerylib import tasks, run_task
+from rhodecode.lib.utils import repo2db_mapper
+from rhodecode.lib.utils2 import str2bool, safe_unicode, AttributeDict
+from rhodecode.lib.index import searcher_from_config
+
+from rhodecode.model.db import RhodeCodeUi, Repository
+from rhodecode.model.forms import (ApplicationSettingsForm,
+    ApplicationUiSettingsForm, ApplicationVisualisationForm,
+    LabsSettingsForm, IssueTrackerPatternsForm)
+from rhodecode.model.repo_group import RepoGroupModel
+
+from rhodecode.model.scm import ScmModel
+from rhodecode.model.notification import EmailNotificationModel
+from rhodecode.model.meta import Session
+from rhodecode.model.settings import (
+    IssueTrackerSettingsModel, VcsSettingsModel, SettingNotFound,
+    SettingsModel)
+
+
+log = logging.getLogger(__name__)
+
+
+class AdminSettingsView(BaseAppView):
+
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        c.labs_active = str2bool(
+            rhodecode.CONFIG.get('labs_settings_active', 'true'))
+        c.navlist = navigation_list(self.request)
+
+        return c
+
+    @classmethod
+    def _get_ui_settings(cls):
+        ret = RhodeCodeUi.query().all()
+
+        if not ret:
+            raise Exception('Could not get application ui settings !')
+        settings = {}
+        for each in ret:
+            k = each.ui_key
+            v = each.ui_value
+            if k == '/':
+                k = 'root_path'
+
+            if k in ['push_ssl', 'publish', 'enabled']:
+                v = str2bool(v)
+
+            if k.find('.') != -1:
+                k = k.replace('.', '_')
+
+            if each.ui_section in ['hooks', 'extensions']:
+                v = each.ui_active
+
+            settings[each.ui_section + '_' + k] = v
+        return settings
+
+    @classmethod
+    def _form_defaults(cls):
+        defaults = SettingsModel().get_all_settings()
+        defaults.update(cls._get_ui_settings())
+
+        defaults.update({
+            'new_svn_branch': '',
+            'new_svn_tag': '',
+        })
+        return defaults
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings_vcs', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_vcs(self):
+        c = self.load_default_context()
+        c.active = 'vcs'
+        model = VcsSettingsModel()
+        c.svn_branch_patterns = model.get_global_svn_branch_patterns()
+        c.svn_tag_patterns = model.get_global_svn_tag_patterns()
+
+        settings = self.request.registry.settings
+        c.svn_proxy_generate_config = settings[generate_config]
+
+        defaults = self._form_defaults()
+
+        model.create_largeobjects_dirs_if_needed(defaults['paths_root_path'])
+
+        data = render('rhodecode:templates/admin/settings/settings.mako',
+                      self._get_template_context(c), self.request)
+        html = formencode.htmlfill.render(
+            data,
+            defaults=defaults,
+            encoding="UTF-8",
+            force_defaults=False
+        )
+        return Response(html)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_vcs_update', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_vcs_update(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'vcs'
+
+        model = VcsSettingsModel()
+        c.svn_branch_patterns = model.get_global_svn_branch_patterns()
+        c.svn_tag_patterns = model.get_global_svn_tag_patterns()
+
+        settings = self.request.registry.settings
+        c.svn_proxy_generate_config = settings[generate_config]
+
+        application_form = ApplicationUiSettingsForm(self.request.translate)()
+
+        try:
+            form_result = application_form.to_python(dict(self.request.POST))
+        except formencode.Invalid as errors:
+            h.flash(
+                _("Some form inputs contain invalid data."),
+                category='error')
+            data = render('rhodecode:templates/admin/settings/settings.mako',
+                          self._get_template_context(c), self.request)
+            html = formencode.htmlfill.render(
+                data,
+                defaults=errors.value,
+                errors=errors.error_dict or {},
+                prefix_error=False,
+                encoding="UTF-8",
+                force_defaults=False
+            )
+            return Response(html)
+
+        try:
+            if c.visual.allow_repo_location_change:
+                model.update_global_path_setting(
+                    form_result['paths_root_path'])
+
+            model.update_global_ssl_setting(form_result['web_push_ssl'])
+            model.update_global_hook_settings(form_result)
+
+            model.create_or_update_global_svn_settings(form_result)
+            model.create_or_update_global_hg_settings(form_result)
+            model.create_or_update_global_git_settings(form_result)
+            model.create_or_update_global_pr_settings(form_result)
+        except Exception:
+            log.exception("Exception while updating settings")
+            h.flash(_('Error occurred during updating '
+                      'application settings'), category='error')
+        else:
+            Session().commit()
+            h.flash(_('Updated VCS settings'), category='success')
+            raise HTTPFound(h.route_path('admin_settings_vcs'))
+
+        data = render('rhodecode:templates/admin/settings/settings.mako',
+                      self._get_template_context(c), self.request)
+        html = formencode.htmlfill.render(
+            data,
+            defaults=self._form_defaults(),
+            encoding="UTF-8",
+            force_defaults=False
+        )
+        return Response(html)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_vcs_svn_pattern_delete', request_method='POST',
+        renderer='json_ext', xhr=True)
+    def settings_vcs_delete_svn_pattern(self):
+        delete_pattern_id = self.request.POST.get('delete_svn_pattern')
+        model = VcsSettingsModel()
+        try:
+            model.delete_global_svn_pattern(delete_pattern_id)
+        except SettingNotFound:
+            log.exception(
+                'Failed to delete svn_pattern with id %s', delete_pattern_id)
+            raise HTTPNotFound()
+
+        Session().commit()
+        return True
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings_mapping', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_mapping(self):
+        c = self.load_default_context()
+        c.active = 'mapping'
+
+        data = render('rhodecode:templates/admin/settings/settings.mako',
+                      self._get_template_context(c), self.request)
+        html = formencode.htmlfill.render(
+            data,
+            defaults=self._form_defaults(),
+            encoding="UTF-8",
+            force_defaults=False
+        )
+        return Response(html)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_mapping_update', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_mapping_update(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'mapping'
+        rm_obsolete = self.request.POST.get('destroy', False)
+        invalidate_cache = self.request.POST.get('invalidate', False)
+        log.debug(
+            'rescanning repo location with destroy obsolete=%s', rm_obsolete)
+
+        if invalidate_cache:
+            log.debug('invalidating all repositories cache')
+            for repo in Repository.get_all():
+                ScmModel().mark_for_invalidation(repo.repo_name, delete=True)
+
+        filesystem_repos = ScmModel().repo_scan()
+        added, removed = repo2db_mapper(filesystem_repos, rm_obsolete)
+        _repr = lambda l: ', '.join(map(safe_unicode, l)) or '-'
+        h.flash(_('Repositories successfully '
+                  'rescanned added: %s ; removed: %s') %
+                (_repr(added), _repr(removed)),
+                category='success')
+        raise HTTPFound(h.route_path('admin_settings_mapping'))
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    @view_config(
+        route_name='admin_settings_global', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_global(self):
+        c = self.load_default_context()
+        c.active = 'global'
+        c.personal_repo_group_default_pattern = RepoGroupModel()\
+            .get_personal_group_name_pattern()
+
+        data = render('rhodecode:templates/admin/settings/settings.mako',
+                      self._get_template_context(c), self.request)
+        html = formencode.htmlfill.render(
+            data,
+            defaults=self._form_defaults(),
+            encoding="UTF-8",
+            force_defaults=False
+        )
+        return Response(html)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_update', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    @view_config(
+        route_name='admin_settings_global_update', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_global_update(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'global'
+        c.personal_repo_group_default_pattern = RepoGroupModel()\
+            .get_personal_group_name_pattern()
+        application_form = ApplicationSettingsForm(self.request.translate)()
+        try:
+            form_result = application_form.to_python(dict(self.request.POST))
+        except formencode.Invalid as errors:
+            data = render('rhodecode:templates/admin/settings/settings.mako',
+                          self._get_template_context(c), self.request)
+            html = formencode.htmlfill.render(
+                data,
+                defaults=errors.value,
+                errors=errors.error_dict or {},
+                prefix_error=False,
+                encoding="UTF-8",
+                force_defaults=False
+            )
+            return Response(html)
+
+        settings = [
+            ('title', 'rhodecode_title', 'unicode'),
+            ('realm', 'rhodecode_realm', 'unicode'),
+            ('pre_code', 'rhodecode_pre_code', 'unicode'),
+            ('post_code', 'rhodecode_post_code', 'unicode'),
+            ('captcha_public_key', 'rhodecode_captcha_public_key', 'unicode'),
+            ('captcha_private_key', 'rhodecode_captcha_private_key', 'unicode'),
+            ('create_personal_repo_group', 'rhodecode_create_personal_repo_group', 'bool'),
+            ('personal_repo_group_pattern', 'rhodecode_personal_repo_group_pattern', 'unicode'),
+        ]
+        try:
+            for setting, form_key, type_ in settings:
+                sett = SettingsModel().create_or_update_setting(
+                    setting, form_result[form_key], type_)
+                Session().add(sett)
+
+            Session().commit()
+            SettingsModel().invalidate_settings_cache()
+            h.flash(_('Updated application settings'), category='success')
+        except Exception:
+            log.exception("Exception while updating application settings")
+            h.flash(
+                _('Error occurred during updating application settings'),
+                category='error')
+
+        raise HTTPFound(h.route_path('admin_settings_global'))
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings_visual', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_visual(self):
+        c = self.load_default_context()
+        c.active = 'visual'
+
+        data = render('rhodecode:templates/admin/settings/settings.mako',
+                      self._get_template_context(c), self.request)
+        html = formencode.htmlfill.render(
+            data,
+            defaults=self._form_defaults(),
+            encoding="UTF-8",
+            force_defaults=False
+        )
+        return Response(html)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_visual_update', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_visual_update(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'visual'
+        application_form = ApplicationVisualisationForm(self.request.translate)()
+        try:
+            form_result = application_form.to_python(dict(self.request.POST))
+        except formencode.Invalid as errors:
+            data = render('rhodecode:templates/admin/settings/settings.mako',
+                          self._get_template_context(c), self.request)
+            html = formencode.htmlfill.render(
+                data,
+                defaults=errors.value,
+                errors=errors.error_dict or {},
+                prefix_error=False,
+                encoding="UTF-8",
+                force_defaults=False
+            )
+            return Response(html)
+
+        try:
+            settings = [
+                ('show_public_icon', 'rhodecode_show_public_icon', 'bool'),
+                ('show_private_icon', 'rhodecode_show_private_icon', 'bool'),
+                ('stylify_metatags', 'rhodecode_stylify_metatags', 'bool'),
+                ('repository_fields', 'rhodecode_repository_fields', 'bool'),
+                ('dashboard_items', 'rhodecode_dashboard_items', 'int'),
+                ('admin_grid_items', 'rhodecode_admin_grid_items', 'int'),
+                ('show_version', 'rhodecode_show_version', 'bool'),
+                ('use_gravatar', 'rhodecode_use_gravatar', 'bool'),
+                ('markup_renderer', 'rhodecode_markup_renderer', 'unicode'),
+                ('gravatar_url', 'rhodecode_gravatar_url', 'unicode'),
+                ('clone_uri_tmpl', 'rhodecode_clone_uri_tmpl', 'unicode'),
+                ('clone_uri_ssh_tmpl', 'rhodecode_clone_uri_ssh_tmpl', 'unicode'),
+                ('support_url', 'rhodecode_support_url', 'unicode'),
+                ('show_revision_number', 'rhodecode_show_revision_number', 'bool'),
+                ('show_sha_length', 'rhodecode_show_sha_length', 'int'),
+            ]
+            for setting, form_key, type_ in settings:
+                sett = SettingsModel().create_or_update_setting(
+                    setting, form_result[form_key], type_)
+                Session().add(sett)
+
+            Session().commit()
+            SettingsModel().invalidate_settings_cache()
+            h.flash(_('Updated visualisation settings'), category='success')
+        except Exception:
+            log.exception("Exception updating visualization settings")
+            h.flash(_('Error occurred during updating '
+                      'visualisation settings'),
+                    category='error')
+
+        raise HTTPFound(h.route_path('admin_settings_visual'))
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings_issuetracker', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_issuetracker(self):
+        c = self.load_default_context()
+        c.active = 'issuetracker'
+        defaults = SettingsModel().get_all_settings()
+
+        entry_key = 'rhodecode_issuetracker_pat_'
+
+        c.issuetracker_entries = {}
+        for k, v in defaults.items():
+            if k.startswith(entry_key):
+                uid = k[len(entry_key):]
+                c.issuetracker_entries[uid] = None
+
+        for uid in c.issuetracker_entries:
+            c.issuetracker_entries[uid] = AttributeDict({
+                'pat': defaults.get('rhodecode_issuetracker_pat_' + uid),
+                'url': defaults.get('rhodecode_issuetracker_url_' + uid),
+                'pref': defaults.get('rhodecode_issuetracker_pref_' + uid),
+                'desc': defaults.get('rhodecode_issuetracker_desc_' + uid),
+            })
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_issuetracker_test', request_method='POST',
+        renderer='string', xhr=True)
+    def settings_issuetracker_test(self):
+        return h.urlify_commit_message(
+            self.request.POST.get('test_text', ''),
+            'repo_group/test_repo1')
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_issuetracker_update', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_issuetracker_update(self):
+        _ = self.request.translate
+        self.load_default_context()
+        settings_model = IssueTrackerSettingsModel()
+
+        try:
+            form = IssueTrackerPatternsForm(self.request.translate)()
+            data = form.to_python(self.request.POST)
+        except formencode.Invalid as errors:
+            log.exception('Failed to add new pattern')
+            error = errors
+            h.flash(_('Invalid issue tracker pattern: {}'.format(error)),
+                    category='error')
+            raise HTTPFound(h.route_path('admin_settings_issuetracker'))
+
+        if data:
+            for uid in data.get('delete_patterns', []):
+                settings_model.delete_entries(uid)
+
+            for pattern in data.get('patterns', []):
+                for setting, value, type_ in pattern:
+                    sett = settings_model.create_or_update_setting(
+                        setting, value, type_)
+                    Session().add(sett)
+
+                Session().commit()
+
+            SettingsModel().invalidate_settings_cache()
+            h.flash(_('Updated issue tracker entries'), category='success')
+        raise HTTPFound(h.route_path('admin_settings_issuetracker'))
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_issuetracker_delete', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_issuetracker_delete(self):
+        _ = self.request.translate
+        self.load_default_context()
+        uid = self.request.POST.get('uid')
+        try:
+            IssueTrackerSettingsModel().delete_entries(uid)
+        except Exception:
+            log.exception('Failed to delete issue tracker setting %s', uid)
+            raise HTTPNotFound()
+        h.flash(_('Removed issue tracker entry'), category='success')
+        raise HTTPFound(h.route_path('admin_settings_issuetracker'))
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings_email', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_email(self):
+        c = self.load_default_context()
+        c.active = 'email'
+        c.rhodecode_ini = rhodecode.CONFIG
+
+        data = render('rhodecode:templates/admin/settings/settings.mako',
+                      self._get_template_context(c), self.request)
+        html = formencode.htmlfill.render(
+            data,
+            defaults=self._form_defaults(),
+            encoding="UTF-8",
+            force_defaults=False
+        )
+        return Response(html)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_email_update', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_email_update(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'email'
+
+        test_email = self.request.POST.get('test_email')
+
+        if not test_email:
+            h.flash(_('Please enter email address'), category='error')
+            raise HTTPFound(h.route_path('admin_settings_email'))
+
+        email_kwargs = {
+            'date': datetime.datetime.now(),
+            'user': c.rhodecode_user,
+            'rhodecode_version': c.rhodecode_version
+        }
+
+        (subject, headers, email_body,
+         email_body_plaintext) = EmailNotificationModel().render_email(
+            EmailNotificationModel.TYPE_EMAIL_TEST, **email_kwargs)
+
+        recipients = [test_email] if test_email else None
+
+        run_task(tasks.send_email, recipients, subject,
+                 email_body_plaintext, email_body)
+
+        h.flash(_('Send email task created'), category='success')
+        raise HTTPFound(h.route_path('admin_settings_email'))
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings_hooks', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_hooks(self):
+        c = self.load_default_context()
+        c.active = 'hooks'
+
+        model = SettingsModel()
+        c.hooks = model.get_builtin_hooks()
+        c.custom_hooks = model.get_custom_hooks()
+
+        data = render('rhodecode:templates/admin/settings/settings.mako',
+                      self._get_template_context(c), self.request)
+        html = formencode.htmlfill.render(
+            data,
+            defaults=self._form_defaults(),
+            encoding="UTF-8",
+            force_defaults=False
+        )
+        return Response(html)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_hooks_update', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    @view_config(
+        route_name='admin_settings_hooks_delete', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_hooks_update(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'hooks'
+        if c.visual.allow_custom_hooks_settings:
+            ui_key = self.request.POST.get('new_hook_ui_key')
+            ui_value = self.request.POST.get('new_hook_ui_value')
+
+            hook_id = self.request.POST.get('hook_id')
+            new_hook = False
+
+            model = SettingsModel()
+            try:
+                if ui_value and ui_key:
+                    model.create_or_update_hook(ui_key, ui_value)
+                    h.flash(_('Added new hook'), category='success')
+                    new_hook = True
+                elif hook_id:
+                    RhodeCodeUi.delete(hook_id)
+                    Session().commit()
+
+                # check for edits
+                update = False
+                _d = self.request.POST.dict_of_lists()
+                for k, v in zip(_d.get('hook_ui_key', []),
+                                _d.get('hook_ui_value_new', [])):
+                    model.create_or_update_hook(k, v)
+                    update = True
+
+                if update and not new_hook:
+                    h.flash(_('Updated hooks'), category='success')
+                Session().commit()
+            except Exception:
+                log.exception("Exception during hook creation")
+                h.flash(_('Error occurred during hook creation'),
+                        category='error')
+
+        raise HTTPFound(h.route_path('admin_settings_hooks'))
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings_search', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_search(self):
+        c = self.load_default_context()
+        c.active = 'search'
+
+        searcher = searcher_from_config(self.request.registry.settings)
+        c.statistics = searcher.statistics(self.request.translate)
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings_labs', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_labs(self):
+        c = self.load_default_context()
+        if not c.labs_active:
+            raise HTTPFound(h.route_path('admin_settings'))
+
+        c.active = 'labs'
+        c.lab_settings = _LAB_SETTINGS
+
+        data = render('rhodecode:templates/admin/settings/settings.mako',
+                      self._get_template_context(c), self.request)
+        html = formencode.htmlfill.render(
+            data,
+            defaults=self._form_defaults(),
+            encoding="UTF-8",
+            force_defaults=False
+        )
+        return Response(html)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_labs_update', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def settings_labs_update(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'labs'
+
+        application_form = LabsSettingsForm(self.request.translate)()
+        try:
+            form_result = application_form.to_python(dict(self.request.POST))
+        except formencode.Invalid as errors:
+            h.flash(
+                _('Some form inputs contain invalid data.'),
+                category='error')
+            data = render('rhodecode:templates/admin/settings/settings.mako',
+                          self._get_template_context(c), self.request)
+            html = formencode.htmlfill.render(
+                data,
+                defaults=errors.value,
+                errors=errors.error_dict or {},
+                prefix_error=False,
+                encoding="UTF-8",
+                force_defaults=False
+            )
+            return Response(html)
+
+        try:
+            session = Session()
+            for setting in _LAB_SETTINGS:
+                setting_name = setting.key[len('rhodecode_'):]
+                sett = SettingsModel().create_or_update_setting(
+                    setting_name, form_result[setting.key], setting.type)
+                session.add(sett)
+
+        except Exception:
+            log.exception('Exception while updating lab settings')
+            h.flash(_('Error occurred during updating labs settings'),
+                    category='error')
+        else:
+            Session().commit()
+            SettingsModel().invalidate_settings_cache()
+            h.flash(_('Updated Labs settings'), category='success')
+            raise HTTPFound(h.route_path('admin_settings_labs'))
+
+        data = render('rhodecode:templates/admin/settings/settings.mako',
+                      self._get_template_context(c), self.request)
+        html = formencode.htmlfill.render(
+            data,
+            defaults=self._form_defaults(),
+            encoding="UTF-8",
+            force_defaults=False
+        )
+        return Response(html)
+
+
+# :param key: name of the setting including the 'rhodecode_' prefix
+# :param type: the RhodeCodeSetting type to use.
+# :param group: the i18ned group in which we should dispaly this setting
+# :param label: the i18ned label we should display for this setting
+# :param help: the i18ned help we should dispaly for this setting
+LabSetting = collections.namedtuple(
+    'LabSetting', ('key', 'type', 'group', 'label', 'help'))
+
+
+# This list has to be kept in sync with the form
+# rhodecode.model.forms.LabsSettingsForm.
+_LAB_SETTINGS = [
+
+]

.bumpversion.cfg

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

.coveragerc

@@ -3,15 +3,11 b''
 branch = True
 
 include =
-    rhodecode/lib/*
-    rhodecode/model/*
-    rhodecode/controllers/*
+    rhodecode/*
 
 omit =
-    rhodecode/lib/vcs/remote/*
     rhodecode/lib/dbmigrate/*
     rhodecode/lib/paster_commands/*
-    rhodecode/tests/*
 
 [report]
 

.hgignore

@@ -21,7 +21,7 b' syntax: regexp'
 ^\.rhodecode$
 
 ^rcextensions
-^_dev
+^.dev
 ^._dev
 ^build/
 ^bower_components/

.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.10.6
-
-[task:updated_translation]
+state = in_progress
+version = 4.11.0
 
 [task:generate_js_routes]
 

configs/development.ini

@@ -79,7 +79,7 b' asyncore_use_poll = true'
 #proc_name = rhodecode
 ## type of worker class, one of sync, gevent
 ## recommended for bigger setup is using of of other than sync one
-#worker_class = sync
+#worker_class = gevent
 ## The maximum number of simultaneous clients. Valid only for Gevent
 #worker_connections = 10
 ## max number of requests that worker will handle before being gracefully
@@ -295,29 +295,21 b' labs_settings_active = true'
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
-use_celery = false
-broker.host = localhost
-broker.vhost = rabbitmqhost
-broker.port = 5672
-broker.user = rabbitmq
-broker.password = qweqwe
-
-celery.imports = rhodecode.lib.celerylib.tasks
+## run: /path/to/celery worker \
+##     -E --beat --app rhodecode.lib.celerylib.loader \
+##     --scheduler rhodecode.lib.celerylib.scheduler.RcScheduler \
+##     --loglevel DEBUG --ini /path/to/rhodecode.ini
 
-celery.result.backend = amqp
-celery.result.dburi = amqp://
-celery.result.serialier = json
+use_celery = false
 
-#celery.send.task.error.emails = true
-#celery.amqp.task.result.expires = 18000
+## connection url to the message broker (default rabbitmq)
+celery.broker_url = amqp://rabbitmq:qweqwe@localhost:5672/rabbitmqhost
 
-celeryd.concurrency = 2
-#celeryd.log.file = celeryd.log
-celeryd.log.level = debug
-celeryd.max.tasks.per.child = 1
+## maximum tasks to execute before worker restart
+celery.max_tasks_per_child = 100
 
 ## tasks will never be sent to the queue, but executed locally instead.
-celery.always.eager = false
+celery.task_always_eager = false
 
 ####################################
 ###         BEAKER CACHE        ####
@@ -567,7 +559,7 b' vcs.hooks.protocol = http'
 
 vcs.server.log_level = debug
 ## Start VCSServer with this instance as a subprocess, usefull for development
-vcs.start_server = true
+vcs.start_server = false
 
 ## List of enabled VCS backends, available options are:
 ## `hg`  - mercurial
@@ -649,7 +641,7 b' custom.conf = 1'
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper
+keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper, celery
 
 [handlers]
 keys = console, console_sql
@@ -688,6 +680,11 b' handlers ='
 qualname = ssh_wrapper
 propagate = 1
 
+[logger_celery]
+level = DEBUG
+handlers =
+qualname = celery
+
 
 ##############
 ## HANDLERS ##

configs/gunicorn_config.py

@@ -28,9 +28,30 b" accesslog = '-'"
 loglevel = 'debug'
 
 # SECURITY
+
+# The maximum size of HTTP request line in bytes.
 limit_request_line = 4094
-limit_request_fields = 100
-limit_request_field_size = 8190
+
+# Limit the number of HTTP headers fields in a request.
+limit_request_fields = 1024
+
+# Limit the allowed size of an HTTP request header field.
+# Value is a positive number or 0.
+# Setting it to 0 will allow unlimited header field sizes.
+limit_request_field_size = 0
+
+
+# Timeout for graceful workers restart.
+# After receiving a restart signal, workers have this much time to finish
+# serving requests. Workers still alive after the timeout (starting from the
+# receipt of the restart signal) are force killed.
+graceful_timeout = 30
+
+
+# The number of seconds to wait for requests on a Keep-Alive connection.
+# Generally set in the 1-5 seconds range.
+keepalive = 2
+
 
 # SERVER MECHANICS
 # None == system temp dir
@@ -57,10 +78,18 b' def pre_exec(server):'
     server.log.info("Forked child, re-executing.")
 
 
+def on_starting(server):
+    server.log.info("Server is starting.")
+
+
 def when_ready(server):
     server.log.info("Server is ready. Spawning workers")
 
 
+def on_reload(server):
+    pass
+
+
 def worker_int(worker):
     worker.log.info("[<%-10s>] worker received INT or QUIT signal", worker.pid)
 
@@ -81,6 +110,14 b' def worker_abort(worker):'
     worker.log.info("[<%-10s>] worker received SIGABRT signal", worker.pid)
 
 
+def worker_exit(server, worker):
+    worker.log.info("[<%-10s>] worker exit", worker.pid)
+
+
+def child_exit(server, worker):
+    worker.log.info("[<%-10s>] worker child exit", worker.pid)
+
+
 def pre_request(worker, req):
     return
     worker.log.debug("[<%-10s>] PRE WORKER: %s %s",
@@ -93,6 +130,7 b' def post_request(worker, req, environ, r'
                      req.method, req.path, resp.status_code)
 
 
+
 class RhodeCodeLogger(Logger):
     """
     Custom Logger that allows some customization that gunicorn doesn't allow

configs/production.ini

@@ -79,7 +79,7 b' workers = 2'
 proc_name = rhodecode
 ## type of worker class, one of sync, gevent
 ## recommended for bigger setup is using of of other than sync one
-worker_class = sync
+worker_class = gevent
 ## The maximum number of simultaneous clients. Valid only for Gevent
 #worker_connections = 10
 ## max number of requests that worker will handle before being gracefully
@@ -270,29 +270,21 b' labs_settings_active = true'
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
-use_celery = false
-broker.host = localhost
-broker.vhost = rabbitmqhost
-broker.port = 5672
-broker.user = rabbitmq
-broker.password = qweqwe
-
-celery.imports = rhodecode.lib.celerylib.tasks
+## run: /path/to/celery worker \
+##     -E --beat --app rhodecode.lib.celerylib.loader \
+##     --scheduler rhodecode.lib.celerylib.scheduler.RcScheduler \
+##     --loglevel DEBUG --ini /path/to/rhodecode.ini
 
-celery.result.backend = amqp
-celery.result.dburi = amqp://
-celery.result.serialier = json
+use_celery = false
 
-#celery.send.task.error.emails = true
-#celery.amqp.task.result.expires = 18000
+## connection url to the message broker (default rabbitmq)
+celery.broker_url = amqp://rabbitmq:qweqwe@localhost:5672/rabbitmqhost
 
-celeryd.concurrency = 2
-#celeryd.log.file = celeryd.log
-celeryd.log.level = debug
-celeryd.max.tasks.per.child = 1
+## maximum tasks to execute before worker restart
+celery.max_tasks_per_child = 100
 
 ## tasks will never be sent to the queue, but executed locally instead.
-celery.always.eager = false
+celery.task_always_eager = false
 
 ####################################
 ###         BEAKER CACHE        ####
@@ -619,7 +611,7 b' custom.conf = 1'
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper
+keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper, celery
 
 [handlers]
 keys = console, console_sql
@@ -658,6 +650,11 b' handlers ='
 qualname = ssh_wrapper
 propagate = 1
 
+[logger_celery]
+level = DEBUG
+handlers =
+qualname = celery
+
 
 ##############
 ## HANDLERS ##

default.nix

@@ -185,6 +185,7 b' let'
         ln -s ${self.supervisor}/bin/supervisor* $out/bin/
         ln -s ${self.PasteScript}/bin/paster $out/bin/
         ln -s ${self.channelstream}/bin/channelstream $out/bin/
+        ln -s ${self.celery}/bin/celery $out/bin/
 
         # rhodecode-tools
         ln -s ${self.rhodecode-tools}/bin/rhodecode-* $out/bin/

docs/admin/backup-restore.rst

@@ -70,7 +70,7 b' backup location:'
    $ mysql -u <uname> -p <pass> rhodecode_db_name < mysql-db-backup
 
    # For PostgreSQL DBs
-   $ PGPASSWORD=<pass> pg_dump rhodecode_db_name > postgresql-db-backup
+   $ PGPASSWORD=<pass> pg_dump --inserts -U <uname> -h localhost rhodecode_db_name > postgresql-db-backup
    # PosgreSQL restore
    $ PGPASSWORD=<pass> psql -U <uname> -h localhost -d rhodecode_db_name -1 -f postgresql-db-backup
 

docs/admin/enable-debug.rst

@@ -47,7 +47,7 b' the ``debug`` level.'
     ### LOGGING CONFIGURATION   ####
     ################################
     [loggers]
-    keys = root, routes, rhodecode, sqlalchemy, beaker, templates
+    keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper
 
     [handlers]
     keys = console, console_sql, file, file_rotating
@@ -75,12 +75,6 b' the ``debug`` level.'
     qualname = beaker.container
     propagate = 1
 
-    [logger_templates]
-    level = INFO
-    handlers =
-    qualname = pylons.templating
-    propagate = 1
-
     [logger_rhodecode]
     level = DEBUG
     handlers =

docs/admin/nginx-tuning.rst

@@ -9,7 +9,7 b' timeout during large pushes.'
 .. code-block:: nginx
 
     proxy_redirect              off;
-    proxy_set_header            Host $host;
+    proxy_set_header            Host $http_host;
 
     ## needed for container auth
     # proxy_set_header            REMOTE_USER $remote_user;

docs/admin/security-tips.rst

@@ -13,3 +13,4 b' instances are configured in as secure a '
    sec-x-frame
    sec-instance-basics
    sec-ip-white
+   sec-sophos-umc

docs/api/methods/deprecated-methods.rst

@@ -38,13 +38,13 b' changeset_comment'
 
    Example error output:
 
-   .. code-block:: javascript
+   .. code-block:: json
 
        {
-           "id" : "<id_given_in_input>",
+           "id" : <id_given_in_input>,
            "result" : {
                "msg": "Commented on commit `<revision>` for repository `<repoid>`",
-               "status_change": null or "<status>",
+               "status_change": null or <status>,
                "success": true
            },
            "error" : null

docs/api/methods/pull-request-methods.rst

@@ -6,7 +6,7 b' pull_request methods'
 close_pull_request 
 ------------------
 
-.. py:function:: close_pull_request(apiuser, repoid, pullrequestid, userid=<Optional:<OptionalAttr:apiuser>>, message=<Optional:''>)
+.. py:function:: close_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, userid=<Optional:<OptionalAttr:apiuser>>, message=<Optional:''>)
 
    Close the pull request specified by `pullrequestid`.
 
@@ -39,7 +39,7 b' close_pull_request'
 comment_pull_request 
 --------------------
 
-.. py:function:: comment_pull_request(apiuser, repoid, pullrequestid, message=<Optional:None>, commit_id=<Optional:None>, status=<Optional:None>, comment_type=<Optional:u'note'>, resolves_comment_id=<Optional:None>, userid=<Optional:<OptionalAttr:apiuser>>)
+.. py:function:: comment_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, message=<Optional:None>, commit_id=<Optional:None>, status=<Optional:None>, comment_type=<Optional:u'note'>, resolves_comment_id=<Optional:None>, userid=<Optional:<OptionalAttr:apiuser>>)
 
    Comment on the pull request specified with the `pullrequestid`,
    in the |repo| specified by the `repoid`, and optionally change the
@@ -47,7 +47,7 b' comment_pull_request'
 
    :param apiuser: This is filled automatically from the |authtoken|.
    :type apiuser: AuthUser
-   :param repoid: The repository name or repository ID.
+   :param repoid: Optional repository name or repository ID.
    :type repoid: str or int
    :param pullrequestid: The pull request ID.
    :type pullrequestid: int
@@ -120,14 +120,14 b' create_pull_request'
 get_pull_request 
 ----------------
 
-.. py:function:: get_pull_request(apiuser, repoid, pullrequestid)
+.. py:function:: get_pull_request(apiuser, pullrequestid, repoid=<Optional:None>)
 
    Get a pull request based on the given ID.
 
    :param apiuser: This is filled automatically from the |authtoken|.
    :type apiuser: AuthUser
-   :param repoid: Repository name or repository ID from where the pull
-       request was opened.
+   :param repoid: Optional, repository name or repository ID from where
+       the pull request was opened.
    :type repoid: str or int
    :param pullrequestid: ID of the requested pull request.
    :type pullrequestid: int
@@ -199,6 +199,48 b' get_pull_request'
       "error": null
 
 
+get_pull_request_comments 
+-------------------------
+
+.. py:function:: get_pull_request_comments(apiuser, pullrequestid, repoid=<Optional:None>)
+
+   Get all comments of pull request specified with the `pullrequestid`
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Optional repository name or repository ID.
+   :type repoid: str or int
+   :param pullrequestid: The pull request ID.
+   :type pullrequestid: int
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result : [
+           {
+             "comment_author": {
+               "active": true,
+               "full_name_or_username": "Tom Gore",
+               "username": "admin"
+             },
+             "comment_created_on": "2017-01-02T18:43:45.533",
+             "comment_f_path": null,
+             "comment_id": 25,
+             "comment_lineno": null,
+             "comment_status": {
+               "status": "under_review",
+               "status_lbl": "Under Review"
+             },
+             "comment_text": "Example text",
+             "comment_type": null,
+             "pull_request_version": null
+           }
+       ],
+       error :  null
+
+
 get_pull_requests 
 -----------------
 
@@ -208,7 +250,7 b' get_pull_requests'
 
    :param apiuser: This is filled automatically from the |authtoken|.
    :type apiuser: AuthUser
-   :param repoid: Repository name or repository ID.
+   :param repoid: Optional repository name or repository ID.
    :type repoid: str or int
    :param status: Only return pull requests with the specified status.
        Valid options are.
@@ -289,14 +331,14 b' get_pull_requests'
 merge_pull_request 
 ------------------
 
-.. py:function:: merge_pull_request(apiuser, repoid, pullrequestid, userid=<Optional:<OptionalAttr:apiuser>>)
+.. py:function:: merge_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, userid=<Optional:<OptionalAttr:apiuser>>)
 
    Merge the pull request specified by `pullrequestid` into its target
    repository.
 
    :param apiuser: This is filled automatically from the |authtoken|.
    :type apiuser: AuthUser
-   :param repoid: The Repository name or repository ID of the
+   :param repoid: Optional, repository name or repository ID of the
        target repository to which the |pr| is to be merged.
    :type repoid: str or int
    :param pullrequestid: ID of the pull request which shall be merged.
@@ -326,13 +368,13 b' merge_pull_request'
 update_pull_request 
 -------------------
 
-.. py:function:: update_pull_request(apiuser, repoid, pullrequestid, title=<Optional:''>, description=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>)
+.. py:function:: update_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, title=<Optional:''>, description=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>)
 
    Updates a pull request.
 
    :param apiuser: This is filled automatically from the |authtoken|.
    :type apiuser: AuthUser
-   :param repoid: The repository name or repository ID.
+   :param repoid: Optional repository name or repository ID.
    :type repoid: str or int
    :param pullrequestid: The pull request ID.
    :type pullrequestid: int

docs/api/methods/repo-group-methods.rst

@@ -115,7 +115,7 b' get_repo_group'
            "group_description": "repo group description",
            "group_id": 14,
            "group_name": "group name",
-           "members": [
+           "permissions": [
              {
                "name": "super-admin-username",
                "origin": "super-admin",

docs/api/methods/repo-methods.rst

@@ -306,26 +306,6 b' get_repo'
            "lock_reason": null,
            "locked_by": null,
            "locked_date": null,
-           "members": [
-             {
-               "name": "super-admin-name",
-               "origin": "super-admin",
-               "permission": "repository.admin",
-               "type": "user"
-             },
-             {
-               "name": "owner-name",
-               "origin": "owner",
-               "permission": "repository.admin",
-               "type": "user"
-             },
-             {
-               "name": "user-group-name",
-               "origin": "permission",
-               "permission": "repository.write",
-               "type": "user_group"
-             }
-           ],
            "owner": "owner-name",
            "permissions": [
              {
@@ -533,9 +513,6 b' get_repo_settings'
                "hooks_outgoing_pull_logger": true,
                "phases_publish": "True",
                "rhodecode_hg_use_rebase_for_merging": true,
-               "rhodecode_hg_close_branch_before_merging": false,
-               "rhodecode_git_use_rebase_for_merging": true,
-               "rhodecode_git_close_branch_before_merging": false,
                "rhodecode_pr_merge_enabled": true,
                "rhodecode_use_outdated_comments": true
            }

docs/api/methods/user-group-methods.rst

@@ -162,7 +162,7 b' get_user_group'
            "active": true,
            "group_description": "group description",
            "group_name": "group name",
-           "members": [
+           "permissions": [
              {
                "name": "owner-name",
                "origin": "owner",
@@ -183,6 +183,12 b' get_user_group'
                "type": "user_group"
              }
            ],
+           "permissions_summary": {
+             "repositories": {
+               "aa-root-level-repo-1": "repository.admin"
+             },
+             "repositories_groups": {}
+           },
            "owner": "owner name",
            "users": [],
            "users_group_id": 2

docs/api/methods/user-methods.rst

@@ -160,7 +160,8 b' get_user'
            "last_login": "Timestamp",
            "last_activity": "Timestamp",
            "lastname": "surnae",
-           "permissions": {
+           "permissions": <deprecated>,
+           "permissions_summary": {
              "global": [
                "hg.inherit_default_perms.true",
                "usergroup.read",
@@ -178,7 +179,7 b' get_user'
              "repositories": { "username/example": "repository.write"},
              "repositories_groups": { "user-group/repo": "group.none" },
              "user_groups": { "user_group_name": "usergroup.read" }
-           },
+           }
            "user_id": 32,
            "username": "username"
          }

docs/auth/ssh-connection.rst

@@ -64,7 +64,7 b' 2. Enable the SSH module on instance.'
         ssh.wrapper_cmd_allow_shell = false
 
         ## Enables logging, and detailed output send back to the client during SSH
-        ## operations. Usefull for debugging, shouldn't be used in production.
+        ## operations. Useful for debugging, shouldn't be used in production.
         ssh.enable_debug_logging = false
 
         ## Paths to binary executable, by default they are the names, but we can
@@ -111,20 +111,22 b' 4. Add the public key to your user accou'
        Then add, remove your SSH key and try connecting again.
        Debug logging will be printed to help find the problems on the server side.
 
-   Test connection using the ssh command from the local machine
+   Test connection using the ssh command from the local machine. Make sure
+   to use the use who is running the |RCE| server, and not your username from
+   the web interface.
 
 
    For SVN:
 
    .. code-block:: bash
 
-       SVN_SSH="ssh -i ~/.ssh/id_rsa_test_ssh" svn checkout svn+ssh://rhodecode@rc-server/repo_name
+       SVN_SSH="ssh -i ~/.ssh/id_rsa_test_ssh_private.key" svn checkout svn+ssh://rhodecode@rc-server/repo_name
 
    For GIT:
 
    .. code-block:: bash
 
-       GIT_SSH_COMMAND='ssh -i ~/.ssh/id_rsa_test_ssh' git clone ssh://rhodecode@rc-server/repo_name
+       GIT_SSH_COMMAND='ssh -i ~/.ssh/id_rsa_test_ssh_private.key' git clone ssh://rhodecode@rc-server/repo_name
 
    For Mercurial:
 
@@ -133,6 +135,6 b' 4. Add the public key to your user accou'
        Add to hgrc:
 
        [ui]
-       ssh = ssh -C -i ~/.ssh/id_rsa_test_ssh
+       ssh = ssh -C -i ~/.ssh/id_rsa_test_ssh_private.key
 
        hg clone ssh://rhodecode@rc-server/repo_name

docs/default.nix

@@ -11,128 +11,253 b' let'
   python = pkgs.python27Packages.python;
 
   Jinja2 = buildPythonPackage rec {
-    name = "Jinja2-2.7.3";
+    name = "Jinja2-2.9.6";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [MarkupSafe];
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/J/Jinja2/${name}.tar.gz";
-      md5 = "b9dffd2f3b43d673802fe857c8445b1a";
+      url = "https://pypi.python.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
+      md5 = "6411537324b4dba0956aaa8109f3c77b";
     };
-    propagatedBuildInputs = [ MarkupSafe ];
   };
 
   MarkupSafe = buildPythonPackage rec {
-    name = "MarkupSafe-0.23";
+    name = "MarkupSafe-1.0";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/M/MarkupSafe/${name}.tar.gz";
-      md5 = "f5ab3deee4c37cd6a922fb81e730da6e";
+      url = "https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
+      md5 = "2fcedc9284d50e577b5192e8e3578355";
     };
   };
 
-  Pygments = buildPythonPackage rec {
-    name = "Pygments-2.1.3";
+  Pygments = buildPythonPackage {
+    name = "Pygments-2.2.0";
+    buildInputs = [];
     doCheck = false;
+    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b8/67/ab177979be1c81bc99c8d0592ef22d547e70bb4c6815c383286ed5dec504/Pygments-2.1.3.tar.gz";
-      md5 = "ed3fba2467c8afcda4d317e4ef2c6150";
-    };
-  };
-
-  alabaster = buildPythonPackage rec {
-    name = "alabaster-0.7.3";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/a/alabaster/${name}.tar.gz";
-      md5 = "67428d1383fd833f1282fed5deba0898";
+      url = "https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
+      md5 = "13037baca42f16917cbd5ad2fab50844";
     };
   };
 
-  six = buildPythonPackage rec {
-    name = "six-1.9.0";
+  Sphinx = buildPythonPackage (rec {
+    name = "Sphinx-1.6.5";
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/s/six/${name}.tar.gz";
-      md5 = "476881ef4012262dfc8adc645ee786c4";
+      url = "https://pypi.python.org/packages/8b/7e/b188d9a3b9c938e736e02a74c1363c2888e095d770df2c72b4c312f9fdcb/Sphinx-1.6.5.tar.gz";
+      md5 = "cd73118c21ec610432e63e6421ec54f1";
+    };
+    propagatedBuildInputs = [
+        six
+        Jinja2
+        Pygments
+        docutils
+        snowballstemmer
+        babel
+        alabaster
+        imagesize
+        requests
+        setuptools
+        sphinxcontrib-websupport
+        typing
+
+        # special cases
+        pytz
+        sphinx_rtd_theme
+
+    ];
+  });
+
+  alabaster = buildPythonPackage rec {
+    name = "alabaster-0.7.10";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/d0/a5/e3a9ad3ee86aceeff71908ae562580643b955ea1b1d4f08ed6f7e8396bd7/alabaster-0.7.10.tar.gz";
+      md5 = "7934dccf38801faa105f6e7b4784f493";
     };
   };
 
-  snowballstemmer = buildPythonPackage rec {
-    name = "snowballstemmer-1.2.0";
+  babel = buildPythonPackage {
+    name = "babel-2.5.1";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [pytz];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/s/snowballstemmer/${name}.tar.gz";
-      md5 = "51f2ef829db8129dd0f2354f0b209970";
+      url = "https://pypi.python.org/packages/5a/22/63f1dbb8514bb7e0d0c8a85cc9b14506599a075e231985f98afd70430e1f/Babel-2.5.1.tar.gz";
+      md5 = "60228b3ce93a203357158b909afe8ae1";
     };
   };
 
-  pytz = buildPythonPackage rec {
-    name = "pytz-2015.2";
+  certifi = buildPythonPackage {
+    name = "certifi-2017.11.5";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pytz/${name}.tar.gz";
-      md5 = "08440d994cfbbf13d3343362cc3173f7";
+      url = "https://pypi.python.org/packages/23/3f/8be01c50ed24a4bd6b8da799839066ce0288f66f5e11f0367323467f0cbc/certifi-2017.11.5.tar.gz";
+      md5 = "c15ac46ed1fe4b607ff3405928f9a992";
+    };
+  };
+
+  chardet = buildPythonPackage {
+    name = "chardet-3.0.4";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz";
+      md5 = "7dd1ba7f9c77e32351b0a0cfacf4055c";
     };
   };
 
-  babel = buildPythonPackage rec {
-    name = "Babel-1.3";
+  docutils = buildPythonPackage {
+    name = "docutils-0.14";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/B/Babel/${name}.tar.gz";
-      md5 = "5264ceb02717843cbc9ffce8e6e06bdb";
+      url = "https://pypi.python.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
+      md5 = "c53768d63db3873b7d452833553469de";
     };
-    propagatedBuildInputs = [
-    pytz
-    ];
   };
 
-  imagesize = buildPythonPackage rec {
+  idna = buildPythonPackage {
+    name = "idna-2.6";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/f4/bd/0467d62790828c23c47fc1dfa1b1f052b24efdf5290f071c7a91d0d82fd3/idna-2.6.tar.gz";
+      md5 = "c706e2790b016bd0ed4edd2d4ba4d147";
+    };
+  };
+
+  imagesize = buildPythonPackage {
     name = "imagesize-0.7.1";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/${name}.tar.gz";
+      url = "https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/imagesize-0.7.1.tar.gz";
       md5 = "976148283286a6ba5f69b0f81aef8052";
     };
   };
 
-  Sphinx = buildPythonPackage (rec {
-    name = "Sphinx-1.4.8";
+  pytz = buildPythonPackage {
+    name = "pytz-2017.3";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/1f/f6/e54a7aad73e35232356103771ae76306dadd8546b024c646fbe75135571c/${name}.tar.gz";
-      md5 = "5ec718a4855917e149498bba91b74e67";
+      url = "https://pypi.python.org/packages/60/88/d3152c234da4b2a1f7a989f89609ea488225eaea015bc16fbde2b3fdfefa/pytz-2017.3.zip";
+      md5 = "7006b56c0d68a162d9fe57d4249c3171";
+    };
+  };
+
+  requests = buildPythonPackage {
+    name = "requests-2.18.4";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [chardet idna urllib3 certifi];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/b0/e1/eab4fc3752e3d240468a8c0b284607899d2fbfb236a56b7377a329aa8d09/requests-2.18.4.tar.gz";
+      md5 = "081412b2ef79bdc48229891af13f4d82";
     };
-    propagatedBuildInputs = [
-      docutils
-      Jinja2
-      Pygments
-      alabaster
-      six
-      snowballstemmer
-      pytz
-      babel
-      imagesize
+  };
+
+  setuptools = buildPythonPackage {
+    name = "setuptools-36.6.0";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/45/29/8814bf414e7cd1031e1a3c8a4169218376e284ea2553cc0822a6ea1c2d78/setuptools-36.6.0.zip";
+      md5 = "74663b15117d9a2cc5295d76011e6fd1";
+    };
+  };
 
-      # TODO: johbo: Had to include it here so that can be imported
-      sphinx_rtd_theme
-    ];
-  });
+  six = buildPythonPackage {
+    name = "six-1.11.0";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
+      md5 = "d12789f9baf7e9fb2524c0c64f1773f8";
+    };
+  };
 
-  docutils = buildPythonPackage rec {
-    name = "docutils-0.12";
+  snowballstemmer = buildPythonPackage {
+    name = "snowballstemmer-1.2.1";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/d/docutils/${name}.tar.gz";
-      md5 = "4622263b62c5c771c03502afa3157768";
+      url = "https://pypi.python.org/packages/20/6b/d2a7cb176d4d664d94a6debf52cd8dbae1f7203c8e42426daa077051d59c/snowballstemmer-1.2.1.tar.gz";
+      md5 = "643b019667a708a922172e33a99bf2fa";
     };
   };
 
-  sphinx_rtd_theme = buildPythonPackage rec {
-    name = "sphinx_rtd_theme-0.1.9";
+  sphinx-rtd-theme = buildPythonPackage {
+    name = "sphinx-rtd-theme-0.2.5b1";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/59/e4/9e3a74a3271e6734911d3f549e8439db53b8ac29adf10c8f698e6c86246b/sphinx_rtd_theme-0.2.5b1.tar.gz";
+      md5 = "0923473a43bd2527f32151f195f2a521";
+    };
+  };
+
+  sphinxcontrib-websupport = buildPythonPackage {
+    name = "sphinxcontrib-websupport-1.0.1";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sphinx_rtd_theme/${name}.tar.gz";
-      md5 = "86a25c8d47147c872e42dc84cc66f97b";
+      url = "https://pypi.python.org/packages/c5/6b/f0630436b931ad4f8331a9399ca18a7d447f0fcc0c7178fb56b1aee68d01/sphinxcontrib-websupport-1.0.1.tar.gz";
+      md5 = "84df26463b1ba65b07f926dbe2055665";
+    };
+  };
+
+  typing = buildPythonPackage {
+    name = "typing-3.6.2";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/ca/38/16ba8d542e609997fdcd0214628421c971f8c395084085354b11ff4ac9c3/typing-3.6.2.tar.gz";
+      md5 = "143af0bf3afd1887622771f2f1ffe8e1";
+    };
+  };
+
+  urllib3 = buildPythonPackage {
+    name = "urllib3-1.22";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/ee/11/7c59620aceedcc1ef65e156cc5ce5a24ef87be4107c2b74458464e437a5d/urllib3-1.22.tar.gz";
+      md5 = "0da7bed3fe94bf7dc59ae37885cc72f7";
+    };
+  };
+
+
+  sphinx_rtd_theme = buildPythonPackage rec {
+    name = "sphinx-rtd-theme-0.2.5b1";
+    buildInputs = [];
+    doCheck = false;
+    propagatedBuildInputs = [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/59/e4/9e3a74a3271e6734911d3f549e8439db53b8ac29adf10c8f698e6c86246b/sphinx_rtd_theme-0.2.5b1.tar.gz";
+      md5 = "0923473a43bd2527f32151f195f2a521";
     };
 
-    # Note: johbo: Sphinx needs this package and this package needs sphinx,
-    # ignore the requirements file to solve this cycle.
-    postPatch = ''
-      rm requirements.txt
-      touch requirements.txt
-    '';
 
-    # TODO: johbo: Tests would require sphinx and this creates recursion issues
-    doCheck = false;
   };
 
 in python.buildEnv.override {

docs/release-notes/release-notes.rst

@@ -9,6 +9,7 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.11.0.rst
    release-notes-4.10.6.rst
    release-notes-4.10.5.rst
    release-notes-4.10.4.rst

grunt_config.json

@@ -42,6 +42,8 b''
         "<%= dirs.js.src %>/bootstrap.js",
         "<%= dirs.js.src %>/i18n_utils.js",
         "<%= dirs.js.src %>/deform.js",
+        "<%= dirs.js.src %>/ejs.js",
+        "<%= dirs.js.src %>/ejs_templates/utils.js",
         "<%= dirs.js.src %>/plugins/jquery.pjax.js",
         "<%= dirs.js.src %>/plugins/jquery.dataTables.js",
         "<%= dirs.js.src %>/plugins/flavoured_checkbox.js",

pkgs/bower-packages.nix

@@ -7,7 +7,7 b' buildEnv { name = "bower-env"; ignoreCol'
   (fetchbower "paper-tooltip" "PolymerElements/paper-tooltip#1.1.3" "PolymerElements/paper-tooltip#^1.1.2" "0vmrm1n8k9sk9nvqy03q177axy22pia6i3j1gxbk72j3pqiqvg6k")
   (fetchbower "paper-toast" "PolymerElements/paper-toast#1.3.0" "PolymerElements/paper-toast#^1.3.0" "0x9rqxsks5455s8pk4aikpp99ijdn6kxr9gvhwh99nbcqdzcxq1m")
   (fetchbower "paper-toggle-button" "PolymerElements/paper-toggle-button#1.2.0" "PolymerElements/paper-toggle-button#^1.2.0" "0mphcng3ngspbpg4jjn0mb91nvr4xc1phq3qswib15h6sfww1b2w")
-  (fetchbower "iron-ajax" "PolymerElements/iron-ajax#1.4.3" "PolymerElements/iron-ajax#^1.4.3" "1b1z3112ggjdflgrwbpmnbsh3kgcm4hn255wshvrlzds4w069gja")
+  (fetchbower "iron-ajax" "PolymerElements/iron-ajax#1.4.4" "PolymerElements/iron-ajax#^1.4.4" "0jpi7ik3zljw8yh2ccc85r26lcpzmkc2nl1kn6fqdx57zkzk9v5b")
   (fetchbower "iron-autogrow-textarea" "PolymerElements/iron-autogrow-textarea#1.0.13" "PolymerElements/iron-autogrow-textarea#^1.0.13" "0zwhpl97vii1s8k0lgain8i9dnw29b0mxc5ixdscx9las13n2lqq")
   (fetchbower "iron-a11y-keys" "PolymerElements/iron-a11y-keys#1.0.6" "PolymerElements/iron-a11y-keys#^1.0.6" "1xz3mgghfcxixq28sdb654iaxj4nyi1bzcwf77ydkms6fviqs9mv")
   (fetchbower "iron-flex-layout" "PolymerElements/iron-flex-layout#1.3.1" "PolymerElements/iron-flex-layout#^1.0.0" "0nswv3ih3bhflgcd2wjfmddqswzgqxb2xbq65jk9w3rkj26hplbl")

pkgs/python-packages-overrides.nix

@@ -31,6 +31,12 b' self: super: {'
     };
   });
 
+  testpath = super.testpath.override (attrs: {
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  });
+
   gnureadline = super.gnureadline.override (attrs: {
     buildInputs = attrs.buildInputs ++ [
       pkgs.ncurses
@@ -61,23 +67,6 b' self: super: {'
     ];
   });
 
-  celery = super.celery.override (attrs: {
-    # The current version of kombu needs some patching to work with the
-    # other libs. Should be removed once we update celery and kombu.
-    patches = [
-      ./patch-celery-dateutil.diff
-    ];
-  });
-
-  kombu = super.kombu.override (attrs: {
-    # The current version of kombu needs some patching to work with the
-    # other libs. Should be removed once we update celery and kombu.
-    patches = [
-      ./patch-kombu-py-2-7-11.diff
-      ./patch-kombu-msgpack.diff
-    ];
-  });
-
   lxml = super.lxml.override (attrs: {
     # johbo: On 16.09 we need this to compile on darwin, otherwise compilation
     # fails on Darwin.
@@ -114,10 +103,6 b' self: super: {'
     };
   });
 
-  py-gfm = super.py-gfm.override  {
-    name = "py-gfm-0.1.3.rhodecode-upstream1";
-  };
-
   pycurl = super.pycurl.override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       pkgs.curl
@@ -133,10 +118,6 b' self: super: {'
     };
   });
 
-  Pylons = super.Pylons.override (attrs: {
-    name = "Pylons-1.0.2.rhodecode-patch1";
-  });
-
   pyramid = super.pyramid.override (attrs: {
     postFixup = ''
       wrapPythonPrograms
@@ -208,12 +189,6 b' self: super: {'
     };
   });
 
-  amqplib = super.amqplib.override (attrs: {
-    meta = {
-      license = pkgs.lib.licenses.lgpl3;
-    };
-  });
-
   docutils = super.docutils.override (attrs: {
     meta = {
       license = pkgs.lib.licenses.bsd2;

pkgs/python-packages.nix

@@ -68,13 +68,13 b''
     };
   };
   Jinja2 = super.buildPythonPackage {
-    name = "Jinja2-2.7.3";
+    name = "Jinja2-2.9.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [MarkupSafe];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b0/73/eab0bca302d6d6a0b5c402f47ad1760dc9cb2dd14bbc1873ad48db258e4d/Jinja2-2.7.3.tar.gz";
-      md5 = "b9dffd2f3b43d673802fe857c8445b1a";
+      url = "https://pypi.python.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
+      md5 = "6411537324b4dba0956aaa8109f3c77b";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -94,26 +94,26 b''
     };
   };
   Markdown = super.buildPythonPackage {
-    name = "Markdown-2.6.8";
+    name = "Markdown-2.6.9";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-2.6.8.tar.gz";
-      md5 = "d9ef057a5bd185f6f536400a31fc5d45";
+      url = "https://pypi.python.org/packages/29/82/dfe242bcfd9eec0e7bf93a80a8f8d8515a95b980c44f5c0b45606397a423/Markdown-2.6.9.tar.gz";
+      md5 = "56547d362a9abcf30955b8950b08b5e3";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   MarkupSafe = super.buildPythonPackage {
-    name = "MarkupSafe-0.23";
+    name = "MarkupSafe-1.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c0/41/bae1254e0396c0cc8cf1751cb7d9afc90a602353695af5952530482c963f/MarkupSafe-0.23.tar.gz";
-      md5 = "f5ab3deee4c37cd6a922fb81e730da6e";
+      url = "https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
+      md5 = "2fcedc9284d50e577b5192e8e3578355";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -159,13 +159,13 b''
     };
   };
   PasteScript = super.buildPythonPackage {
-    name = "PasteScript-1.7.5";
+    name = "PasteScript-2.0.2";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [Paste PasteDeploy];
+    propagatedBuildInputs = with self; [Paste PasteDeploy six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a5/05/fc60efa7c2f17a1dbaeccb2a903a1e90902d92b9d00eebabe3095829d806/PasteScript-1.7.5.tar.gz";
-      md5 = "4c72d78dcb6bb993f30536842c16af4d";
+      url = "https://pypi.python.org/packages/e5/f0/78e766c3dcc61a4f3a6f71dd8c95168ae9c7a31722b5663d19c1fdf62cb6/PasteScript-2.0.2.tar.gz";
+      md5 = "ccb3045445097192ca71a13b746c77b2";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -184,56 +184,30 b''
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  Pylons = super.buildPythonPackage {
-    name = "Pylons-1.0.2.dev20171106";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [Routes WebHelpers Beaker Paste PasteDeploy PasteScript FormEncode simplejson decorator nose Mako WebError WebTest Tempita MarkupSafe WebOb];
-    src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/pylons/archive/707354ee4261b9c10450404fc9852ccea4fd667d.tar.gz?md5=f26633726fa2cd3a340316ee6a5d218f";
-      md5 = "f26633726fa2cd3a340316ee6a5d218f";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
   Routes = super.buildPythonPackage {
-    name = "Routes-1.13";
+    name = "Routes-2.4.1";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [repoze.lru];
+    propagatedBuildInputs = with self; [six repoze.lru];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/88/d3/259c3b3cde8837eb9441ab5f574a660e8a4acea8f54a078441d4d2acac1c/Routes-1.13.tar.gz";
-      md5 = "d527b0ab7dd9172b1275a41f97448783";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  SQLAlchemy = super.buildPythonPackage {
-    name = "SQLAlchemy-1.1.11";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/59/f1/28f2205c3175e6bf32300c0f30f9d91dbc9eb910debbff3ffecb88d18528/SQLAlchemy-1.1.11.tar.gz";
-      md5 = "3de387eddb4012083a4562928c511e43";
+      url = "https://pypi.python.org/packages/33/38/ea827837e68d9c7dde4cff7ec122a93c319f0effc08ce92a17095576603f/Routes-2.4.1.tar.gz";
+      md5 = "c058dff6832941dec47e0d0052548ad8";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Sphinx = super.buildPythonPackage {
-    name = "Sphinx-1.2.2";
+  SQLAlchemy = super.buildPythonPackage {
+    name = "SQLAlchemy-1.1.15";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [Pygments docutils Jinja2];
+    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/0a/50/34017e6efcd372893a416aba14b84a1a149fc7074537b0e9cb6ca7b7abe9/Sphinx-1.2.2.tar.gz";
-      md5 = "3dc73ccaa8d0bfb2d62fb671b1f7e8a4";
+      url = "https://pypi.python.org/packages/c2/f6/11fcc1ce19a7cb81b1c9377f4e27ce3813265611922e355905e57c44d164/SQLAlchemy-1.1.15.tar.gz";
+      md5 = "077f9bd3339957f53068b5572a152674";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
   Tempita = super.buildPythonPackage {
@@ -315,13 +289,13 b''
     };
   };
   WebTest = super.buildPythonPackage {
-    name = "WebTest-2.0.27";
+    name = "WebTest-2.0.29";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six WebOb waitress beautifulsoup4];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/80/fa/ca3a759985c72e3a124cbca3e1f8a2e931a07ffd31fd45d8f7bf21cb95cf/WebTest-2.0.27.tar.gz";
-      md5 = "54e6515ac71c51b6fc90179483c749ad";
+      url = "https://pypi.python.org/packages/94/de/8f94738be649997da99c47b104aa3c3984ecec51a1d8153ed09638253d56/WebTest-2.0.29.tar.gz";
+      md5 = "30b4cf0d340b9a5335fac4389e6f84fc";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -341,52 +315,39 b''
     };
   };
   alembic = super.buildPythonPackage {
-    name = "alembic-0.9.2";
+    name = "alembic-0.9.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [SQLAlchemy Mako python-editor python-dateutil];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/78/48/b5b26e7218b415f40b60b92c53853d242e5456c0f19f6c66101d98ff5f2a/alembic-0.9.2.tar.gz";
-      md5 = "40daf8bae50969beea40efaaf0839ff4";
+      url = "https://pypi.python.org/packages/bf/b3/b28ea715824f8455635ece3c12f59d5d205f98cc378858e414e3aa6ebdbc/alembic-0.9.6.tar.gz";
+      md5 = "fcb096bccc87c8770bd07a04606cb989";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  amqplib = super.buildPythonPackage {
-    name = "amqplib-1.0.2";
+  amqp = super.buildPythonPackage {
+    name = "amqp-2.2.2";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = with self; [vine];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/75/b7/8c2429bf8d92354a0118614f9a4d15e53bc69ebedce534284111de5a0102/amqplib-1.0.2.tgz";
-      md5 = "5c92f17fbedd99b2b4a836d4352d1e2f";
-    };
-    meta = {
-      license = [ { fullName = "LGPL"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
-    };
-  };
-  anyjson = super.buildPythonPackage {
-    name = "anyjson-0.3.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/c3/4d/d4089e1a3dd25b46bebdb55a992b0797cff657b4477bc32ce28038fdecbc/anyjson-0.3.3.tar.gz";
-      md5 = "2ea28d6ec311aeeebaf993cb3008b27c";
+      url = "https://pypi.python.org/packages/e0/70/9ab9ccd8247fb7d2adb717e9f6a0ed358c9e1ab2c349048b0352f9e80ee2/amqp-2.2.2.tar.gz";
+      md5 = "0971a3fd2d635ded45c349cfc17106bd";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   appenlight-client = super.buildPythonPackage {
-    name = "appenlight-client-0.6.21";
+    name = "appenlight-client-0.6.22";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [WebOb requests six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c9/23/91b66cfa0b963662c10b2a06ccaadf3f3a4848a7a2aa16255cb43d5160ec/appenlight_client-0.6.21.tar.gz";
-      md5 = "273999ac854fdaefa8d0fb61965a4ed9";
+      url = "https://pypi.python.org/packages/73/37/0a64460fa9670b17c061adc433bc8be5079cba21e8b3a92d824adccb12bc/appenlight_client-0.6.22.tar.gz";
+      md5 = "641afc114a9a3b3af4f75b11c70968ee";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -431,27 +392,40 b''
       license = [ pkgs.lib.licenses.mit ];
     };
   };
+  billiard = super.buildPythonPackage {
+    name = "billiard-3.5.0.3";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/39/ac/f5571210cca2e4f4532e38aaff242f26c8654c5e2436bee966c230647ccc/billiard-3.5.0.3.tar.gz";
+      md5 = "113ba481e48400adbf6fbbf59a2f8554";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
   bleach = super.buildPythonPackage {
-    name = "bleach-1.5.0";
+    name = "bleach-2.1.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six html5lib];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/99/00/25a8fce4de102bf6e3cc76bc4ea60685b2fee33bde1b34830c70cacc26a7/bleach-1.5.0.tar.gz";
-      md5 = "b663300efdf421b3b727b19d7be9c7e7";
+      url = "https://pypi.python.org/packages/d4/3f/d517089af35b01bb9bc4eac5ea04bae342b37a5e9abbb27b7c3ce0eae070/bleach-2.1.1.tar.gz";
+      md5 = "7c5dfb1d66ea979b5a465afb12c82ec4";
     };
     meta = {
       license = [ pkgs.lib.licenses.asl20 ];
     };
   };
   bottle = super.buildPythonPackage {
-    name = "bottle-0.12.8";
+    name = "bottle-0.12.13";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/52/df/e4a408f3a7af396d186d4ecd3b389dd764f0f943b4fa8d257bfe7b49d343/bottle-0.12.8.tar.gz";
-      md5 = "13132c0a8f607bf860810a6ee9064c5b";
+      url = "https://pypi.python.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c/bottle-0.12.13.tar.gz";
+      md5 = "d2fe1b48c1d49217e78bf326b1cad437";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -471,13 +445,13 b''
     };
   };
   celery = super.buildPythonPackage {
-    name = "celery-2.2.10";
+    name = "celery-4.1.0";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [python-dateutil anyjson kombu pyparsing];
+    propagatedBuildInputs = with self; [pytz billiard kombu];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b1/64/860fd50e45844c83442e7953effcddeff66b2851d90b2d784f7201c111b8/celery-2.2.10.tar.gz";
-      md5 = "898bc87e54f278055b561316ba73e222";
+      url = "https://pypi.python.org/packages/07/65/88a2a45fc80f487872c93121a701a53bbbc3d3d832016876fac84fc8d46a/celery-4.1.0.tar.gz";
+      md5 = "db91e1d26936381127f01e150fe3054a";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -497,26 +471,26 b''
     };
   };
   click = super.buildPythonPackage {
-    name = "click-5.1";
+    name = "click-6.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b7/34/a496632c4fb6c1ee76efedf77bb8d28b29363d839953d95095b12defe791/click-5.1.tar.gz";
-      md5 = "9c5323008cccfe232a8b161fc8196d41";
+      url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
+      md5 = "d0b09582123605220ad6977175f3e51d";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   colander = super.buildPythonPackage {
-    name = "colander-1.3.3";
+    name = "colander-1.4";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [translationstring iso8601];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/54/a9/9862a561e015b2c7b56404c0b13828a8bdc51e05ab3703bd792cec064487/colander-1.3.3.tar.gz";
-      md5 = "f5d783768c51d73695f49bbe95778ab4";
+      url = "https://pypi.python.org/packages/cc/e2/c4e716ac4a426d8ad4dfe306c34f0018a22275d2420815784005bf771c84/colander-1.4.tar.gz";
+      md5 = "cbb8e403c2ba05aeaa419d51fdb93736";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
@@ -588,13 +562,13 b''
     };
   };
   decorator = super.buildPythonPackage {
-    name = "decorator-4.0.11";
+    name = "decorator-4.1.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/cc/ac/5a16f1fc0506ff72fcc8fd4e858e3a1c231f224ab79bb7c4c9b2094cc570/decorator-4.0.11.tar.gz";
-      md5 = "73644c8f0bd4983d1b6a34b49adec0ae";
+      url = "https://pypi.python.org/packages/bb/e0/f6e41e9091e130bf16d4437dabbac3993908e4d6485ecbc985ef1352db94/decorator-4.1.2.tar.gz";
+      md5 = "a0f7f4fe00ae2dde93494d90c192cf8c";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal { fullName = "new BSD License"; } ];
@@ -614,13 +588,13 b''
     };
   };
   docutils = super.buildPythonPackage {
-    name = "docutils-0.13.1";
+    name = "docutils-0.14";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/05/25/7b5484aca5d46915493f1fd4ecb63c38c333bd32aa9ad6e19da8d08895ae/docutils-0.13.1.tar.gz";
-      md5 = "ea4a893c633c788be9b8078b6b305d53";
+      url = "https://pypi.python.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
+      md5 = "c53768d63db3873b7d452833553469de";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.publicDomain pkgs.lib.licenses.gpl1 { fullName = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)"; } pkgs.lib.licenses.psfl ];
@@ -783,39 +757,39 b''
     };
   };
   gnureadline = super.buildPythonPackage {
-    name = "gnureadline-6.3.3";
+    name = "gnureadline-6.3.8";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/3a/ee/2c3f568b0a74974791ac590ec742ef6133e2fbd287a074ba72a53fa5e97c/gnureadline-6.3.3.tar.gz";
-      md5 = "c4af83c9a3fbeac8f2da9b5a7c60e51c";
+      url = "https://pypi.python.org/packages/50/64/86085c823cd78f9df9d8e33dce0baa71618016f8860460b82cf6610e1eb3/gnureadline-6.3.8.tar.gz";
+      md5 = "ba341f4b907250bd1f47dbc06290604f";
     };
     meta = {
-      license = [ pkgs.lib.licenses.gpl1 ];
+      license = [ { fullName = "GNU General Public License v3 (GPLv3)"; } pkgs.lib.licenses.gpl1 ];
     };
   };
   gprof2dot = super.buildPythonPackage {
-    name = "gprof2dot-2016.10.13";
+    name = "gprof2dot-2017.9.19";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a0/e0/73c71baed306f0402a00a94ffc7b2be94ad1296dfcb8b46912655b93154c/gprof2dot-2016.10.13.tar.gz";
-      md5 = "0125401f15fd2afe1df686a76c64a4fd";
+      url = "https://pypi.python.org/packages/9d/36/f977122502979f3dfb50704979c9ed70e6b620787942b089bf1af15f5aba/gprof2dot-2017.9.19.tar.gz";
+      md5 = "cda2d552bb0d0b9f16e6824a9aabd225";
     };
     meta = {
-      license = [ { fullName = "LGPL"; } ];
+      license = [ { fullName = "GNU Lesser General Public License v3 or later (LGPLv3+)"; } { fullName = "LGPL"; } ];
     };
   };
   graphviz = super.buildPythonPackage {
-    name = "graphviz-0.8";
+    name = "graphviz-0.8.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/da/84/0e997520323d6b01124eb01c68d5c101814d0aab53083cd62bd75a90f70b/graphviz-0.8.zip";
-      md5 = "9486a885360a5ee54a81eb2950470c71";
+      url = "https://pypi.python.org/packages/a9/a6/ee6721349489a2da6eedd3dba124f2b5ac15ee1e0a7bd4d3cfdc4fff0327/graphviz-0.8.1.zip";
+      md5 = "88d8efa88c02a735b3659fe0feaf0b96";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -848,13 +822,13 b''
     };
   };
   html5lib = super.buildPythonPackage {
-    name = "html5lib-0.9999999";
+    name = "html5lib-1.0b10";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [six];
+    propagatedBuildInputs = with self; [six webencodings setuptools];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/ae/ae/bcb60402c60932b32dfaf19bb53870b29eda2cd17551ba5639219fb5ebf9/html5lib-0.9999999.tar.gz";
-      md5 = "ef43cb05e9e799f25d65d1135838a96f";
+      url = "https://pypi.python.org/packages/97/16/982214624095c1420c75f3bd295d9e658794aafb95fc075823de107e0ae4/html5lib-1.0b10.tar.gz";
+      md5 = "5ada1243b7a863624b2f35245b2186e9";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -952,13 +926,13 b''
     };
   };
   iso8601 = super.buildPythonPackage {
-    name = "iso8601-0.1.11";
+    name = "iso8601-0.1.12";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c0/75/c9209ee4d1b5975eb8c2cba4428bde6b61bd55664a98290dd015cdb18e98/iso8601-0.1.11.tar.gz";
-      md5 = "b06d11cd14a64096f907086044f0fe38";
+      url = "https://pypi.python.org/packages/45/13/3db24895497345fb44c4248c08b16da34a9eb02643cea2754b21b5ed08b0/iso8601-0.1.12.tar.gz";
+      md5 = "4de940f691c5ea759fb254384c8ddcf6";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1004,26 +978,26 b''
     };
   };
   jupyter-core = super.buildPythonPackage {
-    name = "jupyter-core-4.3.0";
+    name = "jupyter-core-4.4.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [traitlets];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/2f/39/5138f975100ce14d150938df48a83cd852a3fd8e24b1244f4113848e69e2/jupyter_core-4.3.0.tar.gz";
-      md5 = "18819511a809afdeed9a995a9c27bcfb";
+      url = "https://pypi.python.org/packages/b6/2d/2804f4de3a95583f65e5dcb4d7c8c7183124882323758996e867f47e72af/jupyter_core-4.4.0.tar.gz";
+      md5 = "7829fc07884ed98459e170f217e2a5ba";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   kombu = super.buildPythonPackage {
-    name = "kombu-1.5.1";
+    name = "kombu-4.1.0";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [anyjson amqplib];
+    propagatedBuildInputs = with self; [amqp];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/19/53/74bf2a624644b45f0850a638752514fc10a8e1cbd738f10804951a6df3f5/kombu-1.5.1.tar.gz";
-      md5 = "50662f3c7e9395b3d0721fb75d100b63";
+      url = "https://pypi.python.org/packages/03/5e/1a47d1e543d4943d65330af4e4406049f443878818fb65bfdc651bb93a96/kombu-4.1.0.tar.gz";
+      md5 = "2fb2be9fec0e6514231bba23a3779439";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1056,13 +1030,13 b''
     };
   };
   mistune = super.buildPythonPackage {
-    name = "mistune-0.7.4";
+    name = "mistune-0.8.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/25/a4/12a584c0c59c9fed529f8b3c47ca8217c0cf8bcc5e1089d3256410cfbdbc/mistune-0.7.4.tar.gz";
-      md5 = "92d01cb717e9e74429e9bde9d29ac43b";
+      url = "https://pypi.python.org/packages/9d/be/e06d4346cc608a01dec6bf770d7d0303a4fd6db588b318ced18f5f257145/mistune-0.8.3.tar.gz";
+      md5 = "a5e4043e93fb8f9082e27f29eeb5e054";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1095,52 +1069,39 b''
     };
   };
   nbconvert = super.buildPythonPackage {
-    name = "nbconvert-5.1.1";
+    name = "nbconvert-5.3.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [mistune Jinja2 Pygments traitlets jupyter-core nbformat entrypoints bleach pandocfilters testpath];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/95/58/df1c91f1658ee5df19097f915a1e71c91fc824a708d82d2b2e35f8b80e9a/nbconvert-5.1.1.tar.gz";
-      md5 = "d0263fb03a44db2f94eea09a608ed813";
+      url = "https://pypi.python.org/packages/b9/a4/d0a0938ad6f5eeb4dea4e73d255c617ef94b0b2849d51194c9bbdb838412/nbconvert-5.3.1.tar.gz";
+      md5 = "c128d0d93d02f70a85429a383dae96d2";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   nbformat = super.buildPythonPackage {
-    name = "nbformat-4.3.0";
+    name = "nbformat-4.4.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [ipython-genutils traitlets jsonschema jupyter-core];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f9/c5/89df4abf906f766727f976e170caa85b4f1c1d1feb1f45d716016e68e19f/nbformat-4.3.0.tar.gz";
-      md5 = "9a00d20425914cd5ba5f97769d9963ca";
+      url = "https://pypi.python.org/packages/6e/0e/160754f7ae3e984863f585a3743b0ed1702043a81245907c8fae2d537155/nbformat-4.4.0.tar.gz";
+      md5 = "2d5f873138d9fbc2a3f9eaaebca3b8a1";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  nose = super.buildPythonPackage {
-    name = "nose-1.3.6";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/70/c7/469e68148d17a0d3db5ed49150242fd70a74a8147b8f3f8b87776e028d99/nose-1.3.6.tar.gz";
-      md5 = "0ca546d81ca8309080fc80cb389e7a16";
-    };
-    meta = {
-      license = [ { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "GNU LGPL"; } ];
-    };
-  };
   objgraph = super.buildPythonPackage {
-    name = "objgraph-3.1.0";
+    name = "objgraph-3.1.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [graphviz];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f4/b3/082e54e62094cb2ec84f8d5a49e0142cef99016491cecba83309cff920ae/objgraph-3.1.0.tar.gz";
-      md5 = "eddbd96039796bfbd13eee403701e64a";
+      url = "https://pypi.python.org/packages/be/58/9ca81a20cc837054e94866df1475d899caaa94f3732b8a46006858b015f7/objgraph-3.1.1.tar.gz";
+      md5 = "253af9944763377877c3678d8aaebb8b";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1199,13 +1160,13 b''
     };
   };
   pexpect = super.buildPythonPackage {
-    name = "pexpect-4.2.1";
+    name = "pexpect-4.3.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [ptyprocess];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e8/13/d0b0599099d6cd23663043a2a0bb7c61e58c6ba359b2656e6fb000ef5b98/pexpect-4.2.1.tar.gz";
-      md5 = "3694410001a99dff83f0b500a1ca1c95";
+      url = "https://pypi.python.org/packages/f8/44/5466c30e49762bb92e442bbdf4472d6904608d211258eb3198a11f0309a4/pexpect-4.3.0.tar.gz";
+      md5 = "047a486dcd26134b74f2e67046bb61a0";
     };
     meta = {
       license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ];
@@ -1225,26 +1186,26 b''
     };
   };
   plaster = super.buildPythonPackage {
-    name = "plaster-0.5";
+    name = "plaster-1.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [setuptools];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/99/b3/d7ca1fe31d2b56dba68a238721fda6820770f9c2a3de17a582d4b5b2edcc/plaster-0.5.tar.gz";
-      md5 = "c59345a67a860cfcaa1bd6a81451399d";
+      url = "https://pypi.python.org/packages/37/e1/56d04382d718d32751017d32f351214384e529b794084eee20bb52405563/plaster-1.0.tar.gz";
+      md5 = "80e6beb4760c16fea31754babcc0576e";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   plaster-pastedeploy = super.buildPythonPackage {
-    name = "plaster-pastedeploy-0.4.1";
+    name = "plaster-pastedeploy-0.4.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [PasteDeploy plaster];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/9d/6e/f8be01ed41c94e6c54ac97cf2eb142a702aae0c8cce31c846f785e525b40/plaster_pastedeploy-0.4.1.tar.gz";
-      md5 = "f48d5344b922e56c4978eebf1cd2e0d3";
+      url = "https://pypi.python.org/packages/2c/62/0daf9c0be958e785023e583e51baac15863699e956bfb3d448898d80edd8/plaster_pastedeploy-0.4.2.tar.gz";
+      md5 = "58fd7852002909378e818c9d5b71e90a";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1264,26 +1225,26 b''
     };
   };
   psutil = super.buildPythonPackage {
-    name = "psutil-4.3.1";
+    name = "psutil-5.4.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/78/cc/f267a1371f229bf16db6a4e604428c3b032b823b83155bd33cef45e49a53/psutil-4.3.1.tar.gz";
-      md5 = "199a366dba829c88bddaf5b41d19ddc0";
+      url = "https://pypi.python.org/packages/8d/96/1fc6468be91521192861966c40bd73fdf8b065eae6d82dd0f870b9825a65/psutil-5.4.0.tar.gz";
+      md5 = "01af6219b1e8fcfd53603023967713bf";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   psycopg2 = super.buildPythonPackage {
-    name = "psycopg2-2.7.1";
+    name = "psycopg2-2.7.3.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f8/e9/5793369ce8a41bf5467623ded8d59a434dfef9c136351aca4e70c2657ba0/psycopg2-2.7.1.tar.gz";
-      md5 = "67848ac33af88336046802f6ef7081f3";
+      url = "https://pypi.python.org/packages/dd/47/000b405d73ca22980684fd7bd3318690cc03cfa3b2ae1c5b7fff8050b28a/psycopg2-2.7.3.2.tar.gz";
+      md5 = "8114e672d5f23fa5329874a4314fbd6f";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpt21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ];
@@ -1303,13 +1264,13 b''
     };
   };
   py = super.buildPythonPackage {
-    name = "py-1.4.34";
+    name = "py-1.5.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/68/35/58572278f1c097b403879c1e9369069633d1cbad5239b9057944bb764782/py-1.4.34.tar.gz";
-      md5 = "d9c3d8f734b0819ff48e355d77bf1730";
+      url = "https://pypi.python.org/packages/90/e3/e075127d39d35f09a500ebb4a90afd10f9ef0a1d28a6d09abeec0e444fdd/py-1.5.2.tar.gz";
+      md5 = "279ca69c632069e1b71e11b14641ca28";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1334,8 +1295,8 b''
     doCheck = false;
     propagatedBuildInputs = with self; [setuptools Markdown];
     src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/py-gfm/archive/0d66a19bc16e3d49de273c0f797d4e4781e8c0f2.tar.gz?md5=0d0d5385bfb629eea636a80b9c2bfd16";
-      md5 = "0d0d5385bfb629eea636a80b9c2bfd16";
+      url = "https://pypi.python.org/packages/12/e4/6b3d8678da04f97d7490d8264d8de51c2dc9fb91209ccee9c515c95e14c5/py-gfm-0.1.3.tar.gz";
+      md5 = "e588d9e69640a241b97e2c59c22527a6";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1433,26 +1394,26 b''
     };
   };
   pyramid-debugtoolbar = super.buildPythonPackage {
-    name = "pyramid-debugtoolbar-4.2.1";
+    name = "pyramid-debugtoolbar-4.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pyramid pyramid-mako repoze.lru Pygments ipaddress];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/db/26/94620b7752936e2cd74838263ff366db9b454f7394bfb62d1eb2f84b29c1/pyramid_debugtoolbar-4.2.1.tar.gz";
-      md5 = "3dfaced2fab1644ff5284017be9d92b9";
+      url = "https://pypi.python.org/packages/a4/40/f09d8800bfc3c09bdb6c95f37bb61c890dc62c19c4e7caa304da7aa77403/pyramid_debugtoolbar-4.3.tar.gz";
+      md5 = "9c49029e9f0695130499ef6416ffaaf8";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } pkgs.lib.licenses.bsdOriginal ];
     };
   };
   pyramid-jinja2 = super.buildPythonPackage {
-    name = "pyramid-jinja2-2.5";
+    name = "pyramid-jinja2-2.7";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pyramid zope.deprecation Jinja2 MarkupSafe];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a1/80/595e26ffab7deba7208676b6936b7e5a721875710f982e59899013cae1ed/pyramid_jinja2-2.5.tar.gz";
-      md5 = "07cb6547204ac5e6f0b22a954ccee928";
+      url = "https://pypi.python.org/packages/d8/80/d60a7233823de22ce77bd864a8a83736a1fe8b49884b08303a2e68b2c853/pyramid_jinja2-2.7.tar.gz";
+      md5 = "c2f8b2cd7b73a6f1d9a311fcfaf4fb92";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
@@ -1485,13 +1446,13 b''
     };
   };
   pytest = super.buildPythonPackage {
-    name = "pytest-3.1.2";
+    name = "pytest-3.2.5";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [py setuptools];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/72/2b/2d3155e01f45a5a04427857352ee88220ee39550b2bc078f9db3190aea46/pytest-3.1.2.tar.gz";
-      md5 = "c4d179f89043cc925e1c169d03128e02";
+      url = "https://pypi.python.org/packages/1f/f8/8cd74c16952163ce0db0bd95fdd8810cbf093c08be00e6e665ebf0dc3138/pytest-3.2.5.tar.gz";
+      md5 = "6dbe9bb093883f75394a689a1426ac6f";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1524,39 +1485,39 b''
     };
   };
   pytest-profiling = super.buildPythonPackage {
-    name = "pytest-profiling-1.2.6";
+    name = "pytest-profiling-1.2.11";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six pytest gprof2dot];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f9/0d/df67fb9ce16c2cef201693da956321b1bccfbf9a4ead39748b9f9d1d74cb/pytest-profiling-1.2.6.tar.gz";
-      md5 = "50eb4c66c3762a2f1a49669bedc0b894";
+      url = "https://pypi.python.org/packages/c0/4a/b4aa786e93c07a86f1f87c581a36bf355a9e06a9da7e00dbd05047626bd2/pytest-profiling-1.2.11.tar.gz";
+      md5 = "9ef6b60248731be5d44477980408e8f7";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   pytest-runner = super.buildPythonPackage {
-    name = "pytest-runner-2.11.1";
+    name = "pytest-runner-3.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/9e/4d/08889e5e27a9f5d6096b9ad257f4dea1faabb03c5ded8f665ead448f5d8a/pytest-runner-2.11.1.tar.gz";
-      md5 = "bdb73eb18eca2727944a2dcf963c5a81";
+      url = "https://pypi.python.org/packages/65/b4/ae89338cd2d81e2cc54bd6db2e962bfe948f612303610d68ab24539ac2d1/pytest-runner-3.0.tar.gz";
+      md5 = "8f8363a52bbabc4cedd5e239beb2ba11";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   pytest-sugar = super.buildPythonPackage {
-    name = "pytest-sugar-0.8.0";
+    name = "pytest-sugar-0.9.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pytest termcolor];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a5/b0/b2773dee078f17773a5bf2dfad49b0be57b6354bbd84bbefe4313e509d87/pytest-sugar-0.8.0.tar.gz";
-      md5 = "8cafbdad648068e0e44b8fc5f9faae42";
+      url = "https://pypi.python.org/packages/49/d8/c5ff6cca3ce2ebd8b73eec89779bf6b4a7737456a70e8ea4d44c1ff90f71/pytest-sugar-0.9.0.tar.gz";
+      md5 = "89fbff17277fa6a95a560a04b68cb9f9";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1576,16 +1537,16 b''
     };
   };
   python-dateutil = super.buildPythonPackage {
-    name = "python-dateutil-2.1";
+    name = "python-dateutil-2.6.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/65/52/9c18dac21f174ad31b65e22d24297864a954e6fe65876eba3f5773d2da43/python-dateutil-2.1.tar.gz";
-      md5 = "1534bb15cf311f07afaa3aacba1c028b";
+      url = "https://pypi.python.org/packages/54/bb/f1db86504f7a49e1d9b9301531181b00a1c7325dc85a29160ee3eaa73a54/python-dateutil-2.6.1.tar.gz";
+      md5 = "db38f6b4511cefd76014745bb0cc45a4";
     };
     meta = {
-      license = [ { fullName = "Simplified BSD"; } ];
+      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "Simplified BSD"; } ];
     };
   };
   python-editor = super.buildPythonPackage {
@@ -1602,13 +1563,13 b''
     };
   };
   python-ldap = super.buildPythonPackage {
-    name = "python-ldap-2.4.40";
+    name = "python-ldap-2.4.45";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [setuptools];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/4a/d8/7d70a7469058a3987d224061a81d778951ac2b48220bdcc511e4b1b37176/python-ldap-2.4.40.tar.gz";
-      md5 = "aea0233f7d39b0c7549fcd310deeb0e5";
+      url = "https://pypi.python.org/packages/ce/52/6b5372d0166820f4a4b0a88ed73dc7504219355049fc1d266d8ccdb7942e/python-ldap-2.4.45.tar.gz";
+      md5 = "6108e189a44eea8bc7d1cc281c222978";
     };
     meta = {
       license = [ pkgs.lib.licenses.psfl ];
@@ -1641,13 +1602,13 b''
     };
   };
   pytz = super.buildPythonPackage {
-    name = "pytz-2015.4";
+    name = "pytz-2017.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/7e/1a/f43b5c92df7b156822030fed151327ea096bcf417e45acc23bd1df43472f/pytz-2015.4.zip";
-      md5 = "233f2a2b370d03f9b5911700cc9ebf3c";
+      url = "https://pypi.python.org/packages/60/88/d3152c234da4b2a1f7a989f89609ea488225eaea015bc16fbde2b3fdfefa/pytz-2017.3.zip";
+      md5 = "7006b56c0d68a162d9fe57d4249c3171";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1693,13 +1654,13 b''
     };
   };
   repoze.lru = super.buildPythonPackage {
-    name = "repoze.lru-0.6";
+    name = "repoze.lru-0.7";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/6e/1e/aa15cc90217e086dc8769872c8778b409812ff036bf021b15795638939e4/repoze.lru-0.6.tar.gz";
-      md5 = "2c3b64b17a8e18b405f55d46173e14dd";
+      url = "https://pypi.python.org/packages/12/bc/595a77c4b5e204847fdf19268314ef59c85193a9dc9f83630fc459c0fee5/repoze.lru-0.7.tar.gz";
+      md5 = "c08cc030387e0b1fc53c5c7d964b35e2";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
@@ -1719,49 +1680,49 b''
     };
   };
   rhodecode-enterprise-ce = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.10.6";
+    name = "rhodecode-enterprise-ce-4.11.0";
     buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage configobj];
     doCheck = true;
-    propagatedBuildInputs = with self; [Babel Beaker FormEncode Mako Markdown MarkupSafe MySQL-python Paste PasteDeploy PasteScript Pygments pygments-markdown-lexer Pylons Routes SQLAlchemy Tempita URLObject WebError WebHelpers WebHelpers2 WebOb WebTest Whoosh alembic amqplib anyjson appenlight-client authomatic cssselect celery channelstream colander decorator deform docutils gevent gunicorn infrae.cache ipython iso8601 kombu lxml msgpack-python nbconvert packaging psycopg2 py-gfm pycrypto pycurl pyparsing pyramid pyramid-debugtoolbar pyramid-mako pyramid-beaker pysqlite python-dateutil python-ldap python-memcached python-pam recaptcha-client redis repoze.lru requests simplejson sshpubkeys subprocess32 waitress zope.cachedescriptors dogpile.cache dogpile.core psutil py-bcrypt];
+    propagatedBuildInputs = with self; [setuptools-scm amqp authomatic Babel Beaker celery Chameleon channelstream click colander configobj cssselect decorator deform docutils dogpile.cache dogpile.core ecdsa FormEncode future futures gnureadline infrae.cache iso8601 itsdangerous Jinja2 billiard kombu lxml Mako Markdown MarkupSafe msgpack-python MySQL-python objgraph packaging Paste PasteDeploy PasteScript pathlib2 peppercorn psutil psycopg2 py-bcrypt pycrypto pycurl pyflakes pygments-markdown-lexer Pygments pyparsing pyramid-beaker pyramid-debugtoolbar pyramid-jinja2 pyramid-mako pyramid pysqlite python-dateutil python-ldap python-memcached python-pam pytz pyzmq py-gfm recaptcha-client redis repoze.lru requests Routes setproctitle simplejson six SQLAlchemy sshpubkeys subprocess32 supervisor Tempita translationstring trollius urllib3 URLObject venusian WebError WebHelpers2 WebHelpers WebOb Whoosh wsgiref zope.cachedescriptors zope.deprecation zope.event zope.interface nbconvert bleach nbformat jupyter-client alembic invoke bumpversion transifex-client gevent greenlet gunicorn waitress uWSGI ipdb ipython CProfileV bottle rhodecode-tools appenlight-client pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage];
     src = ./.;
     meta = {
       license = [ { fullName = "Affero GNU General Public License v3 or later (AGPLv3+)"; } { fullName = "AGPLv3, and Commercial License"; } ];
     };
   };
   rhodecode-tools = super.buildPythonPackage {
-    name = "rhodecode-tools-0.13.1";
+    name = "rhodecode-tools-0.14.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [click future six Mako MarkupSafe requests elasticsearch elasticsearch-dsl urllib3 Whoosh];
     src = fetchurl {
-      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.13.1.tar.gz?md5=f72add4690c9b341f87127a0a79573ae";
-      md5 = "f72add4690c9b341f87127a0a79573ae";
+      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.14.1.tar.gz?md5=0b9c2caad160b68889f8172ea54af7b2";
+      md5 = "0b9c2caad160b68889f8172ea54af7b2";
     };
     meta = {
       license = [ { fullName = "AGPLv3 and Proprietary"; } ];
     };
   };
   scandir = super.buildPythonPackage {
-    name = "scandir-1.5";
+    name = "scandir-1.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/bd/f4/3143e0289faf0883228017dbc6387a66d0b468df646645e29e1eb89ea10e/scandir-1.5.tar.gz";
-      md5 = "a2713043de681bba6b084be42e7a8a44";
+      url = "https://pypi.python.org/packages/77/3f/916f524f50ee65e3f465a280d2851bd63685250fddb3020c212b3977664d/scandir-1.6.tar.gz";
+      md5 = "0180ddb97c96cbb2d4f25d2ae11c64ac";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal { fullName = "New BSD License"; } ];
     };
   };
   setproctitle = super.buildPythonPackage {
-    name = "setproctitle-1.1.8";
+    name = "setproctitle-1.1.10";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/33/c3/ad367a4f4f1ca90468863ae727ac62f6edb558fc09a003d344a02cfc6ea6/setproctitle-1.1.8.tar.gz";
-      md5 = "728f4c8c6031bbe56083a48594027edd";
+      url = "https://pypi.python.org/packages/5a/0d/dc0d2234aacba6cf1a729964383e3452c52096dc695581248b548786f2b3/setproctitle-1.1.10.tar.gz";
+      md5 = "2dcdd1b761700a5a13252fea3dfd1977";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1781,13 +1742,13 b''
     };
   };
   setuptools-scm = super.buildPythonPackage {
-    name = "setuptools-scm-1.15.0";
+    name = "setuptools-scm-1.15.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/80/b7/31b6ae5fcb188e37f7e31abe75f9be90490a5456a72860fa6e643f8a3cbc/setuptools_scm-1.15.0.tar.gz";
-      md5 = "b6916c78ed6253d6602444fad4279c5b";
+      url = "https://pypi.python.org/packages/03/6d/aafdd01edd227ee879b691455bf19895091872af7e48192bea1758c82032/setuptools_scm-1.15.6.tar.gz";
+      md5 = "f17493d53f0d842bb0152f214775640b";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1820,13 +1781,13 b''
     };
   };
   six = super.buildPythonPackage {
-    name = "six-1.9.0";
+    name = "six-1.11.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/16/64/1dc5e5976b17466fd7d712e59cbe9fb1e18bec153109e5ba3ed6c9102f1a/six-1.9.0.tar.gz";
-      md5 = "476881ef4012262dfc8adc645ee786c4";
+      url = "https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
+      md5 = "d12789f9baf7e9fb2524c0c64f1773f8";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1911,13 +1872,13 b''
     };
   };
   transifex-client = super.buildPythonPackage {
-    name = "transifex-client-0.10";
+    name = "transifex-client-0.12.5";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = with self; [urllib3 six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f3/4e/7b925192aee656fb3e04fa6381c8b3dc40198047c3b4a356f6cfd642c809/transifex-client-0.10.tar.gz";
-      md5 = "5549538d84b8eede6b254cd81ae024fa";
+      url = "https://pypi.python.org/packages/7b/86/60f31a0c9b8d0b1266ce15b6c80b55f88522140c8acfc395d5aec5e23475/transifex-client-0.12.5.tar.gz";
+      md5 = "e6e278117b23f60702c06e203b7e51ae";
     };
     meta = {
       license = [ pkgs.lib.licenses.gpl2 ];
@@ -1988,14 +1949,27 b''
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  waitress = super.buildPythonPackage {
-    name = "waitress-1.0.2";
+  vine = super.buildPythonPackage {
+    name = "vine-1.1.4";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/cd/f4/400d00863afa1e03618e31fd7e2092479a71b8c9718b00eb1eeb603746c6/waitress-1.0.2.tar.gz";
-      md5 = "b968f39e95d609f6194c6e50425d4bb7";
+      url = "https://pypi.python.org/packages/32/23/36284986e011f3c130d802c3c66abd8f1aef371eae110ddf80c5ae22e1ff/vine-1.1.4.tar.gz";
+      md5 = "9fdb971e7fd15b181b84f3bfcf20d11c";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  waitress = super.buildPythonPackage {
+    name = "waitress-1.1.0";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/3c/68/1c10dd5c556872ceebe88483b0436140048d39de83a84a06a8baa8136f4f/waitress-1.1.0.tar.gz";
+      md5 = "0f1eb7fdfdbf2e6d18decbda1733045c";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpt21 ];
@@ -2014,14 +1988,27 b''
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  ws4py = super.buildPythonPackage {
-    name = "ws4py-0.3.5";
+  webencodings = super.buildPythonPackage {
+    name = "webencodings-0.5.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b6/4f/34af703be86939629479e74d6e650e39f3bd73b3b09212c34e5125764cbc/ws4py-0.3.5.zip";
-      md5 = "a261b75c20b980e55ce7451a3576a867";
+      url = "https://pypi.python.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz";
+      md5 = "32f6e261d52e57bf7e1c4d41546d15b8";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  ws4py = super.buildPythonPackage {
+    name = "ws4py-0.4.2";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/b8/98/a90f1d96ffcb15dfc220af524ce23e0a5881258dafa197673357ce1683dd/ws4py-0.4.2.tar.gz";
+      md5 = "f0603ae376707a58d205bd87a67758a2";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];

pytest.ini

@@ -1,12 +1,12 b''
 [pytest]
-testpaths = ./rhodecode
-pylons_config = rhodecode/tests/rhodecode.ini
+testpaths = rhodecode
+norecursedirs = rhodecode/public rhodecode/templates tests/scripts
+
+pyramid_config = rhodecode/tests/rhodecode.ini
 vcsserver_protocol = http
 vcsserver_config_http = rhodecode/tests/vcsserver_http.ini
-norecursedirs = tests/scripts
 
 addopts =
-  -k "not _BaseTest"
   --pdbcls=IPython.terminal.debugger:TerminalPdb
 
 markers =

requirements.txt

@@ -1,51 +1,49 b''
 ## core
 setuptools==30.1.0
-setuptools-scm==1.15.0
+setuptools-scm==1.15.6
 
-amqplib==1.0.2
-anyjson==0.3.3
+amqp==2.2.2
 authomatic==0.1.0.post1
 Babel==1.3
 Beaker==1.9.0
-celery==2.2.10
+celery==4.1.0
 Chameleon==2.24
 channelstream==0.5.2
-click==5.1
-colander==1.3.3
+click==6.6
+colander==1.4.0
 configobj==5.0.6
 cssselect==1.0.1
-decorator==4.0.11
+decorator==4.1.2
 deform==2.0.4
-docutils==0.13.1
+docutils==0.14.0
 dogpile.cache==0.6.4
 dogpile.core==0.4.1
 ecdsa==0.13
 FormEncode==1.2.4
 future==0.14.3
 futures==3.0.2
-gnureadline==6.3.3
+gnureadline==6.3.8
 infrae.cache==1.0.1
-iso8601==0.1.11
+iso8601==0.1.12
 itsdangerous==0.24
-Jinja2==2.7.3
-kombu==1.5.1
+Jinja2==2.9.6
+billiard==3.5.0.3
+kombu==4.1.0
 lxml==3.7.3
 Mako==1.0.7
-Markdown==2.6.8
-MarkupSafe==0.23
-meld3==1.0.2
+Markdown==2.6.9
+MarkupSafe==1.0.0
 msgpack-python==0.4.8
 MySQL-python==1.2.5
-nose==1.3.6
-objgraph==3.1.0
+objgraph==3.1.1
 packaging==15.2
 Paste==2.0.3
 PasteDeploy==1.5.2
-PasteScript==1.7.5
+PasteScript==2.0.2
 pathlib2==2.3.0
 peppercorn==0.5
-psutil==4.3.1
-psycopg2==2.7.1
+psutil==5.4.0
+psycopg2==2.7.3.2
 py-bcrypt==0.4
 pycrypto==2.6.1
 pycurl==7.19.5
@@ -54,27 +52,27 b' pygments-markdown-lexer==0.1.0.dev39'
 Pygments==2.2.0
 pyparsing==1.5.7
 pyramid-beaker==0.8
-pyramid-debugtoolbar==4.2.1
-pyramid-jinja2==2.5
+pyramid-debugtoolbar==4.3.0
+pyramid-jinja2==2.7
 pyramid-mako==1.0.2
 pyramid==1.9.1
 pysqlite==2.8.3
-python-dateutil==2.1
-python-ldap==2.4.40
+python-dateutil
+python-ldap==2.4.45
 python-memcached==1.58
 python-pam==1.8.2
-pytz==2015.4
+pytz==2017.3
 pyzmq==14.6.0
+py-gfm==0.1.3
 recaptcha-client==1.0.6
 redis==2.10.6
-repoze.lru==0.6
+repoze.lru==0.7
 requests==2.9.1
-Routes==1.13
-setproctitle==1.1.8
+Routes==2.4.1
+setproctitle==1.1.10
 simplejson==3.11.1
-six==1.9.0
-Sphinx==1.2.2
-SQLAlchemy==1.1.11
+six==1.11.0
+SQLAlchemy==1.1.15
 sshpubkeys==2.2.0
 subprocess32==3.2.7
 supervisor==3.3.3
@@ -95,44 +93,39 b' zope.deprecation==4.1.2'
 zope.event==4.0.3
 zope.interface==4.1.3
 
-## customized/patched libs
-# our patched version of Pylons==1.0.2
-https://code.rhodecode.com/upstream/pylons/archive/707354ee4261b9c10450404fc9852ccea4fd667d.tar.gz?md5=f26633726fa2cd3a340316ee6a5d218f#egg=Pylons==1.0.2.rhodecode-patch-1
-# not released py-gfm==0.1.3
-https://code.rhodecode.com/upstream/py-gfm/archive/0d66a19bc16e3d49de273c0f797d4e4781e8c0f2.tar.gz?md5=0d0d5385bfb629eea636a80b9c2bfd16#egg=py-gfm==0.1.3.rhodecode-upstream1
 
 # 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
-nbconvert==5.1.1
-bleach==1.5.0
-nbformat==4.3.0
+nbconvert==5.3.1
+bleach==2.1.1
+nbformat==4.4.0
 jupyter_client==5.0.0
 
 ## cli tools
-alembic==0.9.2
+alembic==0.9.6
 invoke==0.13.0
 bumpversion==0.5.3
-transifex-client==0.10
+transifex-client==0.12.5
 
 ## http servers
 gevent==1.2.2
 greenlet==0.4.12
 gunicorn==19.7.1
-waitress==1.0.2
+waitress==1.1.0
 uWSGI==2.0.15
 
 ## debug
 ipdb==0.10.3
 ipython==5.1.0
 CProfileV==1.0.7
-bottle==0.12.8
+bottle==0.12.13
 
 ## rhodecode-tools, special case
-https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.13.1.tar.gz?md5=f72add4690c9b341f87127a0a79573ae#egg=rhodecode-tools==0.13.1
+https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.14.1.tar.gz?md5=0b9c2caad160b68889f8172ea54af7b2#egg=rhodecode-tools==0.14.1
 
 ## appenlight
-appenlight-client==0.6.21
+appenlight-client==0.6.22
 
 ## test related requirements
 -r requirements_test.txt

requirements_test.txt

@@ -1,15 +1,15 b''
 # test related requirements
-pytest==3.1.2
-py==1.4.34
+pytest==3.2.5
+py==1.5.2
 pytest-cov==2.5.1
-pytest-sugar==0.8.0
-pytest-runner==2.11.1
+pytest-sugar==0.9.0
+pytest-runner==3.0.0
 pytest-catchlog==1.2.2
-pytest-profiling==1.2.6
-gprof2dot==2016.10.13
+pytest-profiling==1.2.11
+gprof2dot==2017.9.19
 pytest-timeout==1.2.0
 
 mock==1.0.1
-WebTest==2.0.27
+WebTest==2.0.29
 cov-core==1.15.0
 coverage==3.7.1

rhodecode/VERSION

@@ -1,1 +1,1 b''
-4.10.6
  No newline at end of file
+4.11.0
  No newline at end of file

rhodecode/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -40,7 +40,7 b' BACKENDS = {'
 CELERY_ENABLED = False
 CELERY_EAGER = False
 
-# link to config for pylons
+# link to config for pyramid
 CONFIG = {}
 
 # Populated with the settings dictionary from application init in
@@ -51,7 +51,7 b' PYRAMID_SETTINGS = {}'
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 81  # defines current db version for migrations
+__dbversion__ = 85  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'

rhodecode/api/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017  RhodeCode GmbH
+# Copyright (C) 2011-2018 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

rhodecode/api/exc.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017  RhodeCode GmbH
+# Copyright (C) 2011-2018 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

rhodecode/api/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/conftest.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -27,7 +27,7 b' from rhodecode.tests import TEST_USER_AD'
 
 
 @pytest.fixture(scope="class")
-def testuser_api(request, pylonsapp):
+def testuser_api(request, baseapp):
     cls = request.cls
 
     # ADMIN USER

rhodecode/api/tests/test_add_field_to_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_add_user_to_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -86,7 +86,7 b' class TestApi(object):'
     def test_api_non_existing_method_have_similar(self, request):
         id_, params = build_data(self.apikey, 'comment', args='xx')
         response = api_call(self.app, params)
-        expected = 'No such method: comment. Similar methods: changeset_comment, comment_pull_request, comment_commit'
+        expected = 'No such method: comment. Similar methods: changeset_comment, comment_pull_request, get_pull_request_comments, comment_commit'
         assert_error(id_, expected, given=response.body)
 
     def test_api_disabled_user(self, request):

rhodecode/api/tests/test_cleanup_sessions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2017 RhodeCode GmbH
+# Copyright (C) 2017-2018 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

rhodecode/api/tests/test_close_pull_request.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -70,10 +70,11 b' class TestClosePullRequest(object):'
         assert_error(id_, expected, given=response.body)
 
     @pytest.mark.backends("git", "hg")
-    def test_api_close_pull_request_repo_error(self):
+    def test_api_close_pull_request_repo_error(self, pr_util):
+        pull_request = pr_util.create_pull_request()
         id_, params = build_data(
             self.apikey, 'close_pull_request',
-            repoid=666, pullrequestid=1)
+            repoid=666, pullrequestid=pull_request.pull_request_id)
         response = api_call(self.app, params)
 
         expected = 'repository `666` does not exist'

rhodecode/api/tests/test_comment_commit.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_comment_pull_request.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -170,10 +170,11 b' class TestCommentPullRequest(object):'
         assert_error(id_, expected, given=response.body)
 
     @pytest.mark.backends("git", "hg")
-    def test_api_comment_pull_request_repo_error(self):
+    def test_api_comment_pull_request_repo_error(self, pr_util):
+        pull_request = pr_util.create_pull_request()
         id_, params = build_data(
             self.apikey, 'comment_pull_request',
-            repoid=666, pullrequestid=1)
+            repoid=666, pullrequestid=pull_request.pull_request_id)
         response = api_call(self.app, params)
 
         expected = 'repository `666` does not exist'

rhodecode/api/tests/test_create_gist.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_create_pull_request.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_create_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_create_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017  RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_create_user.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_create_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_delete_gist.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_delete_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_delete_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_delete_user.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_delete_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_deprecated_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_fork_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_gist.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_gists.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_ip.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_locks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_method.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -38,11 +38,12 b' class TestGetMethod(object):'
         response = api_call(self.app, params)
 
         expected = ['changeset_comment', 'comment_pull_request',
-                    'comment_commit']
+                    'get_pull_request_comments', 'comment_commit']
         assert_ok(id_, expected, given=response.body)
 
     def test_get_methods_on_single_match(self):
-        id_, params = build_data(self.apikey, 'get_method', pattern='*comment_commit*')
+        id_, params = build_data(self.apikey, 'get_method',
+                                 pattern='*comment_commit*')
         response = api_call(self.app, params)
 
         expected = ['comment_commit',

rhodecode/api/tests/test_get_pull_request.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -38,7 +38,6 b' class TestGetPullRequest(object):'
         pull_request = pr_util.create_pull_request(mergeable=True)
         id_, params = build_data(
             self.apikey, 'get_pull_request',
-            repoid=pull_request.target_repo.repo_name,
             pullrequestid=pull_request.pull_request_id)
 
         response = api_call(self.app, params)
@@ -109,16 +108,17 b' class TestGetPullRequest(object):'
                     'reasons': reasons,
                     'review_status': st[0][1].status if st else 'not_reviewed',
                 }
-                for reviewer, reasons, mandatory, st in
+                for obj, reviewer, reasons, mandatory, st in
                 pull_request.reviewers_statuses()
             ]
         }
         assert_ok(id_, expected, response.body)
 
-    def test_api_get_pull_request_repo_error(self):
+    def test_api_get_pull_request_repo_error(self, pr_util):
+        pull_request = pr_util.create_pull_request()
         id_, params = build_data(
             self.apikey, 'get_pull_request',
-            repoid=666, pullrequestid=1)
+            repoid=666, pullrequestid=pull_request.pull_request_id)
         response = api_call(self.app, params)
 
         expected = 'repository `666` does not exist'
@@ -126,9 +126,17 b' class TestGetPullRequest(object):'
 
     def test_api_get_pull_request_pull_request_error(self):
         id_, params = build_data(
-            self.apikey, 'get_pull_request',
-            repoid=1, pullrequestid=666)
+            self.apikey, 'get_pull_request', pullrequestid=666)
         response = api_call(self.app, params)
 
         expected = 'pull request `666` does not exist'
         assert_error(id_, expected, given=response.body)
+
+    def test_api_get_pull_request_pull_request_error_just_pr_id(self):
+        id_, params = build_data(
+            self.apikey, 'get_pull_request',
+            pullrequestid=666)
+        response = api_call(self.app, params)
+
+        expected = 'pull request `666` does not exist'
+        assert_error(id_, expected, given=response.body)

rhodecode/api/tests/test_get_pull_requests.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -68,7 +68,6 b' class TestGetRepo(object):'
             followers.append(user.user.get_api_data(
                 include_secrets=expect_secrets))
 
-        ret['members'] = permissions
         ret['permissions'] = permissions
         ret['followers'] = followers
 
@@ -106,7 +105,6 b' class TestGetRepo(object):'
         for user in repo.followers:
             followers.append(user.user.get_api_data())
 
-        ret['members'] = permissions
         ret['permissions'] = permissions
         ret['followers'] = followers
 

rhodecode/api/tests/test_get_repo_changeset.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -41,7 +41,7 b' class TestApiGetRepoGroup(object):'
 
         permissions = expected_permissions(repo_group)
 
-        ret['members'] = permissions
+        ret['permissions'] = permissions
         expected = ret
         assert_ok(id_, expected, given=response.body)
 

rhodecode/api/tests/test_get_repo_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_repo_nodes.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_repo_refs.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_repos.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_server_info.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_user.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -36,7 +36,9 b' class TestGetUser(object):'
 
         usr = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
         ret = usr.get_api_data(include_secrets=True)
-        ret['permissions'] = AuthUser(usr.user_id).permissions
+        permissions = AuthUser(usr.user_id).permissions
+        ret['permissions'] = permissions
+        ret['permissions_summary'] = permissions
 
         expected = ret
         assert_ok(id_, expected, given=response.body)
@@ -54,7 +56,9 b' class TestGetUser(object):'
 
         usr = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
         ret = usr.get_api_data(include_secrets=True)
-        ret['permissions'] = AuthUser(usr.user_id).permissions
+        permissions = AuthUser(usr.user_id).permissions
+        ret['permissions'] = permissions
+        ret['permissions_summary'] = permissions
 
         expected = ret
         assert_ok(id_, expected, given=response.body)
@@ -65,7 +69,9 b' class TestGetUser(object):'
 
         usr = UserModel().get_by_username(self.TEST_USER_LOGIN)
         ret = usr.get_api_data(include_secrets=True)
-        ret['permissions'] = AuthUser(usr.user_id).permissions
+        permissions = AuthUser(usr.user_id).permissions
+        ret['permissions'] = permissions
+        ret['permissions_summary'] = permissions
 
         expected = ret
         assert_ok(id_, expected, given=response.body)

rhodecode/api/tests/test_get_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -38,7 +38,8 b' class TestGetUserGroups(object):'
 
         permissions = expected_permissions(group)
 
-        ret['members'] = permissions
+        ret['permissions'] = permissions
+        ret['permissions_summary'] = response.json['result']['permissions_summary']
         expected = ret
         assert_ok(id_, expected, given=response.body)
 
@@ -54,7 +55,8 b' class TestGetUserGroups(object):'
 
         permissions = expected_permissions(group)
 
-        ret['members'] = permissions
+        ret['permissions'] = permissions
+        ret['permissions_summary'] = response.json['result']['permissions_summary']
         expected = ret
         assert_ok(id_, expected, given=response.body)
 

rhodecode/api/tests/test_get_user_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_get_users.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_grant_user_group_permission.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_grant_user_group_permission_to_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_grant_user_group_permission_to_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_grant_user_permission.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_grant_user_permission_to_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_grant_user_permission_to_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_invalidate_cache.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_merge_pull_request.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -112,10 +112,11 b' class TestMergePullRequest(object):'
         assert_error(id_, expected, given=response.body)
 
     @pytest.mark.backends("git", "hg")
-    def test_api_merge_pull_request_repo_error(self):
+    def test_api_merge_pull_request_repo_error(self, pr_util):
+        pull_request = pr_util.create_pull_request()
         id_, params = build_data(
             self.apikey, 'merge_pull_request',
-            repoid=666, pullrequestid=1)
+            repoid=666, pullrequestid=pull_request.pull_request_id)
         response = api_call(self.app, params)
 
         expected = 'repository `666` does not exist'

rhodecode/api/tests/test_pull.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_remove_field_from_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_remove_user_from_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_repo_locking.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_rescan_repos.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_revoke_user_group_permission.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_revoke_user_group_permission_from_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_revoke_user_group_permission_from_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_revoke_user_permission.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_revoke_user_permission_from_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_revoke_user_permission_from_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_update_pull_request.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -133,7 +133,7 b' class TestUpdatePullRequest(object):'
         removed = [a.username]
 
         pull_request = pr_util.create_pull_request(
-            reviewers=[(a.username, ['added via API'], False)])
+            reviewers=[(a.username, ['added via API'], False, [])])
 
         id_, params = build_data(
             self.apikey, 'update_pull_request',
@@ -168,10 +168,11 b' class TestUpdatePullRequest(object):'
 
     @pytest.mark.backends("git", "hg")
     def test_api_update_repo_error(self, pr_util):
+        pull_request = pr_util.create_pull_request()
         id_, params = build_data(
             self.apikey, 'update_pull_request',
             repoid='fake',
-            pullrequestid='fake',
+            pullrequestid=pull_request.pull_request_id,
             reviewers=[{'username': 'bad_name'}])
         response = api_call(self.app, params)
 

rhodecode/api/tests/test_update_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_update_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_update_user.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_update_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/test_utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/tests/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/api/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2014-2017 RhodeCode GmbH
+# Copyright (C) 2014-2018 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

rhodecode/api/views/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2015-2017 RhodeCode GmbH
+# Copyright (C) 2015-2018 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

rhodecode/api/views/deprecated_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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

rhodecode/api/views/gist_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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

rhodecode/api/views/pull_request_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -43,14 +43,14 b' log = logging.getLogger(__name__)'
 
 
 @jsonrpc_method()
-def get_pull_request(request, apiuser, repoid, pullrequestid):
+def get_pull_request(request, apiuser, pullrequestid, repoid=Optional(None)):
     """
     Get a pull request based on the given ID.
 
     :param apiuser: This is filled automatically from the |authtoken|.
     :type apiuser: AuthUser
-    :param repoid: Repository name or repository ID from where the pull
-        request was opened.
+    :param repoid: Optional, repository name or repository ID from where
+        the pull request was opened.
     :type repoid: str or int
     :param pullrequestid: ID of the requested pull request.
     :type pullrequestid: int
@@ -121,11 +121,17 b' def get_pull_request(request, apiuser, r'
         },
        "error": null
     """
-    get_repo_or_error(repoid)
+
     pull_request = get_pull_request_or_error(pullrequestid)
+    if Optional.extract(repoid):
+        repo = get_repo_or_error(repoid)
+    else:
+        repo = pull_request.target_repo
+
     if not PullRequestModel().check_user_read(
             pull_request, apiuser, api=True):
-        raise JSONRPCError('repository `%s` does not exist' % (repoid,))
+        raise JSONRPCError('repository `%s` or pull request `%s` '
+                           'does not exist' % (repoid, pullrequestid))
     data = pull_request.get_api_data()
     return data
 
@@ -137,7 +143,7 b' def get_pull_requests(request, apiuser, '
 
     :param apiuser: This is filled automatically from the |authtoken|.
     :type apiuser: AuthUser
-    :param repoid: Repository name or repository ID.
+    :param repoid: Optional repository name or repository ID.
     :type repoid: str or int
     :param status: Only return pull requests with the specified status.
         Valid options are.
@@ -229,7 +235,7 b' def get_pull_requests(request, apiuser, '
 
 @jsonrpc_method()
 def merge_pull_request(
-        request, apiuser, repoid, pullrequestid,
+        request, apiuser, pullrequestid, repoid=Optional(None),
         userid=Optional(OAttr('apiuser'))):
     """
     Merge the pull request specified by `pullrequestid` into its target
@@ -237,7 +243,7 b' def merge_pull_request('
 
     :param apiuser: This is filled automatically from the |authtoken|.
     :type apiuser: AuthUser
-    :param repoid: The Repository name or repository ID of the
+    :param repoid: Optional, repository name or repository ID of the
         target repository to which the |pr| is to be merged.
     :type repoid: str or int
     :param pullrequestid: ID of the pull request which shall be merged.
@@ -263,7 +269,12 b' def merge_pull_request('
         },
         "error": null
     """
-    repo = get_repo_or_error(repoid)
+    pull_request = get_pull_request_or_error(pullrequestid)
+    if Optional.extract(repoid):
+        repo = get_repo_or_error(repoid)
+    else:
+        repo = pull_request.target_repo
+
     if not isinstance(userid, Optional):
         if (has_superadmin_permission(apiuser) or
                 HasRepoPermissionAnyApi('repository.admin')(
@@ -272,8 +283,6 b' def merge_pull_request('
         else:
             raise JSONRPCError('userid is not the same as your user')
 
-    pull_request = get_pull_request_or_error(pullrequestid)
-
     check = MergeCheck.validate(
         pull_request, user=apiuser, translator=request.translate)
     merge_possible = not check.failed
@@ -311,9 +320,112 b' def merge_pull_request('
 
 
 @jsonrpc_method()
+def get_pull_request_comments(
+        request, apiuser, pullrequestid, repoid=Optional(None)):
+    """
+    Get all comments of pull request specified with the `pullrequestid`
+
+    :param apiuser: This is filled automatically from the |authtoken|.
+    :type apiuser: AuthUser
+    :param repoid: Optional repository name or repository ID.
+    :type repoid: str or int
+    :param pullrequestid: The pull request ID.
+    :type pullrequestid: int
+
+    Example output:
+
+    .. code-block:: bash
+
+        id : <id_given_in_input>
+        result : [
+            {
+              "comment_author": {
+                "active": true,
+                "full_name_or_username": "Tom Gore",
+                "username": "admin"
+              },
+              "comment_created_on": "2017-01-02T18:43:45.533",
+              "comment_f_path": null,
+              "comment_id": 25,
+              "comment_lineno": null,
+              "comment_status": {
+                "status": "under_review",
+                "status_lbl": "Under Review"
+              },
+              "comment_text": "Example text",
+              "comment_type": null,
+              "pull_request_version": null
+            }
+        ],
+        error :  null
+    """
+
+    pull_request = get_pull_request_or_error(pullrequestid)
+    if Optional.extract(repoid):
+        repo = get_repo_or_error(repoid)
+    else:
+        repo = pull_request.target_repo
+
+    if not PullRequestModel().check_user_read(
+            pull_request, apiuser, api=True):
+        raise JSONRPCError('repository `%s` or pull request `%s` '
+                           'does not exist' % (repoid, pullrequestid))
+
+    (pull_request_latest,
+     pull_request_at_ver,
+     pull_request_display_obj,
+     at_version) = PullRequestModel().get_pr_version(
+        pull_request.pull_request_id, version=None)
+
+    versions = pull_request_display_obj.versions()
+    ver_map = {
+        ver.pull_request_version_id: cnt
+        for cnt, ver in enumerate(versions, 1)
+    }
+
+    # GENERAL COMMENTS with versions #
+    q = CommentsModel()._all_general_comments_of_pull_request(pull_request)
+    q = q.order_by(ChangesetComment.comment_id.asc())
+    general_comments = q.all()
+
+    # INLINE COMMENTS with versions  #
+    q = CommentsModel()._all_inline_comments_of_pull_request(pull_request)
+    q = q.order_by(ChangesetComment.comment_id.asc())
+    inline_comments = q.all()
+
+    data = []
+    for comment in inline_comments + general_comments:
+        full_data = comment.get_api_data()
+        pr_version_id = None
+        if comment.pull_request_version_id:
+            pr_version_id = 'v{}'.format(
+                ver_map[comment.pull_request_version_id])
+
+        # sanitize some entries
+
+        full_data['pull_request_version'] = pr_version_id
+        full_data['comment_author'] = {
+            'username': full_data['comment_author'].username,
+            'full_name_or_username': full_data['comment_author'].full_name_or_username,
+            'active': full_data['comment_author'].active,
+        }
+
+        if full_data['comment_status']:
+            full_data['comment_status'] = {
+                'status': full_data['comment_status'][0].status,
+                'status_lbl': full_data['comment_status'][0].status_lbl,
+            }
+        else:
+            full_data['comment_status'] = {}
+
+        data.append(full_data)
+    return data
+
+
+@jsonrpc_method()
 def comment_pull_request(
-        request, apiuser, repoid, pullrequestid, message=Optional(None),
-        commit_id=Optional(None), status=Optional(None),
+        request, apiuser, pullrequestid, repoid=Optional(None),
+        message=Optional(None), commit_id=Optional(None), status=Optional(None),
         comment_type=Optional(ChangesetComment.COMMENT_TYPE_NOTE),
         resolves_comment_id=Optional(None),
         userid=Optional(OAttr('apiuser'))):
@@ -324,7 +436,7 b' def comment_pull_request('
 
     :param apiuser: This is filled automatically from the |authtoken|.
     :type apiuser: AuthUser
-    :param repoid: The repository name or repository ID.
+    :param repoid: Optional repository name or repository ID.
     :type repoid: str or int
     :param pullrequestid: The pull request ID.
     :type pullrequestid: int
@@ -356,7 +468,12 b' def comment_pull_request('
         },
         error :  null
     """
-    repo = get_repo_or_error(repoid)
+    pull_request = get_pull_request_or_error(pullrequestid)
+    if Optional.extract(repoid):
+        repo = get_repo_or_error(repoid)
+    else:
+        repo = pull_request.target_repo
+
     if not isinstance(userid, Optional):
         if (has_superadmin_permission(apiuser) or
                 HasRepoPermissionAnyApi('repository.admin')(
@@ -365,7 +482,6 b' def comment_pull_request('
         else:
             raise JSONRPCError('userid is not the same as your user')
 
-    pull_request = get_pull_request_or_error(pullrequestid)
     if not PullRequestModel().check_user_read(
             pull_request, apiuser, api=True):
         raise JSONRPCError('repository `%s` does not exist' % (repoid,))
@@ -573,15 +689,15 b' def create_pull_request('
 
 @jsonrpc_method()
 def update_pull_request(
-        request, apiuser, repoid, pullrequestid, title=Optional(''),
-        description=Optional(''), reviewers=Optional(None),
+        request, apiuser, pullrequestid, repoid=Optional(None),
+        title=Optional(''), description=Optional(''), reviewers=Optional(None),
         update_commits=Optional(None)):
     """
     Updates a pull request.
 
     :param apiuser: This is filled automatically from the |authtoken|.
     :type apiuser: AuthUser
-    :param repoid: The repository name or repository ID.
+    :param repoid: Optional repository name or repository ID.
     :type repoid: str or int
     :param pullrequestid: The pull request ID.
     :type pullrequestid: int
@@ -626,8 +742,12 b' def update_pull_request('
         error :  null
     """
 
-    repo = get_repo_or_error(repoid)
     pull_request = get_pull_request_or_error(pullrequestid)
+    if Optional.extract(repoid):
+        repo = get_repo_or_error(repoid)
+    else:
+        repo = pull_request.target_repo
+
     if not PullRequestModel().check_user_update(
             pull_request, apiuser, api=True):
         raise JSONRPCError(
@@ -705,7 +825,7 b' def update_pull_request('
 
 @jsonrpc_method()
 def close_pull_request(
-        request, apiuser, repoid, pullrequestid,
+        request, apiuser, pullrequestid, repoid=Optional(None),
         userid=Optional(OAttr('apiuser')), message=Optional('')):
     """
     Close the pull request specified by `pullrequestid`.
@@ -738,7 +858,12 b' def close_pull_request('
     """
     _ = request.translate
 
-    repo = get_repo_or_error(repoid)
+    pull_request = get_pull_request_or_error(pullrequestid)
+    if Optional.extract(repoid):
+        repo = get_repo_or_error(repoid)
+    else:
+        repo = pull_request.target_repo
+
     if not isinstance(userid, Optional):
         if (has_superadmin_permission(apiuser) or
                 HasRepoPermissionAnyApi('repository.admin')(
@@ -747,8 +872,6 b' def close_pull_request('
         else:
             raise JSONRPCError('userid is not the same as your user')
 
-    pull_request = get_pull_request_or_error(pullrequestid)
-
     if pull_request.is_closed():
         raise JSONRPCError(
             'pull request `%s` is already closed' % (pullrequestid,))

rhodecode/api/views/repo_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -32,6 +32,7 b' from rhodecode.api.utils import ('
 from rhodecode.lib import audit_logger
 from rhodecode.lib import repo_maintenance
 from rhodecode.lib.auth import HasPermissionAnyApi, HasUserGroupPermissionAnyApi
+from rhodecode.lib.celerylib.utils import get_task_id
 from rhodecode.lib.utils2 import str2bool, time_to_datetime
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.exceptions import StatusChangeOnClosedPullRequestError
@@ -126,26 +127,6 b' def get_repo(request, apiuser, repoid, c'
             "lock_reason": null,
             "locked_by": null,
             "locked_date": null,
-            "members": [
-              {
-                "name": "super-admin-name",
-                "origin": "super-admin",
-                "permission": "repository.admin",
-                "type": "user"
-              },
-              {
-                "name": "owner-name",
-                "origin": "owner",
-                "permission": "repository.admin",
-                "type": "user"
-              },
-              {
-                "name": "user-group-name",
-                "origin": "permission",
-                "permission": "repository.write",
-                "type": "user_group"
-              }
-            ],
             "owner": "owner-name",
             "permissions": [
               {
@@ -213,7 +194,6 b' def get_repo(request, apiuser, repoid, c'
     if not cache:
         repo.update_commit_cache()
     data = repo.get_api_data(include_secrets=include_secrets)
-    data['members'] = permissions  # TODO: this should be deprecated soon
     data['permissions'] = permissions
     data['followers'] = following_users
     return data
@@ -340,11 +320,7 b' def get_repo_changeset(request, apiuser,'
     _cs_json = cs.__json__()
     _cs_json['diff'] = build_commit_data(cs, changes_details)
     if changes_details == 'full':
-        _cs_json['refs'] = {
-            'branches': [cs.branch],
-            'bookmarks': getattr(cs, 'bookmarks', []),
-            'tags': cs.tags
-        }
+        _cs_json['refs'] = cs._get_refs()
     return _cs_json
 
 
@@ -716,10 +692,7 b' def create_repo('
         }
 
         task = RepoModel().create(form_data=data, cur_user=owner)
-        from celery.result import BaseAsyncResult
-        task_id = None
-        if isinstance(task, BaseAsyncResult):
-            task_id = task.task_id
+        task_id = get_task_id(task)
         # no commit, it's done in RepoModel, or async via celery
         return {
             'msg': "Created new repository `%s`" % (schema_data['repo_name'],),
@@ -915,7 +888,8 b' def update_repo('
         repo_enable_downloads=enable_downloads
         if not isinstance(enable_downloads, Optional) else repo.enable_downloads)
 
-    ref_choices, _labels = ScmModel().get_repo_landing_revs(repo=repo)
+    ref_choices, _labels = ScmModel().get_repo_landing_revs(
+        request.translate, repo=repo)
 
     old_values = repo.get_api_data()
     schema = repo_schema.RepoSchema().bind(
@@ -1108,10 +1082,8 b' def fork_repo(request, apiuser, repoid, '
 
         task = RepoModel().create_fork(data, cur_user=owner)
         # no commit, it's done in RepoModel, or async via celery
-        from celery.result import BaseAsyncResult
-        task_id = None
-        if isinstance(task, BaseAsyncResult):
-            task_id = task.task_id
+        task_id = get_task_id(task)
+
         return {
             'msg': 'Created fork of `%s` as `%s`' % (
                 repo.repo_name, schema_data['repo_name']),

rhodecode/api/views/repo_group_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -63,7 +63,7 b' def get_repo_group(request, apiuser, rep'
             "group_description": "repo group description",
             "group_id": 14,
             "group_name": "group name",
-            "members": [
+            "permissions": [
               {
                 "name": "super-admin-username",
                 "origin": "super-admin",
@@ -119,7 +119,7 b' def get_repo_group(request, apiuser, rep'
         permissions.append(user_group_data)
 
     data = repo_group.get_api_data()
-    data["members"] = permissions  # TODO: this should be named permissions
+    data["permissions"] = permissions
     return data
 
 
@@ -221,7 +221,7 b' def create_repo_group('
         repo_group = RepoGroupModel().create(
             owner=owner,
             group_name=validated_group_name,
-            group_description=schema_data['repo_group_name'],
+            group_description=schema_data['repo_group_description'],
             copy_permissions=schema_data['repo_group_copy_permissions'])
         Session().flush()
 

rhodecode/api/views/server_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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

rhodecode/api/views/testing_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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

rhodecode/api/views/user_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -79,7 +79,8 b' def get_user(request, apiuser, userid=Op'
             "last_login": "Timestamp",
             "last_activity": "Timestamp",
             "lastname": "surnae",
-            "permissions": {
+            "permissions": <deprecated>,
+            "permissions_summary": {
               "global": [
                 "hg.inherit_default_perms.true",
                 "usergroup.read",
@@ -97,7 +98,7 b' def get_user(request, apiuser, userid=Op'
               "repositories": { "username/example": "repository.write"},
               "repositories_groups": { "user-group/repo": "group.none" },
               "user_groups": { "user_group_name": "usergroup.read" }
-            },
+            }
             "user_id": 32,
             "username": "username"
           }
@@ -115,7 +116,9 b' def get_user(request, apiuser, userid=Op'
 
     user = get_user_or_error(userid)
     data = user.get_api_data(include_secrets=True)
-    data['permissions'] = AuthUser(user_id=user.user_id).permissions
+    permissions = AuthUser(user_id=user.user_id).permissions
+    data['permissions'] = permissions  # TODO(marcink): should be deprecated
+    data['permissions_summary'] = permissions
     return data
 
 

rhodecode/api/views/user_group_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -61,7 +61,7 b' def get_user_group(request, apiuser, use'
             "active": true,
             "group_description": "group description",
             "group_name": "group name",
-            "members": [
+            "permissions": [
               {
                 "name": "owner-name",
                 "origin": "owner",
@@ -82,6 +82,12 b' def get_user_group(request, apiuser, use'
                 "type": "user_group"
               }
             ],
+            "permissions_summary": {
+              "repositories": {
+                "aa-root-level-repo-1": "repository.admin"
+              },
+              "repositories_groups": {}
+            },
             "owner": "owner name",
             "users": [],
             "users_group_id": 2
@@ -119,8 +125,9 b' def get_user_group(request, apiuser, use'
         permissions.append(user_group_data)
 
     data = user_group.get_api_data()
-    data['members'] = permissions
-
+    data["permissions"] = permissions
+    data["permissions_summary"] = UserGroupModel().get_perms_summary(
+        user_group.users_group_id)
     return data
 
 

rhodecode/apps/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/_base/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -147,46 +147,26 b' class BaseAppView(object):'
                    % repo_name)
         return msg
 
-    def _get_local_tmpl_context(self, include_app_defaults=False):
+    def _get_local_tmpl_context(self, include_app_defaults=True):
         c = TemplateArgs()
         c.auth_user = self.request.user
         # TODO(marcink): migrate the usage of c.rhodecode_user to c.auth_user
         c.rhodecode_user = self.request.user
 
         if include_app_defaults:
-            # NOTE(marcink): after full pyramid migration include_app_defaults
-            # should be turned on by default
             from rhodecode.lib.base import attach_context_attributes
             attach_context_attributes(c, self.request, self.request.user.user_id)
 
         return c
 
-    def _register_global_c(self, tmpl_args):
-        """
-        Registers attributes to pylons global `c`
-        """
-
-        # TODO(marcink): remove once pyramid migration is finished
-        from pylons import tmpl_context as c
-        try:
-            for k, v in tmpl_args.items():
-                setattr(c, k, v)
-        except TypeError:
-            log.exception('Failed to register pylons C')
-            pass
-
-    def _get_template_context(self, tmpl_args):
-        self._register_global_c(tmpl_args)
+    def _get_template_context(self, tmpl_args, **kwargs):
 
         local_tmpl_args = {
             'defaults': {},
             'errors': {},
-            # register a fake 'c' to be used in templates instead of global
-            # pylons c, after migration to pyramid we should rename it to 'c'
-            # make sure we replace usage of _c in templates too
-            '_c': tmpl_args
+            'c': tmpl_args
         }
-        local_tmpl_args.update(tmpl_args)
+        local_tmpl_args.update(kwargs)
         return local_tmpl_args
 
     def load_default_context(self):
@@ -196,7 +176,7 b' class BaseAppView(object):'
         def load_default_context(self):
             c = self._get_local_tmpl_context()
             c.custom_var = 'foobar'
-            self._register_global_c(c)
+
             return c
         """
         raise NotImplementedError('Needs implementation in view class')
@@ -215,7 +195,7 b' class RepoAppView(BaseAppView):'
             'Requirements are missing for repository %s: %s',
             self.db_repo_name, error.message)
 
-    def _get_local_tmpl_context(self, include_app_defaults=False):
+    def _get_local_tmpl_context(self, include_app_defaults=True):
         _ = self.request.translate
         c = super(RepoAppView, self)._get_local_tmpl_context(
             include_app_defaults=include_app_defaults)
@@ -338,7 +318,7 b' class BaseReferencesView(RepoAppView):'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     def load_refs_context(self, ref_items, partials_template):

rhodecode/apps/admin/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -19,9 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
-from rhodecode.apps.admin.navigation import NavigationRegistry
-from rhodecode.config.routing import ADMIN_PREFIX
-from rhodecode.lib.utils2 import str2bool
+from rhodecode.apps._base import ADMIN_PREFIX
 
 
 def admin_routes(config):
@@ -72,8 +70,14 b' def admin_routes(config):'
         name='admin_settings_process_management',
         pattern='/settings/process_management')
     config.add_route(
+        name='admin_settings_process_management_data',
+        pattern='/settings/process_management/data')
+    config.add_route(
         name='admin_settings_process_management_signal',
         pattern='/settings/process_management/signal')
+    config.add_route(
+        name='admin_settings_process_management_master_signal',
+        pattern='/settings/process_management/master_signal')
 
     # default settings
     config.add_route(
@@ -83,6 +87,88 b' def admin_routes(config):'
         name='admin_defaults_repositories_update',
         pattern='/defaults/repositories/update')
 
+    # admin settings
+
+    config.add_route(
+        name='admin_settings',
+        pattern='/settings')
+    config.add_route(
+        name='admin_settings_update',
+        pattern='/settings/update')
+
+    config.add_route(
+        name='admin_settings_global',
+        pattern='/settings/global')
+    config.add_route(
+        name='admin_settings_global_update',
+        pattern='/settings/global/update')
+
+    config.add_route(
+        name='admin_settings_vcs',
+        pattern='/settings/vcs')
+    config.add_route(
+        name='admin_settings_vcs_update',
+        pattern='/settings/vcs/update')
+    config.add_route(
+        name='admin_settings_vcs_svn_pattern_delete',
+        pattern='/settings/vcs/svn_pattern_delete')
+
+    config.add_route(
+        name='admin_settings_mapping',
+        pattern='/settings/mapping')
+    config.add_route(
+        name='admin_settings_mapping_update',
+        pattern='/settings/mapping/update')
+
+    config.add_route(
+        name='admin_settings_visual',
+        pattern='/settings/visual')
+    config.add_route(
+        name='admin_settings_visual_update',
+        pattern='/settings/visual/update')
+
+
+    config.add_route(
+        name='admin_settings_issuetracker',
+        pattern='/settings/issue-tracker')
+    config.add_route(
+        name='admin_settings_issuetracker_update',
+        pattern='/settings/issue-tracker/update')
+    config.add_route(
+        name='admin_settings_issuetracker_test',
+        pattern='/settings/issue-tracker/test')
+    config.add_route(
+        name='admin_settings_issuetracker_delete',
+        pattern='/settings/issue-tracker/delete')
+
+    config.add_route(
+        name='admin_settings_email',
+        pattern='/settings/email')
+    config.add_route(
+        name='admin_settings_email_update',
+        pattern='/settings/email/update')
+
+    config.add_route(
+        name='admin_settings_hooks',
+        pattern='/settings/hooks')
+    config.add_route(
+        name='admin_settings_hooks_update',
+        pattern='/settings/hooks/update')
+    config.add_route(
+        name='admin_settings_hooks_delete',
+        pattern='/settings/hooks/delete')
+
+    config.add_route(
+        name='admin_settings_search',
+        pattern='/settings/search')
+
+    config.add_route(
+        name='admin_settings_labs',
+        pattern='/settings/labs')
+    config.add_route(
+        name='admin_settings_labs_update',
+        pattern='/settings/labs/update')
+
     # global permissions
 
     config.add_route(
@@ -237,7 +323,7 b' def admin_routes(config):'
     config.add_route(
         name='edit_user_ips_delete',
         pattern='/users/{user_id:\d+}/edit/ips/delete',
-        user_route_with_default=True) # enabled for default user too
+        user_route_with_default=True)  # enabled for default user too
 
     # user perms
     config.add_route(
@@ -310,12 +396,10 b' def admin_routes(config):'
 
 
 def includeme(config):
-    settings = config.get_settings()
+    from rhodecode.apps.admin.navigation import includeme as nav_includeme
 
     # Create admin navigation registry and add it to the pyramid registry.
-    labs_active = str2bool(settings.get('labs_settings_active', False))
-    navigation_registry = NavigationRegistry(labs_active=labs_active)
-    config.registry.registerUtility(navigation_registry)
+    nav_includeme(config)
 
     # main admin routes
     config.add_route(name='admin_home', pattern=ADMIN_PREFIX)

rhodecode/apps/admin/interfaces.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/admin/navigation.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -25,13 +25,14 b' import collections'
 from zope.interface import implementer
 
 from rhodecode.apps.admin.interfaces import IAdminNavigationRegistry
-from rhodecode.lib.utils import get_registry
+from rhodecode.lib.utils2 import str2bool
 from rhodecode.translation import _
 
 
 log = logging.getLogger(__name__)
 
-NavListEntry = collections.namedtuple('NavListEntry', ['key', 'name', 'url'])
+NavListEntry = collections.namedtuple(
+    'NavListEntry', ['key', 'name', 'url', 'active_list'])
 
 
 class NavEntry(object):
@@ -41,77 +42,69 b' class NavEntry(object):'
     :param key: Unique identifier used to store reference in an OrderedDict.
     :param name: Display name, usually a translation string.
     :param view_name: Name of the view, used generate the URL.
-    :param pyramid: Indicator to use pyramid for URL generation. This should
-        be removed as soon as we are fully migrated to pyramid.
+    :param active_list: list of urls that we select active for this element
     """
 
-    def __init__(self, key, name, view_name, pyramid=False):
+    def __init__(self, key, name, view_name, active_list=None):
         self.key = key
         self.name = name
         self.view_name = view_name
-        self.pyramid = pyramid
+        self._active_list = active_list or []
 
     def generate_url(self, request):
-        if self.pyramid:
-            if hasattr(request, 'route_path'):
-                return request.route_path(self.view_name)
-            else:
-                # TODO: johbo: Remove this after migrating to pyramid.
-                # We need the pyramid request here to generate URLs to pyramid
-                # views from within pylons views.
-                from pyramid.threadlocal import get_current_request
-                pyramid_request = get_current_request()
-                return pyramid_request.route_path(self.view_name)
-        else:
-            from pylons import url
-            return url(self.view_name)
+        return request.route_path(self.view_name)
 
     def get_localized_name(self, request):
-        if hasattr(request, 'translate'):
-            return request.translate(self.name)
-        else:
-            # TODO(marcink): Remove this after migrating to pyramid
-            from pyramid.threadlocal import get_current_request
-            pyramid_request = get_current_request()
-            return pyramid_request.translate(self.name)
+        return request.translate(self.name)
+
+    @property
+    def active_list(self):
+        active_list = [self.key]
+        if self._active_list:
+            active_list = self._active_list
+        return active_list
 
 
 @implementer(IAdminNavigationRegistry)
 class NavigationRegistry(object):
 
     _base_entries = [
-        NavEntry('global', _('Global'), 'admin_settings_global'),
-        NavEntry('vcs', _('VCS'), 'admin_settings_vcs'),
-        NavEntry('visual', _('Visual'), 'admin_settings_visual'),
-        NavEntry('mapping', _('Remap and Rescan'), 'admin_settings_mapping'),
+        NavEntry('global', _('Global'),
+                 'admin_settings_global'),
+        NavEntry('vcs', _('VCS'),
+                 'admin_settings_vcs'),
+        NavEntry('visual', _('Visual'),
+                 'admin_settings_visual'),
+        NavEntry('mapping', _('Remap and Rescan'),
+                 'admin_settings_mapping'),
         NavEntry('issuetracker', _('Issue Tracker'),
                  'admin_settings_issuetracker'),
-        NavEntry('email', _('Email'), 'admin_settings_email'),
-        NavEntry('hooks', _('Hooks'), 'admin_settings_hooks'),
-        NavEntry('search', _('Full Text Search'), 'admin_settings_search'),
-
+        NavEntry('email', _('Email'),
+                 'admin_settings_email'),
+        NavEntry('hooks', _('Hooks'),
+                 'admin_settings_hooks'),
+        NavEntry('search', _('Full Text Search'),
+                 'admin_settings_search'),
         NavEntry('integrations', _('Integrations'),
-                 'global_integrations_home', pyramid=True),
+                 'global_integrations_home'),
         NavEntry('system', _('System Info'),
-                 'admin_settings_system', pyramid=True),
+                 'admin_settings_system'),
         NavEntry('process_management', _('Processes'),
-                 'admin_settings_process_management', pyramid=True),
+                 'admin_settings_process_management'),
         NavEntry('sessions', _('User Sessions'),
-                 'admin_settings_sessions', pyramid=True),
+                 'admin_settings_sessions'),
         NavEntry('open_source', _('Open Source Licenses'),
-                 'admin_settings_open_source', pyramid=True),
+                 'admin_settings_open_source'),
 
-        # TODO: marcink: we disable supervisor now until the supervisor stats
-        # page is fixed in the nix configuration
-        # NavEntry('supervisor', _('Supervisor'), 'admin_settings_supervisor'),
     ]
 
-    _labs_entry = NavEntry('labs', _('Labs'), 'admin_settings_labs')
+    _labs_entry = NavEntry('labs', _('Labs'),
+                           'admin_settings_labs')
 
     def __init__(self, labs_active=False):
-        self._registered_entries = collections.OrderedDict([
-            (item.key, item) for item in self.__class__._base_entries
-        ])
+        self._registered_entries = collections.OrderedDict()
+        for item in self.__class__._base_entries:
+            self._registered_entries[item.key] = item
 
         if labs_active:
             self.add_entry(self._labs_entry)
@@ -121,16 +114,16 b' class NavigationRegistry(object):'
 
     def get_navlist(self, request):
         navlist = [NavListEntry(i.key, i.get_localized_name(request),
-                                i.generate_url(request))
+                                i.generate_url(request), i.active_list)
                    for i in self._registered_entries.values()]
         return navlist
 
 
-def navigation_registry(request):
+def navigation_registry(request, registry=None):
     """
     Helper that returns the admin navigation registry.
     """
-    pyramid_registry = get_registry(request)
+    pyramid_registry = registry or request.registry
     nav_registry = pyramid_registry.queryUtility(IAdminNavigationRegistry)
     return nav_registry
 
@@ -140,3 +133,11 b' def navigation_list(request):'
     Helper that returns the admin navigation as list of NavListEntry objects.
     """
     return navigation_registry(request).get_navlist(request)
+
+
+def includeme(config):
+    # Create admin navigation registry and add it to the pyramid registry.
+    settings = config.get_settings()
+    labs_active = str2bool(settings.get('labs_settings_active', False))
+    navigation_registry = NavigationRegistry(labs_active=labs_active)
+    config.registry.registerUtility(navigation_registry)
  No newline at end of file

rhodecode/apps/admin/tests/test_admin_audit_logs.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -46,10 +46,11 b' def route_path(name, params=None, **kwar'
     return base_url
 
 
-class TestAdminController(TestController):
[e-mail]('app')
+class TestAdminController(object):
 
     @pytest.fixture(scope='class', autouse=True)
-    def prepare(self, request, pylonsapp):
+    def prepare(self, request, baseapp):
         UserLog.query().delete()
         Session().commit()
 
@@ -84,104 +85,87 b' class TestAdminController(TestController'
             UserLog.query().delete()
             Session().commit()
 
-    def test_index(self):
-        self.log_user()
+    def test_index(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs'))
         response.mustcontain('Admin audit logs')
 
-    def test_filter_all_entries(self):
-        self.log_user()
+    def test_filter_all_entries(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs'))
         all_count = UserLog.query().count()
         response.mustcontain('%s entries' % all_count)
 
-    def test_filter_journal_filter_exact_match_on_repository(self):
-        self.log_user()
+    def test_filter_journal_filter_exact_match_on_repository(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='repository:rhodecode')))
         response.mustcontain('3 entries')
 
-    def test_filter_journal_filter_exact_match_on_repository_CamelCase(self):
-        self.log_user()
+    def test_filter_journal_filter_exact_match_on_repository_CamelCase(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='repository:RhodeCode')))
         response.mustcontain('3 entries')
 
-    def test_filter_journal_filter_wildcard_on_repository(self):
-        self.log_user()
+    def test_filter_journal_filter_wildcard_on_repository(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='repository:*test*')))
         response.mustcontain('862 entries')
 
-    def test_filter_journal_filter_prefix_on_repository(self):
-        self.log_user()
+    def test_filter_journal_filter_prefix_on_repository(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='repository:test*')))
         response.mustcontain('257 entries')
 
-    def test_filter_journal_filter_prefix_on_repository_CamelCase(self):
-        self.log_user()
+    def test_filter_journal_filter_prefix_on_repository_CamelCase(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='repository:Test*')))
         response.mustcontain('257 entries')
 
-    def test_filter_journal_filter_prefix_on_repository_and_user(self):
-        self.log_user()
+    def test_filter_journal_filter_prefix_on_repository_and_user(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='repository:test* AND username:demo')))
         response.mustcontain('130 entries')
 
-    def test_filter_journal_filter_prefix_on_repository_or_target_repo(self):
-        self.log_user()
+    def test_filter_journal_filter_prefix_on_repository_or_target_repo(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='repository:test* OR repository:rhodecode')))
         response.mustcontain('260 entries')  # 257 + 3
 
-    def test_filter_journal_filter_exact_match_on_username(self):
-        self.log_user()
+    def test_filter_journal_filter_exact_match_on_username(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                params=dict(filter='username:demo')))
         response.mustcontain('1087 entries')
 
-    def test_filter_journal_filter_exact_match_on_username_camelCase(self):
-        self.log_user()
+    def test_filter_journal_filter_exact_match_on_username_camelCase(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='username:DemO')))
         response.mustcontain('1087 entries')
 
-    def test_filter_journal_filter_wildcard_on_username(self):
-        self.log_user()
+    def test_filter_journal_filter_wildcard_on_username(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='username:*test*')))
         entries_count = UserLog.query().filter(UserLog.username.ilike('%test%')).count()
         response.mustcontain('{} entries'.format(entries_count))
 
-    def test_filter_journal_filter_prefix_on_username(self):
-        self.log_user()
+    def test_filter_journal_filter_prefix_on_username(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='username:demo*')))
         response.mustcontain('1101 entries')
 
-    def test_filter_journal_filter_prefix_on_user_or_other_user(self):
-        self.log_user()
+    def test_filter_journal_filter_prefix_on_user_or_other_user(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='username:demo OR username:volcan')))
         response.mustcontain('1095 entries')  # 1087 + 8
 
-    def test_filter_journal_filter_wildcard_on_action(self):
-        self.log_user()
+    def test_filter_journal_filter_wildcard_on_action(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='action:*pull_request*')))
         response.mustcontain('187 entries')
 
-    def test_filter_journal_filter_on_date(self):
-        self.log_user()
+    def test_filter_journal_filter_on_date(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='date:20121010')))
         response.mustcontain('47 entries')
 
-    def test_filter_journal_filter_on_date_2(self):
-        self.log_user()
+    def test_filter_journal_filter_on_date_2(self, autologin_user):
         response = self.app.get(route_path('admin_audit_logs',
                                 params=dict(filter='date:20121020')))
         response.mustcontain('17 entries')

rhodecode/apps/admin/tests/test_admin_auth_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -32,7 +32,7 b' def assert_auth_settings_updated(respons'
 
 
 @pytest.mark.usefixtures("autologin_user", "app")
-class TestAuthSettingsController(object):
+class TestAuthSettingsView(object):
 
     def _enable_plugins(self, plugins_list, csrf_token, override=None,
                         verify_response=False):

rhodecode/apps/admin/tests/test_admin_defaults.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/admin/tests/test_admin_main_views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/admin/tests/test_admin_permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/admin/tests/test_admin_repos.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/admin/tests/test_admin_repository_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/admin/tests/test_admin_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -22,17 +22,88 b' import mock'
 import pytest
 
 import rhodecode
-from rhodecode.config.routing import ADMIN_PREFIX
+from rhodecode.apps._base import ADMIN_PREFIX
 from rhodecode.lib.utils2 import md5
 from rhodecode.model.db import RhodeCodeUi
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import SettingsModel, IssueTrackerSettingsModel
-from rhodecode.tests import url, assert_session_flash
+from rhodecode.tests import assert_session_flash
 from rhodecode.tests.utils import AssertResponse
 
 
-UPDATE_DATA_QUALNAME = (
-    'rhodecode.apps.admin.views.system_info.AdminSystemInfoSettingsView.get_update_data')
+UPDATE_DATA_QUALNAME = 'rhodecode.model.update.UpdateModel.get_update_data'
+
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+    from rhodecode.apps._base import ADMIN_PREFIX
+
+    base_url = {
+
+        'admin_settings':
+            ADMIN_PREFIX +'/settings',
+        'admin_settings_update':
+            ADMIN_PREFIX + '/settings/update',
+        'admin_settings_global':
+            ADMIN_PREFIX + '/settings/global',
+        'admin_settings_global_update':
+            ADMIN_PREFIX + '/settings/global/update',
+        'admin_settings_vcs':
+            ADMIN_PREFIX + '/settings/vcs',
+        'admin_settings_vcs_update':
+            ADMIN_PREFIX + '/settings/vcs/update',
+        'admin_settings_vcs_svn_pattern_delete':
+            ADMIN_PREFIX + '/settings/vcs/svn_pattern_delete',
+        'admin_settings_mapping':
+            ADMIN_PREFIX + '/settings/mapping',
+        'admin_settings_mapping_update':
+            ADMIN_PREFIX + '/settings/mapping/update',
+        'admin_settings_visual':
+            ADMIN_PREFIX + '/settings/visual',
+        'admin_settings_visual_update':
+            ADMIN_PREFIX + '/settings/visual/update',
+        'admin_settings_issuetracker':
+            ADMIN_PREFIX + '/settings/issue-tracker',
+        'admin_settings_issuetracker_update':
+            ADMIN_PREFIX + '/settings/issue-tracker/update',
+        'admin_settings_issuetracker_test':
+            ADMIN_PREFIX + '/settings/issue-tracker/test',
+        'admin_settings_issuetracker_delete':
+            ADMIN_PREFIX + '/settings/issue-tracker/delete',
+        'admin_settings_email':
+            ADMIN_PREFIX + '/settings/email',
+        'admin_settings_email_update':
+            ADMIN_PREFIX + '/settings/email/update',
+        'admin_settings_hooks':
+            ADMIN_PREFIX + '/settings/hooks',
+        'admin_settings_hooks_update':
+            ADMIN_PREFIX + '/settings/hooks/update',
+        'admin_settings_hooks_delete':
+            ADMIN_PREFIX + '/settings/hooks/delete',
+        'admin_settings_search':
+            ADMIN_PREFIX + '/settings/search',
+        'admin_settings_labs':
+            ADMIN_PREFIX + '/settings/labs',
+        'admin_settings_labs_update':
+            ADMIN_PREFIX + '/settings/labs/update',
+
+        'admin_settings_sessions':
+            ADMIN_PREFIX + '/settings/sessions',
+        'admin_settings_sessions_cleanup':
+            ADMIN_PREFIX + '/settings/sessions/cleanup',
+        'admin_settings_system':
+            ADMIN_PREFIX + '/settings/system',
+        'admin_settings_system_update':
+            ADMIN_PREFIX + '/settings/system/updates',
+        'admin_settings_open_source':
+            ADMIN_PREFIX + '/settings/open_source',
+
+
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')
@@ -47,12 +118,12 b' class TestAdminSettingsController(object'
         'admin_settings_hooks',
         'admin_settings_search',
     ])
-    def test_simple_get(self, urlname, app):
-        app.get(url(urlname))
+    def test_simple_get(self, urlname):
+        self.app.get(route_path(urlname))
 
     def test_create_custom_hook(self, csrf_token):
         response = self.app.post(
-            url('admin_settings_hooks'),
+            route_path('admin_settings_hooks_update'),
             params={
                 'new_hook_ui_key': 'test_hooks_1',
                 'new_hook_ui_value': 'cd /tmp',
@@ -64,7 +135,7 b' class TestAdminSettingsController(object'
 
     def test_create_custom_hook_delete(self, csrf_token):
         response = self.app.post(
-            url('admin_settings_hooks'),
+            route_path('admin_settings_hooks_update'),
             params={
                 'new_hook_ui_key': 'test_hooks_2',
                 'new_hook_ui_value': 'cd /tmp2',
@@ -78,9 +149,9 b' class TestAdminSettingsController(object'
 
         # delete
         self.app.post(
-            url('admin_settings_hooks'),
+            route_path('admin_settings_hooks_delete'),
             params={'hook_id': hook_id, 'csrf_token': csrf_token})
-        response = self.app.get(url('admin_settings_hooks'))
+        response = self.app.get(route_path('admin_settings_hooks'))
         response.mustcontain(no=['test_hooks_2'])
         response.mustcontain(no=['cd /tmp2'])
 
@@ -135,7 +206,6 b' class TestAdminSettingsGlobal(object):'
 
     def test_title_change(self, csrf_token):
         old_title = 'RhodeCode'
-        new_title = old_title + '_changed'
 
         for new_title in ['Changed', 'Żółwik', old_title]:
             response = self.post_and_verify_settings({
@@ -161,7 +231,8 b' class TestAdminSettingsGlobal(object):'
             'rhodecode_personal_repo_group_pattern': '${username}',
         }
         params.update(settings)
-        response = self.app.post(url('admin_settings_global'), params=params)
+        response = self.app.post(
+            route_path('admin_settings_global_update'), params=params)
 
         assert_session_flash(response, 'Updated application settings')
         app_settings = SettingsModel().get_all_settings()
@@ -175,8 +246,8 b' class TestAdminSettingsGlobal(object):'
 @pytest.mark.usefixtures('autologin_user', 'app')
 class TestAdminSettingsVcs(object):
 
-    def test_contains_svn_default_patterns(self, app):
-        response = app.get(url('admin_settings_vcs'))
+    def test_contains_svn_default_patterns(self):
+        response = self.app.get(route_path('admin_settings_vcs'))
         expected_patterns = [
             '/trunk',
             '/branches/*',
@@ -186,7 +257,7 b' class TestAdminSettingsVcs(object):'
             response.mustcontain(pattern)
 
     def test_add_new_svn_branch_and_tag_pattern(
-            self, app, backend_svn, form_defaults, disable_sql_cache,
+            self, backend_svn, form_defaults, disable_sql_cache,
             csrf_token):
         form_defaults.update({
             'new_svn_branch': '/exp/branches/*',
@@ -194,8 +265,9 b' class TestAdminSettingsVcs(object):'
             'csrf_token': csrf_token,
         })
 
-        response = app.post(
-            url('admin_settings_vcs'), params=form_defaults, status=302)
+        response = self.app.post(
+            route_path('admin_settings_vcs_update'),
+            params=form_defaults, status=302)
         response = response.follow()
 
         # Expect to find the new values on the page
@@ -208,12 +280,12 b' class TestAdminSettingsVcs(object):'
         assert 'important_tags/v0.5' in repo.tags
 
     def test_add_same_svn_value_twice_shows_an_error_message(
-            self, app, form_defaults, csrf_token, settings_util):
+            self, form_defaults, csrf_token, settings_util):
         settings_util.create_rhodecode_ui('vcs_svn_branch', '/test')
         settings_util.create_rhodecode_ui('vcs_svn_tag', '/test')
 
-        response = app.post(
-            url('admin_settings_vcs'),
+        response = self.app.post(
+            route_path('admin_settings_vcs_update'),
             params={
                 'paths_root_path': form_defaults['paths_root_path'],
                 'new_svn_branch': '/test',
@@ -230,14 +302,13 b' class TestAdminSettingsVcs(object):'
         'vcs_svn_tag',
     ])
     def test_delete_svn_patterns(
-            self, section, app, csrf_token, settings_util):
+            self, section, csrf_token, settings_util):
         setting = settings_util.create_rhodecode_ui(
             section, '/test_delete', cleanup=False)
 
-        app.post(
-            url('admin_settings_vcs'),
+        self.app.post(
+            route_path('admin_settings_vcs_svn_pattern_delete'),
             params={
-                '_method': 'delete',
                 'delete_svn_pattern': setting.ui_id,
                 'csrf_token': csrf_token},
             headers={'X-REQUESTED-WITH': 'XMLHttpRequest'})
@@ -246,25 +317,24 b' class TestAdminSettingsVcs(object):'
         'vcs_svn_branch',
         'vcs_svn_tag',
     ])
-    def test_delete_svn_patterns_raises_400_when_no_xhr(
-            self, section, app, csrf_token, settings_util):
+    def test_delete_svn_patterns_raises_404_when_no_xhr(
+            self, section, csrf_token, settings_util):
         setting = settings_util.create_rhodecode_ui(section, '/test_delete')
 
-        app.post(
-            url('admin_settings_vcs'),
+        self.app.post(
+            route_path('admin_settings_vcs_svn_pattern_delete'),
             params={
-                '_method': 'delete',
                 'delete_svn_pattern': setting.ui_id,
                 'csrf_token': csrf_token},
-            status=400)
+            status=404)
 
-    def test_extensions_hgsubversion(self, app, form_defaults, csrf_token):
+    def test_extensions_hgsubversion(self, form_defaults, csrf_token):
         form_defaults.update({
             'csrf_token': csrf_token,
             'extensions_hgsubversion': 'True',
         })
-        response = app.post(
-            url('admin_settings_vcs'),
+        response = self.app.post(
+            route_path('admin_settings_vcs_update'),
             params=form_defaults,
             status=302)
 
@@ -275,13 +345,13 b' class TestAdminSettingsVcs(object):'
             'value="True" checked="checked" />')
         response.mustcontain(extensions_input)
 
-    def test_extensions_hgevolve(self, app, form_defaults, csrf_token):
+    def test_extensions_hgevolve(self, form_defaults, csrf_token):
         form_defaults.update({
             'csrf_token': csrf_token,
             'extensions_evolve': 'True',
         })
-        response = app.post(
-            url('admin_settings_vcs'),
+        response = self.app.post(
+            route_path('admin_settings_vcs_update'),
             params=form_defaults,
             status=302)
 
@@ -292,20 +362,19 b' class TestAdminSettingsVcs(object):'
             'value="True" checked="checked" />')
         response.mustcontain(extensions_input)
 
-    def test_has_a_section_for_pull_request_settings(self, app):
-        response = app.get(url('admin_settings_vcs'))
+    def test_has_a_section_for_pull_request_settings(self):
+        response = self.app.get(route_path('admin_settings_vcs'))
         response.mustcontain('Pull Request Settings')
 
-    def test_has_an_input_for_invalidation_of_inline_comments(
-            self, app):
-        response = app.get(url('admin_settings_vcs'))
+    def test_has_an_input_for_invalidation_of_inline_comments(self):
+        response = self.app.get(route_path('admin_settings_vcs'))
         assert_response = AssertResponse(response)
         assert_response.one_element_exists(
             '[name=rhodecode_use_outdated_comments]')
 
     @pytest.mark.parametrize('new_value', [True, False])
     def test_allows_to_change_invalidation_of_inline_comments(
-            self, app, form_defaults, csrf_token, new_value):
+            self, form_defaults, csrf_token, new_value):
         setting_key = 'use_outdated_comments'
         setting = SettingsModel().create_or_update_setting(
             setting_key, not new_value, 'bool')
@@ -316,8 +385,8 b' class TestAdminSettingsVcs(object):'
             'csrf_token': csrf_token,
             'rhodecode_use_outdated_comments': str(new_value),
         })
-        response = app.post(
-            url('admin_settings_vcs'),
+        response = self.app.post(
+            route_path('admin_settings_vcs_update'),
             params=form_defaults,
             status=302)
         response = response.follow()
@@ -326,7 +395,7 b' class TestAdminSettingsVcs(object):'
 
     @pytest.mark.parametrize('new_value', [True, False])
     def test_allows_to_change_hg_rebase_merge_strategy(
-            self, app, form_defaults, csrf_token, new_value):
+            self, form_defaults, csrf_token, new_value):
         setting_key = 'hg_use_rebase_for_merging'
 
         form_defaults.update({
@@ -336,8 +405,8 b' class TestAdminSettingsVcs(object):'
 
         with mock.patch.dict(
                 rhodecode.CONFIG, {'labs_settings_active': 'true'}):
-            app.post(
-                url('admin_settings_vcs'),
+            self.app.post(
+                route_path('admin_settings_vcs_update'),
                 params=form_defaults,
                 status=302)
 
@@ -353,14 +422,13 b' class TestAdminSettingsVcs(object):'
 
     @pytest.fixture
     def form_defaults(self):
-        from rhodecode.controllers.admin.settings import SettingsController
-        controller = SettingsController()
-        return controller._form_defaults()
+        from rhodecode.apps.admin.views.settings import AdminSettingsView
+        return AdminSettingsView._form_defaults()
 
     # TODO: johbo: What we really want is to checkpoint before a test run and
     # reset the session afterwards.
     @pytest.fixture(scope='class', autouse=True)
-    def cleanup_settings(self, request, pylonsapp):
+    def cleanup_settings(self, request, baseapp):
         ui_id = RhodeCodeUi.ui_id
         original_ids = list(
             r.ui_id for r in RhodeCodeUi.query().values(ui_id))
@@ -374,14 +442,16 b' class TestAdminSettingsVcs(object):'
 @pytest.mark.usefixtures('autologin_user', 'app')
 class TestLabsSettings(object):
     def test_get_settings_page_disabled(self):
-        with mock.patch.dict(rhodecode.CONFIG,
-                             {'labs_settings_active': 'false'}):
-            response = self.app.get(url('admin_settings_labs'), status=302)
+        with mock.patch.dict(
+                rhodecode.CONFIG, {'labs_settings_active': 'false'}):
 
-        assert response.location.endswith(url('admin_settings'))
+            response = self.app.get(
+                route_path('admin_settings_labs'), status=302)
+
+        assert response.location.endswith(route_path('admin_settings'))
 
     def test_get_settings_page_enabled(self):
-        from rhodecode.controllers.admin import settings
+        from rhodecode.apps.admin.views import settings
         lab_settings = [
             settings.LabSetting(
                 key='rhodecode_bool',
@@ -401,7 +471,7 b' class TestLabsSettings(object):'
         with mock.patch.dict(rhodecode.CONFIG,
                              {'labs_settings_active': 'true'}):
             with mock.patch.object(settings, '_LAB_SETTINGS', lab_settings):
-                response = self.app.get(url('admin_settings_labs'))
+                response = self.app.get(route_path('admin_settings_labs'))
 
         assert '<label>bool group:</label>' in response
         assert '<label for="rhodecode_bool">bool label</label>' in response
@@ -417,9 +487,6 b' class TestLabsSettings(object):'
 @pytest.mark.usefixtures('app')
 class TestOpenSourceLicenses(object):
 
-    def _get_url(self):
-        return ADMIN_PREFIX + '/settings/open_source'
-
     def test_records_are_displayed(self, autologin_user):
         sample_licenses = {
             "python2.7-pytest-2.7.1": {
@@ -433,7 +500,8 b' class TestOpenSourceLicenses(object):'
             'rhodecode.apps.admin.views.open_source_licenses.read_opensource_licenses',
             return_value=sample_licenses)
         with read_licenses_patch:
-            response = self.app.get(self._get_url(), status=200)
+            response = self.app.get(
+                route_path('admin_settings_open_source'), status=200)
 
         assert_response = AssertResponse(response)
         assert_response.element_contains(
@@ -444,29 +512,25 b' class TestOpenSourceLicenses(object):'
                 assert_response.element_contains('.panel-body', license)
 
     def test_records_can_be_read(self, autologin_user):
-        response = self.app.get(self._get_url(), status=200)
+        response = self.app.get(
+            route_path('admin_settings_open_source'), status=200)
         assert_response = AssertResponse(response)
         assert_response.element_contains(
             '.panel-heading', 'Licenses of Third Party Packages')
 
     def test_forbidden_when_normal_user(self, autologin_regular_user):
-        self.app.get(self._get_url(), status=404)
+        self.app.get(
+            route_path('admin_settings_open_source'), status=404)
 
 
 @pytest.mark.usefixtures('app')
 class TestUserSessions(object):
 
-    def _get_url(self, name='admin_settings_sessions'):
-        return {
-            'admin_settings_sessions': ADMIN_PREFIX + '/settings/sessions',
-            'admin_settings_sessions_cleanup': ADMIN_PREFIX + '/settings/sessions/cleanup'
-        }[name]
-
     def test_forbidden_when_normal_user(self, autologin_regular_user):
-        self.app.get(self._get_url(), status=404)
+        self.app.get(route_path('admin_settings_sessions'), status=404)
 
     def test_show_sessions_page(self, autologin_user):
-        response = self.app.get(self._get_url(), status=200)
+        response = self.app.get(route_path('admin_settings_sessions'), status=200)
         response.mustcontain('file')
 
     def test_cleanup_old_sessions(self, autologin_user, csrf_token):
@@ -476,24 +540,19 b' class TestUserSessions(object):'
             'expire_days': '60'
         }
         response = self.app.post(
-            self._get_url('admin_settings_sessions_cleanup'), params=post_data,
+            route_path('admin_settings_sessions_cleanup'), params=post_data,
             status=302)
         assert_session_flash(response, 'Cleaned up old sessions')
 
 
 @pytest.mark.usefixtures('app')
 class TestAdminSystemInfo(object):
-    def _get_url(self, name='admin_settings_system'):
-        return {
-            'admin_settings_system': ADMIN_PREFIX + '/settings/system',
-            'admin_settings_system_update': ADMIN_PREFIX + '/settings/system/updates',
-        }[name]
 
     def test_forbidden_when_normal_user(self, autologin_regular_user):
-        self.app.get(self._get_url(), status=404)
+        self.app.get(route_path('admin_settings_system'), status=404)
 
     def test_system_info_page(self, autologin_user):
-        response = self.app.get(self._get_url())
+        response = self.app.get(route_path('admin_settings_system'))
         response.mustcontain('RhodeCode Community Edition, version {}'.format(
             rhodecode.__version__))
 
@@ -511,7 +570,7 b' class TestAdminSystemInfo(object):'
             ]
         }
         with mock.patch(UPDATE_DATA_QUALNAME, return_value=update_data):
-            response = self.app.get(self._get_url('admin_settings_system_update'))
+            response = self.app.get(route_path('admin_settings_system_update'))
             response.mustcontain('A <b>new version</b> is available')
 
     def test_system_update_nothing_new(self, autologin_user):
@@ -524,13 +583,13 b' class TestAdminSystemInfo(object):'
             ]
         }
         with mock.patch(UPDATE_DATA_QUALNAME, return_value=update_data):
-            response = self.app.get(self._get_url('admin_settings_system_update'))
+            response = self.app.get(route_path('admin_settings_system_update'))
             response.mustcontain(
-                'You already have the <b>latest</b> stable version.')
+                'This instance is already running the <b>latest</b> stable version')
 
     def test_system_update_bad_response(self, autologin_user):
         with mock.patch(UPDATE_DATA_QUALNAME, side_effect=ValueError('foo')):
-            response = self.app.get(self._get_url('admin_settings_system_update'))
+            response = self.app.get(route_path('admin_settings_system_update'))
             response.mustcontain(
                 'Bad data sent from update server')
 
@@ -542,12 +601,12 b' class TestAdminSettingsIssueTracker(obje'
     PATTERN_KEY = RC_PREFIX + SHORT_PATTERN_KEY
 
     def test_issuetracker_index(self, autologin_user):
-        response = self.app.get(url('admin_settings_issuetracker'))
+        response = self.app.get(route_path('admin_settings_issuetracker'))
         assert response.status_code == 200
 
     def test_add_empty_issuetracker_pattern(
             self, request, autologin_user, csrf_token):
-        post_url = url('admin_settings_issuetracker_save')
+        post_url = route_path('admin_settings_issuetracker_update')
         post_data = {
             'csrf_token': csrf_token
         }
@@ -557,14 +616,14 b' class TestAdminSettingsIssueTracker(obje'
             self, request, autologin_user, csrf_token):
         pattern = 'issuetracker_pat'
         another_pattern = pattern+'1'
-        post_url = url('admin_settings_issuetracker_save')
+        post_url = route_path('admin_settings_issuetracker_update')
         post_data = {
             'new_pattern_pattern_0': pattern,
-            'new_pattern_url_0': 'url',
+            'new_pattern_url_0': 'http://url',
             'new_pattern_prefix_0': 'prefix',
             'new_pattern_description_0': 'description',
             'new_pattern_pattern_1': another_pattern,
-            'new_pattern_url_1': 'url1',
+            'new_pattern_url_1': 'https://url1',
             'new_pattern_prefix_1': 'prefix1',
             'new_pattern_description_1': 'description1',
             'csrf_token': csrf_token
@@ -600,10 +659,10 b' class TestAdminSettingsIssueTracker(obje'
         SettingsModel().create_or_update_setting(
             self.SHORT_PATTERN_KEY+old_uid, old_pattern, 'unicode')
 
-        post_url = url('admin_settings_issuetracker_save')
+        post_url = route_path('admin_settings_issuetracker_update')
         post_data = {
             'new_pattern_pattern_0': pattern,
-            'new_pattern_url_0': 'url',
+            'new_pattern_url_0': 'https://url',
             'new_pattern_prefix_0': 'prefix',
             'new_pattern_description_0': 'description',
             'uid': old_uid,
@@ -634,10 +693,10 b' class TestAdminSettingsIssueTracker(obje'
         settings_util.create_rhodecode_setting(
             desc_key, 'old description', 'unicode', cleanup=False)
 
-        post_url = url('admin_settings_issuetracker_save')
+        post_url = route_path('admin_settings_issuetracker_update')
         post_data = {
             'new_pattern_pattern_0': pattern,
-            'new_pattern_url_0': 'url',
+            'new_pattern_url_0': 'https://url',
             'new_pattern_prefix_0': 'prefix',
             'new_pattern_description_0': new_description,
             'uid': self.uid,
@@ -659,7 +718,7 b' class TestAdminSettingsIssueTracker(obje'
         settings_util.create_rhodecode_setting(
             self.SHORT_PATTERN_KEY+uid, pattern, 'unicode', cleanup=False)
 
-        post_url = url('admin_issuetracker_delete')
+        post_url = route_path('admin_settings_issuetracker_delete')
         post_data = {
             '_method': 'delete',
             'uid': uid,

rhodecode/apps/admin/tests/test_admin_user_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/admin/tests/test_admin_users.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -23,7 +23,6 b' from sqlalchemy.orm.exc import NoResultF'
 
 from rhodecode.lib import auth
 from rhodecode.lib import helpers as h
-from rhodecode.model import validators
 from rhodecode.model.db import User, UserApiKeys, UserEmailMap, Repository
 from rhodecode.model.meta import Session
 from rhodecode.model.user import UserModel
@@ -386,8 +385,7 b' class TestAdminUsersView(TestController)'
             'csrf_token': self.csrf_token,
         })
 
-        msg = validators.ValidUsername(
-            False, {})._messages['system_invalid_username']
+        msg = u'Username "%(username)s" is forbidden'
         msg = h.html_escape(msg % {'username': 'new_user'})
         response.mustcontain('<span class="error-message">%s</span>' % msg)
         response.mustcontain(

rhodecode/apps/admin/tests/test_admin_users_ssh_keys.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/admin/views/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/admin/views/audit_logs.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -36,7 +36,6 b' log = logging.getLogger(__name__)'
 class AdminAuditLogsView(BaseAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
         return c
 
     @LoginRequired()

rhodecode/apps/admin/views/defaults.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -44,7 +44,7 b' class AdminDefaultSettingsView(BaseAppVi'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()
@@ -79,7 +79,7 b' class AdminDefaultSettingsView(BaseAppVi'
         _ = self.request.translate
         c = self.load_default_context()
         c.active = 'repositories'
-        form = DefaultsForm()()
+        form = DefaultsForm(self.request.translate)()
 
         try:
             form_result = form.to_python(dict(self.request.POST))

rhodecode/apps/admin/views/main_views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/admin/views/open_source_licenses.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -35,7 +35,7 b' class OpenSourceLicensesAdminSettingsVie'
 
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()

rhodecode/apps/admin/views/permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -53,8 +53,6 b' log = logging.getLogger(__name__)'
 class AdminPermissionsView(BaseAppView, DataGridAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-
-        self._register_global_c(c)
         PermissionModel().set_global_permission_choices(
             c, gettext_translator=self.request.translate)
         return c
@@ -100,6 +98,7 b' class AdminPermissionsView(BaseAppView, '
         c.active = 'application'
 
         _form = ApplicationPermissionsForm(
+            self.request.translate,
             [x[0] for x in c.register_choices],
             [x[0] for x in c.password_reset_choices],
             [x[0] for x in c.extern_activate_choices])()
@@ -180,6 +179,7 b' class AdminPermissionsView(BaseAppView, '
         c.active = 'objects'
 
         _form = ObjectPermissionsForm(
+            self.request.translate,
             [x[0] for x in c.repo_perms_choices],
             [x[0] for x in c.group_perms_choices],
             [x[0] for x in c.user_group_perms_choices])()
@@ -251,6 +251,7 b' class AdminPermissionsView(BaseAppView, '
         c.active = 'global'
 
         _form = UserPermissionsForm(
+            self.request.translate,
             [x[0] for x in c.repo_create_choices],
             [x[0] for x in c.repo_create_on_write_choices],
             [x[0] for x in c.repo_group_create_choices],
@@ -395,6 +396,7 b' class AdminPermissionsView(BaseAppView, '
         renderer='json_ext', xhr=True)
     def ssh_keys_data(self):
         _ = self.request.translate
+        self.load_default_context()
         column_map = {
             'fingerprint': 'ssh_key_fingerprint',
             'username': User.username

rhodecode/apps/admin/views/process_management.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -21,6 +21,7 b''
 import logging
 
 import psutil
+import signal
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
@@ -35,7 +36,7 b' log = logging.getLogger(__name__)'
 class AdminProcessManagementView(BaseAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()
@@ -55,6 +56,18 b' class AdminProcessManagementView(BaseApp'
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings_process_management_data', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings_process_management_data.mako')
+    def process_management_data(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.gunicorn_processes = (
+            p for p in psutil.process_iter() if 'gunicorn' in p.name())
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     @view_config(
         route_name='admin_settings_process_management_signal',
@@ -89,3 +102,32 b' class AdminProcessManagementView(BaseApp'
             p.kill()
 
         return {'result': result}
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_process_management_master_signal',
+        request_method='POST', renderer='json_ext')
+    def process_management_master_signal(self):
+        pid_data = self.request.json.get('pid_data', {})
+        pid = safe_int(pid_data['pid'])
+        action = pid_data['action']
+        if pid:
+            try:
+                proc = psutil.Process(pid)
+            except psutil.NoSuchProcess:
+                return {'result': 'failure_no_such_process'}
+
+            children = proc.children(recursive=True)
+            if children:
+                # master process
+                if action == '+' and len(children) <= 20:
+                    proc.send_signal(signal.SIGTTIN)
+                elif action == '-' and len(children) >= 2:
+                    proc.send_signal(signal.SIGTTOU)
+                else:
+                    return {'result': 'failure_wrong_action'}
+                return {'result': 'success'}
+
+        return {'result': 'failure_not_master'}

rhodecode/apps/admin/views/repo_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -47,7 +47,7 b' class AdminRepoGroupsView(BaseAppView, D'
 
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
+
         return c
 
     def _load_form_data(self, c):
@@ -150,8 +150,9 b' class AdminRepoGroupsView(BaseAppView, D'
         # permissions for can create group based on parent_id are checked
         # here in the Form
         available_groups = map(lambda k: safe_unicode(k[0]), c.repo_groups)
-        repo_group_form = RepoGroupForm(available_groups=available_groups,
-                                        can_create_in_root=can_create)()
+        repo_group_form = RepoGroupForm(
+            self.request.translate, available_groups=available_groups,
+            can_create_in_root=can_create)()
 
         repo_group_name = self.request.POST.get('group_name')
         try:

rhodecode/apps/admin/views/repositories.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -28,6 +28,7 b' from pyramid.renderers import render'
 from pyramid.response import Response
 
 from rhodecode.apps._base import BaseAppView, DataGridAppView
+from rhodecode.lib.celerylib.utils import get_task_id
 
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.auth import (
@@ -49,7 +50,7 b' class AdminReposView(BaseAppView, DataGr'
 
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
+
         return c
 
     def _load_form_data(self, c):
@@ -58,7 +59,7 b' class AdminReposView(BaseAppView, DataGr'
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: safe_unicode(k[0]), c.repo_groups)
         c.landing_revs_choices, c.landing_revs = \
-            ScmModel().get_repo_landing_revs()
+            ScmModel().get_repo_landing_revs(self.request.translate)
         c.personal_repo_group = self._rhodecode_user.personal_repo_group
 
     @LoginRequired()
@@ -143,21 +144,19 b' class AdminReposView(BaseAppView, DataGr'
         c = self.load_default_context()
 
         form_result = {}
+        self._load_form_data(c)
         task_id = None
-        self._load_form_data(c)
-
         try:
             # CanWriteToGroup validators checks permissions of this POST
-            form_result = RepoForm(repo_groups=c.repo_groups_choices,
-                                   landing_revs=c.landing_revs_choices)()\
-                            .to_python(dict(self.request.POST))
+            form = RepoForm(
+                self.request.translate, repo_groups=c.repo_groups_choices,
+                landing_revs=c.landing_revs_choices)()
+            form_result = form.to_python(dict(self.request.POST))
 
             # create is done sometimes async on celery, db transaction
             # management is handled there.
             task = RepoModel().create(form_result, self._rhodecode_user.user_id)
-            from celery.result import BaseAsyncResult
-            if isinstance(task, BaseAsyncResult):
-                task_id = task.task_id
+            task_id = get_task_id(task)
         except formencode.Invalid as errors:
             data = render('rhodecode:templates/admin/repos/repo_add.mako',
                           self._get_template_context(c), self.request)

rhodecode/apps/admin/views/sessions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -30,6 +30,7 b' from rhodecode.lib.auth import ('
 from rhodecode.lib.utils2 import safe_int
 from rhodecode.lib import system_info
 from rhodecode.lib import user_sessions
+from rhodecode.lib import helpers as h
 
 
 log = logging.getLogger(__name__)
@@ -39,7 +40,7 b' class AdminSessionSettingsView(BaseAppVi'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()
@@ -88,14 +89,12 b' class AdminSessionSettingsView(BaseAppVi'
         try:
             session_model.clean_sessions(
                 older_than_seconds=older_than_seconds)
-            self.request.session.flash(
-                _('Cleaned up old sessions'), queue='success')
+            h.flash(_('Cleaned up old sessions'), category='success')
         except user_sessions.CleanupCommand as msg:
-            self.request.session.flash(msg.message, queue='warning')
+            h.flash(msg.message, category='warning')
         except Exception as e:
             log.exception('Failed session cleanup')
-            self.request.session.flash(
-                _('Failed to cleanup up old sessions'), queue='error')
+            h.flash(_('Failed to cleanup up old sessions'), category='error')
 
         redirect_to = self.request.resource_path(
             self.context, route_name='admin_settings_sessions')

rhodecode/apps/admin/views/svn_config.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/admin/views/system_info.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -20,7 +20,6 b''
 
 import logging
 import urllib2
-import packaging.version
 
 from pyramid.view import view_config
 
@@ -31,8 +30,7 b' from rhodecode.lib import helpers as h'
 from rhodecode.lib.auth import (LoginRequired, HasPermissionAllDecorator)
 from rhodecode.lib.utils2 import str2bool
 from rhodecode.lib import system_info
-from rhodecode.lib.ext_json import json
-from rhodecode.model.settings import SettingsModel
+from rhodecode.model.update import UpdateModel
 
 log = logging.getLogger(__name__)
 
@@ -40,26 +38,8 b' log = logging.getLogger(__name__)'
 class AdminSystemInfoSettingsView(BaseAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
         return c
 
-    @staticmethod
-    def get_update_data(update_url):
-        """Return the JSON update data."""
-        ver = rhodecode.__version__
-        log.debug('Checking for upgrade on `%s` server', update_url)
-        opener = urllib2.build_opener()
-        opener.addheaders = [('User-agent', 'RhodeCode-SCM/%s' % ver)]
-        response = opener.open(update_url)
-        response_data = response.read()
-        data = json.loads(response_data)
-
-        return data
-
-    def get_update_url(self):
-        settings = SettingsModel().get_all_settings()
-        return settings.get('rhodecode_update_url')
-
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @view_config(
@@ -77,7 +57,7 b' class AdminSystemInfoSettingsView(BaseAp'
 
         snapshot = str2bool(self.request.params.get('snapshot'))
 
-        c.rhodecode_update_url = self.get_update_url()
+        c.rhodecode_update_url = UpdateModel().get_update_url()
         server_info = system_info.get_system_info(self.request.environ)
 
         for key, val in server_info.items():
@@ -97,6 +77,14 b' class AdminSystemInfoSettingsView(BaseAp'
         update_info_msg = _('Note: please make sure this server can '
                             'access `${url}` for the update link to work',
                             mapping=dict(url=c.rhodecode_update_url))
+        version = UpdateModel().get_stored_version()
+        is_outdated = UpdateModel().is_outdated(
+            rhodecode.__version__, version)
+        update_state = {
+            'type': 'warning',
+            'message': 'New version available: {}'.format(version)
+            } \
+            if is_outdated else {}
         c.data_items = [
             # update info
             (_('Update info'), h.literal(
@@ -107,6 +95,7 b' class AdminSystemInfoSettingsView(BaseAp'
 
             # RhodeCode specific
             (_('RhodeCode Version'), val('rhodecode_app')['text'], state('rhodecode_app')),
+            (_('Latest version'), version, update_state),
             (_('RhodeCode Server IP'), val('server')['server_ip'], state('server')),
             (_('RhodeCode Server ID'), val('server')['server_id'], state('server')),
             (_('RhodeCode Configuration'), val('rhodecode_config')['path'], state('rhodecode_config')),
@@ -166,8 +155,7 b' class AdminSystemInfoSettingsView(BaseAp'
                 c.data_items.pop(0)  # remove server info
                 self.request.override_renderer = 'admin/settings/settings_system_snapshot.mako'
             else:
-                self.request.session.flash(
-                    'You are not allowed to do this', queue='warning')
+                h.flash('You are not allowed to do this', category='warning')
         return self._get_template_context(c)
 
     @LoginRequired()
@@ -179,11 +167,11 b' class AdminSystemInfoSettingsView(BaseAp'
         _ = self.request.translate
         c = self.load_default_context()
 
-        update_url = self.get_update_url()
+        update_url = UpdateModel().get_update_url()
 
         _err = lambda s: '<div style="color:#ff8888; padding:4px 0px">{}</div>'.format(s)
         try:
-            data = self.get_update_data(update_url)
+            data = UpdateModel().get_update_data(update_url)
         except urllib2.URLError as e:
             log.exception("Exception contacting upgrade server")
             self.request.override_renderer = 'string'
@@ -201,9 +189,9 b' class AdminSystemInfoSettingsView(BaseAp'
         c.cur_ver = rhodecode.__version__
         c.should_upgrade = False
 
-        if (packaging.version.Version(c.latest_ver) >
-                packaging.version.Version(c.cur_ver)):
+        is_oudated = UpdateModel().is_outdated(c.cur_ver, c.latest_ver)
+        if is_oudated:
             c.should_upgrade = True
         c.important_notices = latest['general']
-
+        UpdateModel().store_version(latest['version'])
         return self._get_template_context(c)

rhodecode/apps/admin/views/user_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -53,7 +53,6 b' class AdminUserGroupsView(BaseAppView, D'
         PermissionModel().set_global_permission_choices(
             c, gettext_translator=self.request.translate)
 
-        self._register_global_c(c)
         return c
 
     # permission check in data loading of
@@ -74,6 +73,7 b' class AdminUserGroupsView(BaseAppView, D'
         route_name='user_groups_data', request_method='GET',
         renderer='json_ext', xhr=True)
     def user_groups_list_data(self):
+        self.load_default_context()
         column_map = {
             'active': 'users_group_active',
             'description': 'user_group_description',
@@ -86,7 +86,7 b' class AdminUserGroupsView(BaseAppView, D'
             self.request, column_map=column_map)
 
         _render = self.request.get_partial_renderer(
-            'data_table/_dt_elements.mako')
+            'rhodecode:templates/data_table/_dt_elements.mako')
 
         def user_group_name(user_group_id, user_group_name):
             return _render("user_group_name", user_group_id, user_group_name)
@@ -195,7 +195,7 b' class AdminUserGroupsView(BaseAppView, D'
     def user_groups_create(self):
         _ = self.request.translate
         c = self.load_default_context()
-        users_group_form = UserGroupForm()()
+        users_group_form = UserGroupForm(self.request.translate)()
 
         user_group_name = self.request.POST.get('users_group_name')
         try:

rhodecode/apps/admin/views/users.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -44,7 +44,8 b' from rhodecode.lib import helpers as h'
 from rhodecode.lib.utils2 import safe_int, safe_unicode, AttributeDict
 from rhodecode.model.auth_token import AuthTokenModel
 from rhodecode.model.forms import (
-    UserForm, UserIndividualPermissionsForm, UserPermissionsForm)
+    UserForm, UserIndividualPermissionsForm, UserPermissionsForm,
+    UserExtraEmailForm, UserExtraIpForm)
 from rhodecode.model.permission import PermissionModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.ssh_key import SshKeyModel
@@ -62,7 +63,6 b' class AdminUsersView(BaseAppView, DataGr'
 
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
         return c
 
     @LoginRequired()
@@ -81,6 +81,7 b' class AdminUsersView(BaseAppView, DataGr'
         route_name='users_data', request_method='GET',
         renderer='json_ext', xhr=True)
     def users_list_data(self):
+        self.load_default_context()
         column_map = {
             'first_name': 'name',
             'last_name': 'lastname',
@@ -90,7 +91,7 b' class AdminUsersView(BaseAppView, DataGr'
             self.request, column_map=column_map)
 
         _render = self.request.get_partial_renderer(
-            'data_table/_dt_elements.mako')
+            'rhodecode:templates/data_table/_dt_elements.mako')
 
         def user_actions(user_id, username):
             return _render("user_actions", user_id, username)
@@ -190,7 +191,7 b' class AdminUsersView(BaseAppView, DataGr'
         c = self.load_default_context()
         c.default_extern_type = auth_rhodecode.RhodeCodeAuthPlugin.name
         user_model = UserModel()
-        user_form = UserForm()()
+        user_form = UserForm(self.request.translate)()
         try:
             form_result = user_form.to_python(dict(self.request.POST))
             user = user_model.create(form_result)
@@ -258,7 +259,6 b' class UsersView(UserAppView):'
         PermissionModel().set_global_permission_choices(
             c, gettext_translator=req.translate)
 
-        self._register_global_c(c)
         return c
 
     @LoginRequired()
@@ -279,7 +279,8 b' class UsersView(UserAppView):'
         c.extern_name = c.user.extern_name
         c.perm_user = c.user.AuthUser(ip_addr=self.request.remote_addr)
         available_languages = [x[0] for x in c.allowed_languages]
-        _form = UserForm(edit=True, available_languages=available_languages,
+        _form = UserForm(self.request.translate, edit=True,
+                         available_languages=available_languages,
                          old_data={'user_id': user_id,
                                    'email': c.user.email})()
         form_result = {}
@@ -537,7 +538,7 b' class UsersView(UserAppView):'
         c.active = 'global_perms'
         try:
             # first stage that verifies the checkbox
-            _form = UserIndividualPermissionsForm()
+            _form = UserIndividualPermissionsForm(self.request.translate)
             form_result = _form.to_python(dict(self.request.POST))
             inherit_perms = form_result['inherit_default_permissions']
             c.user.inherit_default_permissions = inherit_perms
@@ -546,6 +547,7 b' class UsersView(UserAppView):'
             if not inherit_perms:
                 # only update the individual ones if we un check the flag
                 _form = UserPermissionsForm(
+                    self.request.translate,
                     [x[0] for x in c.repo_create_choices],
                     [x[0] for x in c.repo_create_on_write_choices],
                     [x[0] for x in c.repo_group_create_choices],
@@ -913,6 +915,11 b' class UsersView(UserAppView):'
         email = self.request.POST.get('new_email')
         user_data = c.user.get_api_data()
         try:
+
+            form = UserExtraEmailForm(self.request.translate)()
+            data = form.to_python({'email': email})
+            email = data['email']
+
             UserModel().add_extra_email(c.user.user_id, email)
             audit_logger.store_web(
                 'user.edit.email.add',
@@ -1008,6 +1015,10 b' class UsersView(UserAppView):'
         user_data = c.user.get_api_data()
         for ip in ip_list:
             try:
+                form = UserExtraIpForm(self.request.translate)()
+                data = form.to_python({'ip': ip})
+                ip = data['ip']
+
                 user_model.add_extra_ip(c.user.user_id, ip, desc)
                 audit_logger.store_web(
                     'user.edit.ip.add',

rhodecode/apps/channelstream/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -20,9 +20,10 b''
 
 import os
 
+from pyramid.events import ApplicationCreated
 from pyramid.settings import asbool
 
-from rhodecode.config.routing import ADMIN_PREFIX
+from rhodecode.apps._base import ADMIN_PREFIX
 from rhodecode.lib.ext_json import json
 
 
@@ -57,6 +58,14 b' PLUGIN_DEFINITION = {'
 }
 
 
+def maybe_create_history_store(event):
+    # create plugin history location
+    settings = event.app.registry.settings
+    history_dir = settings.get('channelstream.history.location', '')
+    if history_dir and not os.path.exists(history_dir):
+        os.makedirs(history_dir, 0750)
+
+
 def includeme(config):
     settings = config.registry.settings
     PLUGIN_DEFINITION['config']['enabled'] = asbool(
@@ -71,10 +80,7 b' def includeme(config):'
         PLUGIN_DEFINITION['name'],
         PLUGIN_DEFINITION['config']
     )
-    # create plugin history location
-    history_dir = PLUGIN_DEFINITION['config']['history.location']
-    if history_dir and not os.path.exists(history_dir):
-        os.makedirs(history_dir, 0750)
+    config.add_subscriber(maybe_create_history_store, ApplicationCreated)
 
     config.add_route(
         name='channelstream_connect',

rhodecode/apps/channelstream/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -24,6 +24,7 b' import uuid'
 from pyramid.view import view_config
 from pyramid.httpexceptions import HTTPBadRequest, HTTPForbidden, HTTPBadGateway
 
+from rhodecode.apps._base import BaseAppView
 from rhodecode.lib.channelstream import (
     channelstream_request,
     ChannelstreamConnectionException,
@@ -34,28 +35,28 b' from rhodecode.lib.channelstream import '
     parse_channels_info,
     update_history_from_logs,
     STATE_PUBLIC_KEYS)
+
 from rhodecode.lib.auth import NotAnonymous
 
 log = logging.getLogger(__name__)
 
 
-class ChannelstreamView(object):
-    def __init__(self, context, request):
-        self.context = context
-        self.request = request
+class ChannelstreamView(BaseAppView):
 
-        # Some of the decorators rely on this attribute to be present
-        # on the class of the decorated method.
-        self._rhodecode_user = request.user
-        registry = request.registry
-        self.channelstream_config = registry.rhodecode_plugins['channelstream']
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        self.channelstream_config = \
+            self.request.registry.rhodecode_plugins['channelstream']
         if not self.channelstream_config.get('enabled'):
             log.error('Channelstream plugin is disabled')
             raise HTTPBadRequest()
 
+        return c
+
     @NotAnonymous()
-    @view_config(route_name='channelstream_connect', renderer='json')
+    @view_config(route_name='channelstream_connect', renderer='json_ext')
     def connect(self):
+        self.load_default_context()
         """ handle authorization of users trying to connect """
         try:
             json_body = self.request.json_body
@@ -122,9 +123,10 b' class ChannelstreamView(object):'
         return connect_result
 
     @NotAnonymous()
-    @view_config(route_name='channelstream_subscribe', renderer='json')
+    @view_config(route_name='channelstream_subscribe', renderer='json_ext')
     def subscribe(self):
         """ can be used to subscribe specific connection to other channels """
+        self.load_default_context()
         try:
             json_body = self.request.json_body
         except Exception:

rhodecode/apps/debug_style/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/debug_style/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -31,7 +31,7 b' log = logging.getLogger(__name__)'
 class DebugStyleView(BaseAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
+
         return c
 
     @view_config(

rhodecode/apps/gist/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/gist/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/gist/tests/test_admin_gists.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/gist/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2013-2017 RhodeCode GmbH
+# Copyright (C) 2013-2018 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
@@ -67,7 +67,7 b' class GistView(BaseAppView):'
             (Gist.ACL_LEVEL_PUBLIC, _("Can be accessed by anonymous users"))
         ]
 
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()
@@ -114,7 +114,7 b' class GistView(BaseAppView):'
             c.active = 'public'
 
         _render = self.request.get_partial_renderer(
-            'data_table/_dt_elements.mako')
+            'rhodecode:templates/data_table/_dt_elements.mako')
 
         data = []
 

rhodecode/apps/home/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/home/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/home/tests/test_get_goto_switched_data.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -66,7 +66,7 b' class TestGotoSwitcherData(TestControlle'
     ]
 
     @pytest.fixture(autouse=True, scope='class')
-    def prepare(self, request, pylonsapp):
+    def prepare(self, request, baseapp):
         for repo_and_group in self.required_repos_with_groups:
             # create structure of groups and return the last group
 

rhodecode/apps/home/tests/test_get_repo_list_data.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/home/tests/test_get_user_data.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/home/tests/test_get_user_group_data.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -19,7 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/home/tests/test_home.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/home/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -46,7 +46,7 b' class HomeView(BaseAppView):'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
         c.user = c.auth_user.get_instance()
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()
@@ -54,6 +54,7 b' class HomeView(BaseAppView):'
         route_name='user_autocomplete_data', request_method='GET',
         renderer='json_ext', xhr=True)
     def user_autocomplete_data(self):
+        self.load_default_context()
         query = self.request.GET.get('query')
         active = str2bool(self.request.GET.get('active') or True)
         include_groups = str2bool(self.request.GET.get('user_groups'))
@@ -87,6 +88,7 b' class HomeView(BaseAppView):'
         route_name='user_group_autocomplete_data', request_method='GET',
         renderer='json_ext', xhr=True)
     def user_group_autocomplete_data(self):
+        self.load_default_context()
         query = self.request.GET.get('query')
         active = str2bool(self.request.GET.get('active') or True)
         expand_groups = str2bool(self.request.GET.get('user_groups_expand'))
@@ -202,6 +204,7 b' class HomeView(BaseAppView):'
         renderer='json_ext', xhr=True)
     def repo_list_data(self):
         _ = self.request.translate
+        self.load_default_context()
 
         query = self.request.GET.get('query')
         repo_type = self.request.GET.get('repo_type')

rhodecode/apps/journal/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/journal/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/journal/tests/test_journal.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/journal/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -47,7 +47,7 b' class JournalView(BaseAppView):'
 
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
-        self._register_global_c(c)
+
         self._load_defaults(c.rhodecode_name)
 
         # TODO(marcink): what is this, why we need a global register ?
@@ -146,7 +146,8 b' class JournalView(BaseAppView):'
                 user = AttributeDict({'short_contact': entry.username,
                                       'email': '',
                                       'full_contact': ''})
-            action, action_extra, ico = h.action_parser(entry, feed=True)
+            action, action_extra, ico = h.action_parser(
+                self.request, entry, feed=True)
             title = "%s - %s %s" % (user.short_contact, action(),
                                     entry.repository.repo_name)
             desc = action_extra()
@@ -191,7 +192,8 b' class JournalView(BaseAppView):'
                 user = AttributeDict({'short_contact': entry.username,
                                       'email': '',
                                       'full_contact': ''})
-            action, action_extra, ico = h.action_parser(entry, feed=True)
+            action, action_extra, ico = h.action_parser(
+                self.request, entry, feed=True)
             title = "%s - %s %s" % (user.short_contact, action(),
                                     entry.repository.repo_name)
             desc = action_extra()

rhodecode/apps/login/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -19,7 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
-from rhodecode.config.routing import ADMIN_PREFIX
+from rhodecode.apps._base import ADMIN_PREFIX
 
 
 def includeme(config):

rhodecode/apps/login/tests/test_login.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -30,7 +30,6 b' from rhodecode.tests.fixture import Fixt'
 from rhodecode.lib.auth import check_password
 from rhodecode.lib import helpers as h
 from rhodecode.model.auth_token import AuthTokenModel
-from rhodecode.model import validators
 from rhodecode.model.db import User, Notification, UserApiKeys
 from rhodecode.model.meta import Session
 
@@ -89,32 +88,31 b' class TestLoginController(object):'
     def test_login_admin_ok(self):
         response = self.app.post(route_path('login'),
                                  {'username': 'test_admin',
-                                  'password': 'test12'})
-        assert response.status == '302 Found'
+                                  'password': 'test12'}, status=302)
+        response = response.follow()
         session = response.get_session_from_response()
         username = session['rhodecode_user'].get('username')
         assert username == 'test_admin'
-        response = response.follow()
         response.mustcontain('/%s' % HG_REPO)
 
     def test_login_regular_ok(self):
         response = self.app.post(route_path('login'),
                                  {'username': 'test_regular',
-                                  'password': 'test12'})
+                                  'password': 'test12'}, status=302)
 
-        assert response.status == '302 Found'
+        response = response.follow()
         session = response.get_session_from_response()
         username = session['rhodecode_user'].get('username')
         assert username == 'test_regular'
-        response = response.follow()
+
         response.mustcontain('/%s' % HG_REPO)
 
     def test_login_ok_came_from(self):
         test_came_from = '/_admin/users?branch=stable'
         _url = '{}?came_from={}'.format(route_path('login'), test_came_from)
         response = self.app.post(
-            _url, {'username': 'test_admin', 'password': 'test12'})
-        assert response.status == '302 Found'
+            _url, {'username': 'test_admin', 'password': 'test12'}, status=302)
+
         assert 'branch=stable' in response.location
         response = response.follow()
 
@@ -125,8 +123,8 b' class TestLoginController(object):'
         with fixture.anon_access(False):
             kwargs = {'branch': 'stable'}
             response = self.app.get(
-                h.route_path('repo_summary', repo_name=HG_REPO, _query=kwargs))
-            assert response.status == '302 Found'
+                h.route_path('repo_summary', repo_name=HG_REPO, _query=kwargs),
+                status=302)
 
             response_query = urlparse.parse_qsl(response.location)
             assert 'branch=stable' in response_query[0][1]
@@ -201,13 +199,12 b' class TestLoginController(object):'
         self.destroy_users.add(temp_user)
         response = self.app.post(route_path('login'),
                                  {'username': temp_user,
-                                  'password': 'test123'})
+                                  'password': 'test123'}, status=302)
 
-        assert response.status == '302 Found'
+        response = response.follow()
         session = response.get_session_from_response()
         username = session['rhodecode_user'].get('username')
         assert username == temp_user
-        response = response.follow()
         response.mustcontain('/%s' % HG_REPO)
 
         # new password should be bcrypted, after log-in and transfer
@@ -234,7 +231,7 b' class TestLoginController(object):'
         )
 
         assertr = response.assert_response()
-        msg = validators.ValidUsername()._messages['username_exists']
+        msg = 'Username "%(username)s" already exists'
         msg = msg % {'username': uname}
         assertr.element_contains('#username+.error-message', msg)
 
@@ -252,7 +249,7 b' class TestLoginController(object):'
         )
 
         assertr = response.assert_response()
-        msg = validators.UniqSystemEmail()()._messages['email_taken']
+        msg = u'This e-mail address is already taken'
         assertr.element_contains('#email+.error-message', msg)
 
     def test_register_err_same_email_case_sensitive(self):
@@ -268,7 +265,7 b' class TestLoginController(object):'
             }
         )
         assertr = response.assert_response()
-        msg = validators.UniqSystemEmail()()._messages['email_taken']
+        msg = u'This e-mail address is already taken'
         assertr.element_contains('#email+.error-message', msg)
 
     def test_register_err_wrong_data(self):
@@ -322,7 +319,7 b' class TestLoginController(object):'
         )
 
         assertr = response.assert_response()
-        msg = validators.ValidUsername()._messages['username_exists']
+        msg = u'Username "%(username)s" already exists'
         msg = msg % {'username': usr}
         assertr.element_contains('#username+.error-message', msg)
 
@@ -339,7 +336,7 b' class TestLoginController(object):'
             }
         )
 
-        msg = validators.ValidPassword()._messages['invalid_password']
+        msg = u'Invalid characters (non-ascii) in password'
         response.mustcontain(msg)
 
     def test_register_password_mismatch(self):
@@ -354,7 +351,7 b' class TestLoginController(object):'
                 'lastname': 'test'
             }
         )
-        msg = validators.ValidPasswordsMatch()._messages['password_mismatch']
+        msg = u'Passwords do not match'
         response.mustcontain(msg)
 
     def test_register_ok(self):
@@ -364,6 +361,11 b' class TestLoginController(object):'
         name = 'testname'
         lastname = 'testlastname'
 
+        # this initializes a session
+        response = self.app.get(route_path('register'))
+        response.mustcontain('Create an Account')
+
+
         response = self.app.post(
             route_path('register'),
             {
@@ -374,9 +376,10 b' class TestLoginController(object):'
                 'firstname': name,
                 'lastname': lastname,
                 'admin': True
-            }
-        )  # This should be overriden
-        assert response.status == '302 Found'
+            },
+            status=302
+        )  # This should be overridden
+
         assert_session_flash(
             response, 'You have successfully registered with RhodeCode')
 
@@ -392,6 +395,9 b' class TestLoginController(object):'
 
     def test_forgot_password_wrong_mail(self):
         bad_email = '[e-mail]'
+        # this initializes a session
+        self.app.get(route_path('reset_password'))
+
         response = self.app.post(
             route_path('reset_password'), {'email': bad_email, }
         )
@@ -399,8 +405,8 b' class TestLoginController(object):'
             'If such email exists, a password reset link was sent to it.')
 
     def test_forgot_password(self, user_util):
-        response = self.app.get(route_path('reset_password'))
-        assert response.status == '200 OK'
+        # this initializes a session
+        self.app.get(route_path('reset_password'))
 
         user = user_util.create_user()
         user_id = user.user_id
@@ -413,8 +419,7 b' class TestLoginController(object):'
 
         # BAD KEY
         confirm_url = '{}?key={}'.format(route_path('reset_password_confirmation'), 'badkey')
-        response = self.app.get(confirm_url)
-        assert response.status == '302 Found'
+        response = self.app.get(confirm_url, status=302)
         assert response.location.endswith(route_path('reset_password'))
         assert_session_flash(response, 'Given reset token is invalid')
 

rhodecode/apps/login/tests/test_password_reset.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/login/tests/test_register_captcha.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -22,10 +22,10 b''
 import mock
 import pytest
 
+from rhodecode.apps._base import ADMIN_PREFIX
 from rhodecode.apps.login.views import LoginView, CaptchaData
-from rhodecode.config.routing import ADMIN_PREFIX
+from rhodecode.model.settings import SettingsModel
 from rhodecode.lib.utils2 import AttributeDict
-from rhodecode.model.settings import SettingsModel
 from rhodecode.tests.utils import AssertResponse
 
 
@@ -58,7 +58,7 b' class TestRegisterCaptcha(object):'
         ('privkey', '',       CaptchaData(True,  'privkey', '')),
         ('privkey', 'pubkey', CaptchaData(True,  'privkey', 'pubkey')),
     ])
-    def test_get_captcha_data(self, private_key, public_key, expected, db,
+    def test_get_captcha_data(self, private_key, public_key, expected,
                               request_stub, user_util):
         request_stub.user = user_util.create_user().AuthUser()
         request_stub.matched_route = AttributeDict({'name': 'login'})

rhodecode/apps/login/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -32,7 +32,7 b' from recaptcha.client.captcha import sub'
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.authentication.base import authenticate, HTTP_TYPE
-from rhodecode.events import UserRegistered
+from rhodecode.events import UserRegistered, trigger
 from rhodecode.lib import helpers as h
 from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import (
@@ -113,7 +113,7 b' class LoginView(BaseAppView):'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
         c.came_from = get_came_from(self.request)
-        self._register_global_c(c)
+
         return c
 
     def _get_captcha_data(self):
@@ -147,7 +147,7 b' class LoginView(BaseAppView):'
                 raise HTTPFound(c.came_from, headers=headers)
         except UserCreationError as e:
             log.error(e)
-            self.session.flash(e, queue='error')
+            h.flash(e, category='error')
 
         return self._get_template_context(c)
 
@@ -157,7 +157,7 b' class LoginView(BaseAppView):'
     def login_post(self):
         c = self.load_default_context()
 
-        login_form = LoginForm()()
+        login_form = LoginForm(self.request.translate)()
 
         try:
             self.session.invalidate()
@@ -182,11 +182,10 b' class LoginView(BaseAppView):'
             defaults = errors.value
             # remove password from filling in form again
             defaults.pop('password', None)
-            render_ctx = self._get_template_context(c)
-            render_ctx.update({
+            render_ctx = {
                 'errors': errors.error_dict,
                 'defaults': defaults,
-            })
+            }
 
             audit_user = audit_logger.UserWrap(
                 username=self.request.POST.get('username'),
@@ -195,14 +194,14 b' class LoginView(BaseAppView):'
             audit_logger.store_web(
                 'user.login.failure', action_data=action_data,
                 user=audit_user, commit=True)
-            return render_ctx
+            return self._get_template_context(c, **render_ctx)
 
         except UserCreationError as e:
             # headers auth or other auth functions that create users on
             # the fly can throw this exception signaling that there's issue
             # with user creation, explanation should be provided in
             # Exception itself
-            self.session.flash(e, queue='error')
+            h.flash(e, category='error')
             return self._get_template_context(c)
 
     @CSRFRequired()
@@ -251,11 +250,12 b' class LoginView(BaseAppView):'
         route_name='register', request_method='POST',
         renderer='rhodecode:templates/register.mako')
     def register_post(self):
+        self.load_default_context()
         captcha = self._get_captcha_data()
         auto_active = 'hg.register.auto_activate' in User.get_default_user()\
             .AuthUser().permissions['global']
 
-        register_form = RegisterForm()()
+        register_form = RegisterForm(self.request.translate)()
         try:
 
             form_result = register_form.to_python(self.request.POST)
@@ -275,11 +275,18 b' class LoginView(BaseAppView):'
                                              error_dict=error_dict)
 
             new_user = UserModel().create_registration(form_result)
+
+            action_data = {'data': new_user.get_api_data(),
+                           'user_agent': self.request.user_agent}
+            audit_logger.store_web(
+                'user.register', action_data=action_data,
+                user=new_user)
+
             event = UserRegistered(user=new_user, session=self.session)
-            self.request.registry.notify(event)
-            self.session.flash(
+            trigger(event)
+            h.flash(
                 _('You have successfully registered with RhodeCode'),
-                queue='success')
+                category='success')
             Session().commit()
 
             redirect_ro = self.request.route_path('login')
@@ -296,16 +303,17 b' class LoginView(BaseAppView):'
             # the fly can throw this exception signaling that there's issue
             # with user creation, explanation should be provided in
             # Exception itself
-            self.session.flash(e, queue='error')
+            h.flash(e, category='error')
             return self.register()
 
     @view_config(
         route_name='reset_password', request_method=('GET', 'POST'),
         renderer='rhodecode:templates/password_reset.mako')
     def password_reset(self):
+        c = self.load_default_context()
         captcha = self._get_captcha_data()
 
-        render_ctx = {
+        template_context = {
             'captcha_active': captcha.active,
             'captcha_public_key': captcha.public_key,
             'defaults': {},
@@ -320,11 +328,11 b' class LoginView(BaseAppView):'
             if h.HasPermissionAny('hg.password_reset.disabled')():
                 _email = self.request.POST.get('email', '')
                 log.error('Failed attempt to reset password for `%s`.', _email)
-                self.session.flash(_('Password reset has been disabled.'),
-                                   queue='error')
+                h.flash(_('Password reset has been disabled.'),
+                                   category='error')
                 return HTTPFound(self.request.route_path('reset_password'))
 
-            password_reset_form = PasswordResetForm()()
+            password_reset_form = PasswordResetForm(self.request.translate)()
             try:
                 form_result = password_reset_form.to_python(
                     self.request.POST)
@@ -362,7 +370,7 b' class LoginView(BaseAppView):'
                 UserModel().reset_password_link(
                     form_result, password_reset_url)
                 # Display success message and redirect.
-                self.session.flash(msg, queue='success')
+                h.flash(msg, category='success')
 
                 action_data = {'email': user_email,
                                'user_agent': self.request.user_agent}
@@ -372,30 +380,30 b' class LoginView(BaseAppView):'
                 return HTTPFound(self.request.route_path('reset_password'))
 
             except formencode.Invalid as errors:
-                render_ctx.update({
+                template_context.update({
                     'defaults': errors.value,
                     'errors': errors.error_dict,
                 })
                 if not self.request.POST.get('email'):
                     # case of empty email, we want to report that
-                    return render_ctx
+                    return self._get_template_context(c, **template_context)
 
                 if 'recaptcha_field' in errors.error_dict:
                     # case of failed captcha
-                    return render_ctx
+                    return self._get_template_context(c, **template_context)
 
             log.debug('faking response on invalid password reset')
             # make this take 2s, to prevent brute forcing.
             time.sleep(2)
-            self.session.flash(msg, queue='success')
+            h.flash(msg, category='success')
             return HTTPFound(self.request.route_path('reset_password'))
 
-        return render_ctx
+        return self._get_template_context(c, **template_context)
 
     @view_config(route_name='reset_password_confirmation',
                  request_method='GET')
     def password_reset_confirmation(self):
-
+        self.load_default_context()
         if self.request.GET and self.request.GET.get('key'):
             # make this take 2s, to prevent brute forcing.
             time.sleep(2)
@@ -408,18 +416,18 b' class LoginView(BaseAppView):'
                 log.debug('Got token with role:%s expected is %s',
                           getattr(token, 'role', 'EMPTY_TOKEN'),
                           UserApiKeys.ROLE_PASSWORD_RESET)
-                self.session.flash(
-                    _('Given reset token is invalid'), queue='error')
+                h.flash(
+                    _('Given reset token is invalid'), category='error')
                 return HTTPFound(self.request.route_path('reset_password'))
 
             try:
                 owner = token.user
                 data = {'email': owner.email, 'token': token.api_key}
                 UserModel().reset_password(data)
-                self.session.flash(
+                h.flash(
                     _('Your password reset was successful, '
                       'a new password has been sent to your email'),
-                    queue='success')
+                    category='success')
             except Exception as e:
                 log.error(e)
                 return HTTPFound(self.request.route_path('reset_password'))

rhodecode/apps/my_account/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -70,6 +70,11 b' def includeme(config):'
         name='my_account_ssh_keys_delete',
         pattern=ADMIN_PREFIX + '/my_account/ssh_keys/delete')
 
+    # my account user group membership
+    config.add_route(
+        name='my_account_user_group_membership',
+        pattern=ADMIN_PREFIX + '/my_account/user_group_membership')
+
     # my account emails
     config.add_route(
         name='my_account_emails',

rhodecode/apps/my_account/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/my_account/tests/test_my_account_auth_tokens.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/my_account/tests/test_my_account_edit.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -19,7 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -198,8 +198,6 b' class TestMyAccountEdit(TestController):'
                                  params=params)
 
         response.mustcontain('An email address must contain a single @')
-        from rhodecode.model import validators
-        msg = validators.ValidUsername(
-            edit=False, old_data={})._messages['username_exists']
+        msg = u'Username "%(username)s" already exists'
         msg = h.html_escape(msg % {'username': 'test_admin'})
         response.mustcontain(u"%s" % msg)

rhodecode/apps/my_account/tests/test_my_account_emails.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/my_account/tests/test_my_account_notifications.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/my_account/tests/test_my_account_password.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/my_account/tests/test_my_account_profile.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/my_account/tests/test_my_account_simple_views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/my_account/tests/test_my_account_ssh_keys.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/my_account/views/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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

rhodecode/apps/my_account/views/my_account.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -42,12 +42,13 b' from rhodecode.model.comment import Comm'
 from rhodecode.model.db import (
     Repository, UserEmailMap, UserApiKeys, UserFollowing, joinedload,
     PullRequest)
-from rhodecode.model.forms import UserForm
+from rhodecode.model.forms import UserForm, UserExtraEmailForm
 from rhodecode.model.meta import Session
 from rhodecode.model.pull_request import PullRequestModel
 from rhodecode.model.scm import RepoList
 from rhodecode.model.user import UserModel
 from rhodecode.model.repo import RepoModel
+from rhodecode.model.user_group import UserGroupModel
 from rhodecode.model.validation_schema.schemas import user_schema
 
 log = logging.getLogger(__name__)
@@ -64,7 +65,7 b' class MyAccountView(BaseAppView, DataGri'
         c = self._get_local_tmpl_context()
         c.user = c.auth_user.get_instance()
         c.allow_scoped_tokens = self.ALLOW_SCOPED_TOKENS
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()
@@ -245,6 +246,10 b' class MyAccountView(BaseAppView, DataGri'
         email = self.request.POST.get('new_email')
 
         try:
+            form = UserExtraEmailForm(self.request.translate)()
+            data = form.to_python({'email': email})
+            email = data['email']
+
             UserModel().add_extra_email(c.user.user_id, email)
             audit_logger.store_web(
                 'user.edit.email.add', action_data={
@@ -442,7 +447,7 b' class MyAccountView(BaseAppView, DataGri'
         c.extern_type = c.user.extern_type
         c.extern_name = c.user.extern_name
 
-        _form = UserForm(edit=True,
+        _form = UserForm(self.request.translate, edit=True,
                          old_data={'user_id': self._rhodecode_user.user_id,
                                    'email': self._rhodecode_user.email})()
         form_result = {}
@@ -492,7 +497,7 b' class MyAccountView(BaseAppView, DataGri'
         draw, start, limit = self._extract_chunk(self.request)
         search_q, order_by, order_dir = self._extract_ordering(self.request)
         _render = self.request.get_partial_renderer(
-            'data_table/_dt_elements.mako')
+            'rhodecode:templates/data_table/_dt_elements.mako')
 
         pull_requests = PullRequestModel().get_im_participating_in(
             user_id=self._rhodecode_user.user_id,
@@ -568,6 +573,7 b' class MyAccountView(BaseAppView, DataGri'
         route_name='my_account_pullrequests_data',
         request_method='GET', renderer='json_ext')
     def my_account_pullrequests_data(self):
+        self.load_default_context()
         req_get = self.request.GET
         closed = str2bool(req_get.get('closed'))
 
@@ -578,3 +584,16 b' class MyAccountView(BaseAppView, DataGri'
         data = self._get_pull_requests_list(statuses=statuses)
         return data
 
+    @LoginRequired()
+    @NotAnonymous()
+    @view_config(
+        route_name='my_account_user_group_membership',
+        request_method='GET',
+        renderer='rhodecode:templates/admin/my_account/my_account.mako')
+    def my_account_user_group_membership(self):
+        c = self.load_default_context()
+        c.active = 'user_group_membership'
+        groups = [UserGroupModel.get_user_groups_as_dict(group.users_group)
+                  for group in self._rhodecode_db_user.group_member]
+        c.user_groups = json.dumps(groups)
+        return self._get_template_context(c)

rhodecode/apps/my_account/views/my_account_notifications.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -43,7 +43,7 b' class MyAccountNotificationsView(BaseApp'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
         c.user = c.auth_user.get_instance()
-        self._register_global_c(c)
+
         return c
 
     def _has_permissions(self, notification):

rhodecode/apps/my_account/views/my_account_ssh_keys.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -44,7 +44,7 b' class MyAccountSshKeysView(BaseAppView, '
 
         c.ssh_enabled = self.request.registry.settings.get(
             'ssh.generate_authorized_keyfile')
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()

rhodecode/apps/ops/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -18,7 +18,7 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-from rhodecode.config.routing import ADMIN_PREFIX
+from rhodecode.apps._base import ADMIN_PREFIX
 
 
 def admin_routes(config):
@@ -36,7 +36,7 b' def admin_routes(config):'
 def includeme(config):
 
     config.include(admin_routes, route_prefix=ADMIN_PREFIX + '/ops')
-    # make OLD entries from pylons work
+    # make OLD entries from <4.10.0 work
     config.add_route(
         name='ops_ping_legacy', pattern=ADMIN_PREFIX + '/ping')
     config.add_route(

rhodecode/apps/ops/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -35,7 +35,7 b' class OpsView(BaseAppView):'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
         c.user = c.auth_user.get_instance()
-        self._register_global_c(c)
+
         return c
 
     @view_config(

rhodecode/apps/repo_group/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/repo_group/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repo_group/tests/test_repo_groups_advanced.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repo_group/tests/test_repo_groups_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repo_group/views/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/repo_group/views/repo_group_advanced.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -37,7 +37,7 b' log = logging.getLogger(__name__)'
 class RepoGroupSettingsView(RepoGroupAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()

rhodecode/apps/repo_group/views/repo_group_permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -38,7 +38,7 b' log = logging.getLogger(__name__)'
 class RepoGroupPermissionsView(RepoGroupAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()
@@ -65,7 +65,7 b' class RepoGroupPermissionsView(RepoGroup'
         c.repo_group = self.db_repo_group
 
         valid_recursive_choices = ['none', 'repos', 'groups', 'all']
-        form = RepoGroupPermsForm(valid_recursive_choices)()\
+        form = RepoGroupPermsForm(self.request.translate, valid_recursive_choices)()\
             .to_python(self.request.POST)
 
         if not c.rhodecode_user.is_admin:

rhodecode/apps/repo_group/views/repo_group_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -73,7 +73,7 b' class RepoGroupSettingsView(RepoGroupApp'
             c.repo_groups_choices.append(parent_group.group_id)
             c.repo_groups.append(RepoGroup._generate_choice(parent_group))
 
-        self._register_global_c(c)
+
         return c
 
     def _can_create_repo_group(self, parent_group_id=None):

rhodecode/apps/repository/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/repository/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_pull_requests_list.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_bookmarks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_branches.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_changelog.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_commit_comments.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -47,7 +47,7 b' def route_path(name, params=None, **kwar'
 class TestRepoCommitCommentsView(TestController):
 
     @pytest.fixture(autouse=True)
-    def prepare(self, request, pylonsapp):
+    def prepare(self, request, baseapp):
         for x in ChangesetComment.query().all():
             Session().delete(x)
         Session().commit()

rhodecode/apps/repository/tests/test_repo_commits.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_compare.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_compare_local.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_compare_on_single_file.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_feed.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_files.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -48,6 +48,7 b' def route_path(name, params=None, **kwar'
     import urllib
 
     base_url = {
+        'repo_summary': '/{repo_name}',
         'repo_archivefile': '/{repo_name}/archive/{fname}',
         'repo_files_diff': '/{repo_name}/diff/{f_path}',
         'repo_files_diff_2way_redirect':  '/{repo_name}/diff-2way/{f_path}',
@@ -999,8 +1000,11 b' class TestFilesViewOtherCases(object):'
             .format(repo_file_add_url))
 
     def test_access_empty_repo_redirect_to_summary_with_alert_no_write_perms(
-            self, backend_stub, user_util):
+            self, backend_stub, autologin_regular_user):
         repo = backend_stub.create_repo()
+        # init session for anon user
+        route_path('repo_summary', repo_name=repo.repo_name)
+
         repo_file_add_url = route_path(
             'repo_files_add_file',
             repo_name=repo.repo_name,

rhodecode/apps/repository/tests/test_repo_forks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_issue_tracker.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -58,11 +58,11 b' class TestRepoIssueTracker(object):'
             'edit_repo_issuetracker_update', repo_name=backend.repo.repo_name)
         post_data = {
             'new_pattern_pattern_0': pattern,
-            'new_pattern_url_0': 'url',
+            'new_pattern_url_0': 'http://url',
             'new_pattern_prefix_0': 'prefix',
             'new_pattern_description_0': 'description',
             'new_pattern_pattern_1': another_pattern,
-            'new_pattern_url_1': 'url1',
+            'new_pattern_url_1': '/url1',
             'new_pattern_prefix_1': 'prefix1',
             'new_pattern_description_1': 'description1',
             'csrf_token': csrf_token
@@ -84,7 +84,7 b' class TestRepoIssueTracker(object):'
             extra_environ=xhr_header, params=data)
 
         assert response.body == \
-               'example of <a class="issue-tracker-link" href="url">prefix</a> replacement'
+               'example of <a class="issue-tracker-link" href="http://url">prefix</a> replacement'
 
         @request.addfinalizer
         def cleanup():
@@ -106,7 +106,7 b' class TestRepoIssueTracker(object):'
             'edit_repo_issuetracker_update', repo_name=backend.repo.repo_name)
         post_data = {
             'new_pattern_pattern_0': pattern,
-            'new_pattern_url_0': 'url',
+            'new_pattern_url_0': '/url',
             'new_pattern_prefix_0': 'prefix',
             'new_pattern_description_0': 'description',
             'uid': old_uid,

rhodecode/apps/repository/tests/test_repo_pullrequests.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -199,18 +199,17 b' class TestPullrequestsView(object):'
     def test_edit_title_description_closed(self, pr_util, csrf_token):
         pull_request = pr_util.create_pull_request()
         pull_request_id = pull_request.pull_request_id
+        repo_name = pull_request.target_repo.repo_name
         pr_util.close()
 
         response = self.app.post(
             route_path('pullrequest_update',
-                repo_name=pull_request.target_repo.repo_name,
-                pull_request_id=pull_request_id),
+                       repo_name=repo_name, pull_request_id=pull_request_id),
             params={
                 'edit_pull_request': 'true',
                 'title': 'New title',
                 'description': 'New description',
-                'csrf_token': csrf_token})
-
+                'csrf_token': csrf_token}, status=200)
         assert_session_flash(
             response, u'Cannot update closed pull requests.',
             category='error')
@@ -300,7 +299,7 b' class TestPullrequestsView(object):'
         pull_request = pr_util.create_pull_request()
         pull_request_id = pull_request.pull_request_id
         PullRequestModel().update_reviewers(
-            pull_request_id, [(1, ['reason'], False), (2, ['reason2'], False)],
+            pull_request_id, [(1, ['reason'], False, []), (2, ['reason2'], False, [])],
             pull_request.author)
         author = pull_request.user_id
         repo = pull_request.target_repo.repo_id
@@ -377,6 +376,8 b' class TestPullrequestsView(object):'
                         ('__start__', 'reasons:sequence'),
                             ('reason', 'Some reason'),
                         ('__end__', 'reasons:sequence'),
+                        ('__start__', 'rules:sequence'),
+                        ('__end__', 'rules:sequence'),
                         ('mandatory', 'False'),
                     ('__end__', 'reviewer:mapping'),
                 ('__end__', 'review_members:sequence'),
@@ -434,6 +435,8 b' class TestPullrequestsView(object):'
                         ('__start__', 'reasons:sequence'),
                             ('reason', 'Some reason'),
                         ('__end__', 'reasons:sequence'),
+                        ('__start__', 'rules:sequence'),
+                        ('__end__', 'rules:sequence'),
                         ('mandatory', 'False'),
                     ('__end__', 'reviewer:mapping'),
                 ('__end__', 'review_members:sequence'),
@@ -461,7 +464,7 b' class TestPullrequestsView(object):'
 
         # Change reviewers and check that a notification was made
         PullRequestModel().update_reviewers(
-            pull_request.pull_request_id, [(1, [], False)],
+            pull_request.pull_request_id, [(1, [], False, [])],
             pull_request.author)
         assert len(notifications.all()) == 2
 
@@ -498,6 +501,8 b' class TestPullrequestsView(object):'
                         ('__start__', 'reasons:sequence'),
                             ('reason', 'Some reason'),
                         ('__end__', 'reasons:sequence'),
+                        ('__start__', 'rules:sequence'),
+                        ('__end__', 'rules:sequence'),
                         ('mandatory', 'False'),
                     ('__end__', 'reviewer:mapping'),
                 ('__end__', 'review_members:sequence'),

rhodecode/apps/repository/tests/test_repo_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_settings_advanced.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_summary.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -56,6 +56,16 b' def route_path(name, params=None, **kwar'
     return base_url
 
 
+def assert_clone_url(response, server, repo, disabled=False):
+
+    response.mustcontain(
+        '<input type="text" class="input-monospace clone_url_input" '
+        '{disabled}readonly="readonly" '
+        'value="http://test_admin@{server}/{repo}"/>'.format(
+            server=server, repo=repo, disabled='disabled ' if disabled else ' ')
+    )
+
+
 @pytest.mark.usefixtures('app')
 class TestSummaryView(object):
     def test_index(self, autologin_user, backend, http_host_only_stub):
@@ -76,12 +86,8 b' class TestSummaryView(object):'
         )
 
         # clone url...
-        response.mustcontain(
-            'id="clone_url" readonly="readonly"'
-            ' value="http://test_admin@%s/%s"' % (http_host_only_stub, repo_name, ))
-        response.mustcontain(
-            'id="clone_url_id" readonly="readonly"'
-            ' value="http://test_admin@%s/_%s"' % (http_host_only_stub, repo_id, ))
+        assert_clone_url(response, http_host_only_stub, repo_name)
+        assert_clone_url(response, http_host_only_stub, '_{}'.format(repo_id))
 
     def test_index_svn_without_proxy(
             self, autologin_user, backend_svn, http_host_only_stub):
@@ -89,12 +95,9 b' class TestSummaryView(object):'
         repo_name = backend_svn.repo_name
         response = self.app.get(route_path('repo_summary', repo_name=repo_name))
         # clone url...
-        response.mustcontain(
-            'id="clone_url" disabled'
-            ' value="http://test_admin@%s/%s"' % (http_host_only_stub, repo_name, ))
-        response.mustcontain(
-            'id="clone_url_id" disabled'
-            ' value="http://test_admin@%s/_%s"' % (http_host_only_stub, repo_id, ))
+
+        assert_clone_url(response, http_host_only_stub, repo_name, disabled=True)
+        assert_clone_url(response, http_host_only_stub, '_{}'.format(repo_id), disabled=True)
 
     def test_index_with_trailing_slash(
             self, autologin_user, backend, http_host_only_stub):
@@ -108,12 +111,8 b' class TestSummaryView(object):'
                 status=200)
 
         # clone url...
-        response.mustcontain(
-            'id="clone_url" readonly="readonly"'
-            ' value="http://test_admin@%s/%s"' % (http_host_only_stub, repo_name, ))
-        response.mustcontain(
-            'id="clone_url_id" readonly="readonly"'
-            ' value="http://test_admin@%s/_%s"' % (http_host_only_stub, repo_id, ))
+        assert_clone_url(response, http_host_only_stub, repo_name)
+        assert_clone_url(response, http_host_only_stub, '_{}'.format(repo_id))
 
     def test_index_by_id(self, autologin_user, backend):
         repo_id = backend.repo.repo_id

rhodecode/apps/repository/tests/test_repo_tags.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_repo_vcs_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/tests/test_vcs_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/repository/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -22,7 +22,7 b' from rhodecode.lib import helpers as h'
 from rhodecode.lib.utils2 import safe_int
 
 
-def reviewer_as_json(user, reasons=None, mandatory=False):
+def reviewer_as_json(user, reasons=None, mandatory=False, rules=None, user_group=None):
     """
     Returns json struct of a reviewer for frontend
 
@@ -34,10 +34,13 b' def reviewer_as_json(user, reasons=None,'
     return {
         'user_id': user.user_id,
         'reasons': reasons or [],
+        'rules': rules or [],
         'mandatory': mandatory,
+        'user_group': user_group,
         'username': user.username,
         'first_name': user.first_name,
         'last_name': user.last_name,
+        'user_link': h.link_to_user(user),
         'gravatar_link': h.gravatar_url(user.email, 14),
     }
 
@@ -68,7 +71,7 b' def validate_default_reviewers(review_me'
     reviewer_by_id = {}
     for r in review_members:
         reviewer_user_id = safe_int(r['user_id'])
-        entry = (reviewer_user_id, r['reasons'], r['mandatory'])
+        entry = (reviewer_user_id, r['reasons'], r['mandatory'], r['rules'])
 
         reviewer_by_id[reviewer_user_id] = entry
         reviewers.append(entry)

rhodecode/apps/repository/views/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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

rhodecode/apps/repository/views/repo_audit_logs.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2017 RhodeCode GmbH
+# Copyright (C) 2017-2018 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
@@ -34,7 +34,7 b' class AuditLogsView(RepoAppView):'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()

rhodecode/apps/repository/views/repo_bookmarks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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

rhodecode/apps/repository/views/repo_branches.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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

rhodecode/apps/repository/views/repo_caches.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -37,7 +37,7 b' class RepoCachesView(RepoAppView):'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()

rhodecode/apps/repository/views/repo_changelog.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -159,7 +159,7 b' class RepoChangelogView(RepoAppView):'
         c = self._get_local_tmpl_context(include_app_defaults=True)
 
         c.rhodecode_repo = self.rhodecode_vcs_repo
-        self._register_global_c(c)
+
         return c
 
     def _get_preload_attrs(self):

rhodecode/apps/repository/views/repo_checks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -34,7 +34,7 b' log = logging.getLogger(__name__)'
 class RepoChecksView(BaseAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
+
         return c
 
     @NotAnonymous()
@@ -78,10 +78,15 b' class RepoChecksView(BaseAppView):'
 
         if task_id and task_id not in ['None']:
             import rhodecode
-            from celery.result import AsyncResult
+            from rhodecode.lib.celerylib.loader import celery_app, exceptions
             if rhodecode.CELERY_ENABLED:
-                task = AsyncResult(task_id)
-                if task.failed():
+                log.debug('celery: checking result for task:%s', task_id)
+                task = celery_app.AsyncResult(task_id)
+                try:
+                    task.get(timeout=10)
+                except exceptions.TimeoutError:
+                    task = None
+                if task and task.failed():
                     msg = self._log_creation_exception(task.result, repo_name)
                     h.flash(msg, category='error')
                     raise HTTPFound(h.route_path('home'), code=501)

rhodecode/apps/repository/views/repo_commits.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -150,7 +150,6 b' class RepoCommitsView(RepoAppView):'
         c = self._get_local_tmpl_context(include_app_defaults=True)
         c.rhodecode_repo = self.rhodecode_vcs_repo
 
-        self._register_global_c(c)
         return c
 
     def _commit(self, commit_id_range, method):

rhodecode/apps/repository/views/repo_compare.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2017 RhodeCode GmbH
+# Copyright (C) 2012-2018 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
@@ -47,7 +47,7 b' class RepoCompareView(RepoAppView):'
 
         c.rhodecode_repo = self.rhodecode_vcs_repo
 
-        self._register_global_c(c)
+
         return c
 
     def _get_commit_or_redirect(

rhodecode/apps/repository/views/repo_feed.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2017 RhodeCode GmbH
+# Copyright (C) 2017-2018 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
@@ -42,7 +42,7 b' class RepoFeedView(RepoAppView):'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         self._load_defaults()
         return c
 
@@ -81,21 +81,22 b' class RepoFeedView(RepoAppView):'
         _parsed = diff_processor.prepare(inline_diff=False)
         limited_diff = isinstance(_parsed, LimitedDiffContainer)
 
-        return _parsed, limited_diff
+        return diff_processor, _parsed, limited_diff
 
     def _get_title(self, commit):
         return h.shorter(commit.message, 160)
 
     def _get_description(self, commit):
         _renderer = self.request.get_partial_renderer(
-            'feed/atom_feed_entry.mako')
-        parsed_diff, limited_diff = self._changes(commit)
+            'rhodecode:templates/feed/atom_feed_entry.mako')
+        diff_processor, parsed_diff, limited_diff = self._changes(commit)
         return _renderer(
             'body',
             commit=commit,
             parsed_diff=parsed_diff,
             limited_diff=limited_diff,
             feed_include_diff=self.feed_include_diff,
+            diff_processor=diff_processor,
         )
 
     def _set_timezone(self, date, tzinfo=pytz.utc):

rhodecode/apps/repository/views/repo_files.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -83,7 +83,7 b' class RepoFilesView(RepoAppView):'
 
         c.rhodecode_repo = self.rhodecode_vcs_repo
 
-        self._register_global_c(c)
+
         return c
 
     def _ensure_not_locked(self):

rhodecode/apps/repository/views/repo_forks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -33,6 +33,7 b' from rhodecode.lib.auth import ('
     LoginRequired, HasRepoPermissionAnyDecorator, NotAnonymous,
     HasRepoPermissionAny, HasPermissionAnyDecorator, CSRFRequired)
 import rhodecode.lib.helpers as h
+from rhodecode.lib.celerylib.utils import get_task_id
 from rhodecode.model.db import coalesce, or_, Repository, RepoGroup
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.forms import RepoForkForm
@@ -53,11 +54,11 b' class RepoForksView(RepoAppView, DataGri'
             perm_set=['group.write', 'group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: safe_unicode(k[0]), c.repo_groups)
-        choices, c.landing_revs = ScmModel().get_repo_landing_revs()
+        choices, c.landing_revs = ScmModel().get_repo_landing_revs(
+            self.request.translate)
         c.landing_revs_choices = choices
         c.personal_repo_group = c.rhodecode_user.personal_repo_group
 
-        self._register_global_c(c)
         return c
 
     @LoginRequired()
@@ -78,6 +79,7 b' class RepoForksView(RepoAppView, DataGri'
         renderer='json_ext', xhr=True)
     def repo_forks_data(self):
         _ = self.request.translate
+        self.load_default_context()
         column_map = {
             'fork_name': 'repo_name',
             'fork_date': 'created_on',
@@ -209,7 +211,7 b' class RepoForksView(RepoAppView, DataGri'
         _ = self.request.translate
         c = self.load_default_context()
 
-        _form = RepoForkForm(old_data={'repo_type': self.db_repo.repo_type},
+        _form = RepoForkForm(self.request.translate, old_data={'repo_type': self.db_repo.repo_type},
                              repo_groups=c.repo_groups_choices,
                              landing_revs=c.landing_revs_choices)()
         post_data = dict(self.request.POST)
@@ -225,9 +227,8 b' class RepoForksView(RepoAppView, DataGri'
             # management is handled there.
             task = RepoModel().create_fork(
                 form_result, c.rhodecode_user.user_id)
-            from celery.result import BaseAsyncResult
-            if isinstance(task, BaseAsyncResult):
-                task_id = task.task_id
+
+            task_id = get_task_id(task)
         except formencode.Invalid as errors:
             c.rhodecode_db_repo = self.db_repo
 

rhodecode/apps/repository/views/repo_maintainance.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -33,7 +33,7 b' class RepoMaintenanceView(RepoAppView):'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()

rhodecode/apps/repository/views/repo_permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -40,7 +40,7 b' class RepoSettingsPermissionsView(RepoAp'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()
@@ -68,7 +68,7 b' class RepoSettingsPermissionsView(RepoAp'
         # default user permissions, prevents submission of FAKE post data
         # into the form for private repos
         data['repo_private'] = self.db_repo.private
-        form = RepoPermsForm()().to_python(data)
+        form = RepoPermsForm(self.request.translate)().to_python(data)
         changes = RepoModel().update_permissions(
             self.db_repo_name, form['perm_additions'], form['perm_updates'],
             form['perm_deletions'])

rhodecode/apps/repository/views/repo_pull_requests.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -60,7 +60,7 b' class RepoPullRequestsView(RepoAppView, '
         c = self._get_local_tmpl_context(include_app_defaults=True)
         c.REVIEW_STATUS_APPROVED = ChangesetStatus.STATUS_APPROVED
         c.REVIEW_STATUS_REJECTED = ChangesetStatus.STATUS_REJECTED
-        self._register_global_c(c)
+
         return c
 
     def _get_pull_requests_list(
@@ -69,7 +69,7 b' class RepoPullRequestsView(RepoAppView, '
         draw, start, limit = self._extract_chunk(self.request)
         search_q, order_by, order_dir = self._extract_ordering(self.request)
         _render = self.request.get_partial_renderer(
-            'data_table/_dt_elements.mako')
+            'rhodecode:templates/data_table/_dt_elements.mako')
 
         # pagination
 
@@ -173,6 +173,7 b' class RepoPullRequestsView(RepoAppView, '
         route_name='pullrequest_show_all_data', request_method='GET',
         renderer='json_ext', xhr=True)
     def pull_request_list_data(self):
+        self.load_default_context()
 
         # additional filters
         req_get = self.request.GET
@@ -200,29 +201,6 b' class RepoPullRequestsView(RepoAppView, '
 
         return data
 
-    def _get_pr_version(self, pull_request_id, version=None):
-        at_version = None
-
-        if version and version == 'latest':
-            pull_request_ver = PullRequest.get(pull_request_id)
-            pull_request_obj = pull_request_ver
-            _org_pull_request_obj = pull_request_obj
-            at_version = 'latest'
-        elif version:
-            pull_request_ver = PullRequestVersion.get_or_404(version)
-            pull_request_obj = pull_request_ver
-            _org_pull_request_obj = pull_request_ver.pull_request
-            at_version = pull_request_ver.pull_request_version_id
-        else:
-            _org_pull_request_obj = pull_request_obj = PullRequest.get_or_404(
-                pull_request_id)
-
-        pull_request_display_obj = PullRequest.get_pr_display_object(
-            pull_request_obj, _org_pull_request_obj)
-
-        return _org_pull_request_obj, pull_request_obj, \
-               pull_request_display_obj, at_version
-
     def _get_diffset(self, source_repo_name, source_repo,
                      source_ref_id, target_ref_id,
                      target_commit, source_commit, diff_limit, fulldiff,
@@ -277,7 +255,7 b' class RepoPullRequestsView(RepoAppView, '
         (pull_request_latest,
          pull_request_at_ver,
          pull_request_display_obj,
-         at_version) = self._get_pr_version(
+         at_version) = PullRequestModel().get_pr_version(
             pull_request_id, version=version)
         pr_closed = pull_request_latest.is_closed()
 
@@ -299,7 +277,7 b' class RepoPullRequestsView(RepoAppView, '
         (prev_pull_request_latest,
          prev_pull_request_at_ver,
          prev_pull_request_display_obj,
-         prev_at_version) = self._get_pr_version(
+         prev_at_version) = PullRequestModel().get_pr_version(
             pull_request_id, version=from_version)
 
         c.from_version = prev_at_version
@@ -630,7 +608,8 b' class RepoPullRequestsView(RepoAppView, '
         try:
             source_repo_data = PullRequestModel().generate_repo_data(
                 source_repo, commit_id=commit_id,
-                branch=branch_ref, bookmark=bookmark_ref, translator=self.request.translate)
+                branch=branch_ref, bookmark=bookmark_ref,
+                translator=self.request.translate)
         except CommitDoesNotExistError as e:
             log.exception(e)
             h.flash(_('Commit does not exist'), 'error')
@@ -649,8 +628,9 b' class RepoPullRequestsView(RepoAppView, '
             default_target_repo, translator=self.request.translate)
 
         selected_source_ref = source_repo_data['refs']['selected_ref']
-
-        title_source_ref = selected_source_ref.split(':', 2)[1]
+        title_source_ref = ''
+        if selected_source_ref:
+            title_source_ref = selected_source_ref.split(':', 2)[1]
         c.default_title = PullRequestModel().generate_pullrequest_title(
             source=source_repo.repo_name,
             source_ref=title_source_ref,
@@ -675,6 +655,7 b' class RepoPullRequestsView(RepoAppView, '
         route_name='pullrequest_repo_refs', request_method='GET',
         renderer='json_ext', xhr=True)
     def pull_request_repo_refs(self):
+        self.load_default_context()
         target_repo_name = self.request.matchdict['target_repo_name']
         repo = Repository.get_by_repo_name(target_repo_name)
         if not repo:
@@ -752,16 +733,19 b' class RepoPullRequestsView(RepoAppView, '
     def pull_request_create(self):
         _ = self.request.translate
         self.assure_not_empty_repo()
+        self.load_default_context()
 
         controls = peppercorn.parse(self.request.POST.items())
 
         try:
-            _form = PullRequestForm(self.db_repo.repo_id)().to_python(controls)
+            form = PullRequestForm(
+                self.request.translate, self.db_repo.repo_id)()
+            _form = form.to_python(controls)
         except formencode.Invalid as errors:
             if errors.error_dict.get('revisions'):
                 msg = 'Revisions: %s' % errors.error_dict['revisions']
             elif errors.error_dict.get('pullrequest_title'):
-                msg = _('Pull request requires a title with min. 3 chars')
+                msg = errors.error_dict.get('pullrequest_title')
             else:
                 msg = _('Error creating pull request: {}').format(errors)
             log.exception(msg)
@@ -882,6 +866,15 b' class RepoPullRequestsView(RepoAppView, '
     def pull_request_update(self):
         pull_request = PullRequest.get_or_404(
             self.request.matchdict['pull_request_id'])
+        _ = self.request.translate
+
+        self.load_default_context()
+
+        if pull_request.is_closed():
+            log.debug('update: forbidden because pull request is closed')
+            msg = _(u'Cannot update closed pull requests.')
+            h.flash(msg, category='error')
+            return True
 
         # only owner or admin can update it
         allowed_to_update = PullRequestModel().check_user_update(
@@ -981,6 +974,7 b' class RepoPullRequestsView(RepoAppView, '
         pull_request = PullRequest.get_or_404(
             self.request.matchdict['pull_request_id'])
 
+        self.load_default_context()
         check = MergeCheck.validate(pull_request, self._rhodecode_db_user,
                                     translator=self.request.translate)
         merge_possible = not check.failed
@@ -1053,6 +1047,7 b' class RepoPullRequestsView(RepoAppView, '
 
         pull_request = PullRequest.get_or_404(
             self.request.matchdict['pull_request_id'])
+        self.load_default_context()
 
         pr_closed = pull_request.is_closed()
         allowed_to_delete = PullRequestModel().check_user_delete(
@@ -1166,6 +1161,10 b' class RepoPullRequestsView(RepoAppView, '
                     )
 
                 Session().flush()
+                # this is somehow required to get access to some relationship
+                # loaded on comment
+                Session().refresh(comment)
+
                 events.trigger(
                     events.PullRequestCommentEvent(pull_request, comment))
 

rhodecode/apps/repository/views/repo_review_rules.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -32,8 +32,6 b' log = logging.getLogger(__name__)'
 class RepoReviewRulesView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-
-        self._register_global_c(c)
         return c
 
     @LoginRequired()
@@ -54,6 +52,7 b' class RepoReviewRulesView(RepoAppView):'
         route_name='repo_default_reviewers_data', request_method='GET',
         renderer='json_ext')
     def repo_default_reviewers_data(self):
+        self.load_default_context()
         review_data = get_default_reviewers_data(
             self.db_repo.user, None, None, None, None)
         return review_data

rhodecode/apps/repository/views/repo_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -62,16 +62,17 b' class RepoSettingsView(RepoAppView):'
             # we might be in missing requirement state, so we load things
             # without touching scm_instance()
             c.landing_revs_choices, c.landing_revs = \
-                ScmModel().get_repo_landing_revs()
+                ScmModel().get_repo_landing_revs(self.request.translate)
         else:
             c.landing_revs_choices, c.landing_revs = \
-                ScmModel().get_repo_landing_revs(self.db_repo)
+                ScmModel().get_repo_landing_revs(
+                    self.request.translate, self.db_repo)
 
         c.personal_repo_group = c.auth_user.personal_repo_group
         c.repo_fields = RepositoryField.query()\
             .filter(RepositoryField.repository == self.db_repo).all()
 
-        self._register_global_c(c)
+
         return c
 
     def _get_schema(self, c, old_values=None):

rhodecode/apps/repository/views/repo_settings_advanced.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -44,7 +44,7 b' class RepoSettingsView(RepoAppView):'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()

rhodecode/apps/repository/views/repo_settings_fields.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2017 RhodeCode GmbH
+# Copyright (C) 2017-2018 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
@@ -43,7 +43,7 b' class RepoSettingsFieldsView(RepoAppView'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()
@@ -70,7 +70,8 b' class RepoSettingsFieldsView(RepoAppView'
         _ = self.request.translate
 
         try:
-            form_result = RepoFieldForm()().to_python(dict(self.request.POST))
+            form = RepoFieldForm(self.request.translate)()
+            form_result = form.to_python(dict(self.request.POST))
             RepoModel().add_repo_field(
                 self.db_repo_name,
                 form_result['new_field_key'],

rhodecode/apps/repository/views/repo_settings_issue_trackers.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2017 RhodeCode GmbH
+# Copyright (C) 2017-2018 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
@@ -22,6 +22,7 b' import logging'
 
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
+import formencode
 
 from rhodecode.apps._base import RepoAppView
 from rhodecode.lib import audit_logger
@@ -39,7 +40,7 b' class RepoSettingsIssueTrackersView(Repo'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()
@@ -116,7 +117,17 b' class RepoSettingsIssueTrackersView(Repo'
         repo_settings.inherit_global_settings = inherited
         Session().commit()
 
-        form = IssueTrackerPatternsForm()().to_python(self.request.POST)
+        try:
+            form = IssueTrackerPatternsForm(self.request.translate)().to_python(self.request.POST)
+        except formencode.Invalid as errors:
+            log.exception('Failed to add new pattern')
+            error = errors
+            h.flash(_('Invalid issue tracker pattern: {}'.format(error)),
+                    category='error')
+            raise HTTPFound(
+                h.route_path('edit_repo_issuetracker',
+                             repo_name=self.db_repo_name))
+
         if form:
             self._update_patterns(form, repo_settings)
 

rhodecode/apps/repository/views/repo_settings_remote.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2017 RhodeCode GmbH
+# Copyright (C) 2017-2018 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
@@ -36,7 +36,7 b' class RepoSettingsRemoteView(RepoAppView'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()

rhodecode/apps/repository/views/repo_settings_vcs.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2017 RhodeCode GmbH
+# Copyright (C) 2017-2018 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
@@ -43,7 +43,7 b' class RepoSettingsVcsView(RepoAppView):'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     def _vcs_form_defaults(self, repo_name):
@@ -117,7 +117,7 b' class RepoSettingsVcsView(RepoAppView):'
         defaults = self._vcs_form_defaults(self.db_repo_name)
         c.inherit_global_settings = defaults['inherit_global_settings']
 
-        application_form = RepoVcsSettingsForm(self.db_repo_name)()
+        application_form = RepoVcsSettingsForm(self.request.translate, self.db_repo_name)()
         try:
             form_result = application_form.to_python(dict(self.request.POST))
         except formencode.Invalid as errors:

rhodecode/apps/repository/views/repo_strip.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2017 RhodeCode GmbH
+# Copyright (C) 2017-2018 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
@@ -35,7 +35,7 b' class StripView(RepoAppView):'
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()

rhodecode/apps/repository/views/repo_summary.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -48,12 +48,9 b' class RepoSummaryView(RepoAppView):'
 
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
-
         c.rhodecode_repo = None
         if not c.repository_requirements_missing:
             c.rhodecode_repo = self.rhodecode_vcs_repo
-
-        self._register_global_c(c)
         return c
 
     def _get_readme_data(self, db_repo, default_renderer):
@@ -174,18 +171,22 b' class RepoSummaryView(RepoAppView):'
         if self._rhodecode_user.username != User.DEFAULT_USER:
             username = safe_str(self._rhodecode_user.username)
 
-        _def_clone_uri = _def_clone_uri_by_id = c.clone_uri_tmpl
+        _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_by_id = _def_clone_uri.replace(
+            _def_clone_uri_id = _def_clone_uri.replace(
                 '{repo}', '_{repoid}')
         elif '{repoid}' in _def_clone_uri:
-            _def_clone_uri_by_id = _def_clone_uri.replace(
+            _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_by_id)
+            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)
 
         # If enabled, get statistics data
 

rhodecode/apps/repository/views/repo_tags.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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

rhodecode/apps/search/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/search/tests/test_search.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -25,7 +25,7 b' import pytest'
 from whoosh import query
 
 from rhodecode.tests import (
-    TestController, SkipTest, HG_REPO,
+    TestController, HG_REPO,
     TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
 from rhodecode.tests.utils import AssertResponse
 
@@ -51,7 +51,7 b' class TestSearchController(TestControlle'
 
     def test_search_files_empty_search(self):
         if os.path.isdir(self.index_location):
-            raise SkipTest('skipped due to existing index')
+            pytest.skip('skipped due to existing index')
         else:
             self.log_user()
             response = self.app.get(route_path('search'),

rhodecode/apps/search/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2011-2018 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
@@ -103,7 +103,7 b' def search(request, tmpl_context, repo_n'
 class SearchView(BaseAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()
@@ -119,7 +119,7 b' class SearchView(BaseAppView):'
 class SearchRepoView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-        self._register_global_c(c)
+
         return c
 
     @LoginRequired()

rhodecode/apps/ssh_support/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/ssh_support/config_keys.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/ssh_support/events.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/ssh_support/lib/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

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

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -22,7 +22,7 b' import os'
 import re
 import logging
 import datetime
-import ConfigParser
+from pyramid.compat import configparser
 
 from rhodecode.model.db import Session, User, UserSshKeys
 from rhodecode.model.scm import ScmModel
@@ -51,7 +51,7 b' class SshWrapper(object):'
         self.server_impl = None
 
     def parse_config(self, config_path):
-        parser = ConfigParser.ConfigParser()
+        parser = configparser.ConfigParser()
         parser.read(config_path)
         return parser
 

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

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -93,6 +93,7 b' class VcsServer(object):'
         scm_data = {
             'ip': os.environ['SSH_CLIENT'].split()[0],
             'username': self.user.username,
+            'user_id': self.user.user_id,
             'action': action,
             'repository': self.repo_name,
             'scm': self.backend,

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

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

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

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

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

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/ssh_support/lib/ssh_wrapper.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/ssh_support/subscribers.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/ssh_support/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/ssh_support/tests/conftest.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -20,7 +20,7 b''
 
 import os
 import pytest
-import ConfigParser
+from pyramid.compat import configparser
 
 from rhodecode.apps.ssh_support.lib.ssh_wrapper import SshWrapper
 from rhodecode.lib.utils2 import AttributeDict
@@ -28,7 +28,7 b' from rhodecode.lib.utils2 import Attribu'
 
 @pytest.fixture
 def dummy_conf_file(tmpdir):
-    conf = ConfigParser.ConfigParser()
+    conf = configparser.ConfigParser()
     conf.add_section('app:main')
     conf.set('app:main', 'ssh.executable.hg', '/usr/bin/hg')
     conf.set('app:main', 'ssh.executable.git', '/usr/bin/git')

rhodecode/apps/ssh_support/tests/test_server_git.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -127,6 +127,7 b' class TestGitServer(object):'
 
         expected_data = {
             'username': git_server.user.username,
+            'user_id': git_server.user.user_id,
             'scm': 'git',
             'repository': git_server.repo_name,
             'make_lock': None,

rhodecode/apps/ssh_support/tests/test_server_hg.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/ssh_support/tests/test_server_svn.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/ssh_support/tests/test_ssh_authorized_keys_gen.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/ssh_support/tests/test_ssh_wrapper.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/ssh_support/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/svn_support/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/svn_support/config_keys.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/svn_support/events.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/svn_support/subscribers.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -23,19 +23,14 b' import os'
 import mock
 import pytest
 
-from pyramid import testing
-
 from rhodecode.apps.svn_support import utils
 
 
[e-mail]('config_stub')
 class TestModDavSvnConfig(object):
 
     @classmethod
     def setup_class(cls):
-        # Make mako renderer available in tests.
-        config = testing.setUp()
-        config.include('pyramid_mako')
-
         cls.location_root = u'/location/root/çµäö'
         cls.parent_path_root = u'/parent/path/çµäö'
         cls.realm = u'Dummy Realm (äöüçµ)'

rhodecode/apps/svn_support/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/user_group/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017  RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -20,7 +20,7 b''
 
 
 from rhodecode.apps.admin.navigation import NavigationRegistry
-from rhodecode.config.routing import ADMIN_PREFIX
+from rhodecode.apps._base import ADMIN_PREFIX
 from rhodecode.lib.utils2 import str2bool
 
 

rhodecode/apps/user_group/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/user_group/tests/test_user_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/user_group/views/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -40,8 +40,7 b' from rhodecode.lib.auth import ('
     LoginRequired, HasUserGroupPermissionAnyDecorator, CSRFRequired)
 from rhodecode.lib import helpers as h, audit_logger
 from rhodecode.lib.utils2 import str2bool
-from rhodecode.model.db import (
-    joinedload, User, UserGroupRepoToPerm, UserGroupRepoGroupToPerm)
+from rhodecode.model.db import User
 from rhodecode.model.meta import Session
 from rhodecode.model.user_group import UserGroupModel
 
@@ -56,35 +55,8 b' class UserGroupsView(UserGroupAppView):'
         PermissionModel().set_global_permission_choices(
             c, gettext_translator=self.request.translate)
 
-        self._register_global_c(c)
         return c
 
-    def _get_perms_summary(self, user_group_id):
-        permissions = {
-            'repositories': {},
-            'repositories_groups': {},
-        }
-        ugroup_repo_perms = UserGroupRepoToPerm.query()\
-            .options(joinedload(UserGroupRepoToPerm.permission))\
-            .options(joinedload(UserGroupRepoToPerm.repository))\
-            .filter(UserGroupRepoToPerm.users_group_id == user_group_id)\
-            .all()
-
-        for gr in ugroup_repo_perms:
-            permissions['repositories'][gr.repository.repo_name]  \
-                = gr.permission.permission_name
-
-        ugroup_group_perms = UserGroupRepoGroupToPerm.query()\
-            .options(joinedload(UserGroupRepoGroupToPerm.permission))\
-            .options(joinedload(UserGroupRepoGroupToPerm.group))\
-            .filter(UserGroupRepoGroupToPerm.users_group_id == user_group_id)\
-            .all()
-
-        for gr in ugroup_group_perms:
-            permissions['repositories_groups'][gr.group.group_name] \
-                = gr.permission.permission_name
-        return permissions
-
     @LoginRequired()
     @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     @view_config(
@@ -94,6 +66,7 b' class UserGroupsView(UserGroupAppView):'
         """
         Return members of given user group
         """
+        self.load_default_context()
         user_group = self.db_user_group
         group_members_obj = sorted((x.user for x in user_group.members),
                                    key=lambda u: u.username.lower())
@@ -126,7 +99,8 b' class UserGroupsView(UserGroupAppView):'
         c = self.load_default_context()
         c.user_group = self.db_user_group
         c.active = 'perms_summary'
-        c.permissions = self._get_perms_summary(c.user_group.users_group_id)
+        c.permissions = UserGroupModel().get_perms_summary(
+            c.user_group.users_group_id)
         return self._get_template_context(c)
 
     @LoginRequired()
@@ -137,7 +111,7 b' class UserGroupsView(UserGroupAppView):'
     def user_group_perms_summary_json(self):
         self.load_default_context()
         user_group = self.db_user_group
-        return self._get_perms_summary(user_group.users_group_id)
+        return UserGroupModel().get_perms_summary(user_group.users_group_id)
 
     def _revoke_perms_on_yourself(self, form_result):
         _updates = filter(lambda u: self._rhodecode_user.user_id == int(u[0]),
@@ -173,7 +147,8 b' class UserGroupsView(UserGroupAppView):'
         c.active = 'settings'
 
         users_group_form = UserGroupForm(
-            edit=True, old_data=c.user_group.get_dict(), allow_disabled=True)()
+            self.request.translate, edit=True,
+            old_data=c.user_group.get_dict(), allow_disabled=True)()
 
         old_values = c.user_group.get_api_data()
         user_group_name = self.request.POST.get('users_group_name')
@@ -346,7 +321,7 b' class UserGroupsView(UserGroupAppView):'
         user_group_id = user_group.users_group_id
         c = self.load_default_context()
         c.user_group = user_group
-        form = UserGroupPermsForm()().to_python(self.request.POST)
+        form = UserGroupPermsForm(self.request.translate)().to_python(self.request.POST)
 
         if not self._rhodecode_user.is_admin:
             if self._revoke_perms_on_yourself(form):
@@ -426,7 +401,7 b' class UserGroupsView(UserGroupAppView):'
 
         try:
             # first stage that verifies the checkbox
-            _form = UserIndividualPermissionsForm()
+            _form = UserIndividualPermissionsForm(self.request.translate)
             form_result = _form.to_python(dict(self.request.POST))
             inherit_perms = form_result['inherit_default_permissions']
             user_group.inherit_default_permissions = inherit_perms
@@ -435,6 +410,7 b' class UserGroupsView(UserGroupAppView):'
             if not inherit_perms:
                 # only update the individual ones if we un check the flag
                 _form = UserPermissionsForm(
+                    self.request.translate,
                     [x[0] for x in c.repo_create_choices],
                     [x[0] for x in c.repo_create_on_write_choices],
                     [x[0] for x in c.repo_group_create_choices],

rhodecode/apps/user_profile/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/user_profile/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/apps/user_profile/tests/test_users.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/apps/user_profile/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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

rhodecode/authentication/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2017 RhodeCode GmbH
+# Copyright (C) 2012-2018 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
@@ -27,7 +27,7 b' from pyramid.authentication import Sessi'
 from rhodecode.authentication.registry import AuthenticationPluginRegistry
 from rhodecode.authentication.routes import root_factory
 from rhodecode.authentication.routes import AuthnRootResource
-from rhodecode.config.routing import ADMIN_PREFIX
+from rhodecode.apps._base import ADMIN_PREFIX
 from rhodecode.model.settings import SettingsModel
 
 

rhodecode/authentication/base.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -77,7 +77,6 b' class hybrid_property(object):'
         self.fdel(instance)
 
 
-
 class LazyFormencode(object):
     def __init__(self, formencode_obj, *args, **kwargs):
         self.formencode_obj = formencode_obj
@@ -106,6 +105,8 b' class RhodeCodeAuthPluginBase(object):'
         "lastname": "last name",
         "email": "email address",
         "groups": '["list", "of", "groups"]',
+        "user_group_sync":
+            'True|False defines if returned user groups should be synced',
         "extern_name": "name in external source of record",
         "extern_type": "type of external source of record",
         "admin": 'True|False defines if user should be RhodeCode super admin',
@@ -114,6 +115,7 b' class RhodeCodeAuthPluginBase(object):'
         "active_from_extern":
             "True|False\None, active state from the external auth, "
             "None means use definition from RhodeCode extern_type active value"
+
     }
     # set on authenticate() method and via set_auth_type func.
     auth_type = None
@@ -252,29 +254,6 b' class RhodeCodeAuthPluginBase(object):'
                 del settings_copy[k]
         return settings_copy
 
-    @property
-    def validators(self):
-        """
-        Exposes RhodeCode validators modules
-        """
-        # this is a hack to overcome issues with pylons threadlocals and
-        # translator object _() not being registered properly.
-        class LazyCaller(object):
-            def __init__(self, name):
-                self.validator_name = name
-
-            def __call__(self, *args, **kwargs):
-                from rhodecode.model import validators as v
-                obj = getattr(v, self.validator_name)
-                # log.debug('Initializing lazy formencode object: %s', obj)
-                return LazyFormencode(obj, *args, **kwargs)
-
-        class ProxyGet(object):
-            def __getattribute__(self, name):
-                return LazyCaller(name)
-
-        return ProxyGet()
-
     @hybrid_property
     def name(self):
         """
@@ -435,8 +414,9 b' class RhodeCodeAuthPluginBase(object):'
             new_hash = auth.get('_hash_migrate')
             if new_hash:
                 self._migrate_hash_to_bcrypt(username, passwd, new_hash)
+            if 'user_group_sync' not in auth:
+                auth['user_group_sync'] = False
             return self._validate_auth_return(auth)
-
         return auth
 
     def _migrate_hash_to_bcrypt(self, username, password, new_hash):
@@ -561,16 +541,19 b' class RhodeCodeExternalAuthPlugin(RhodeC'
             # enforce user is just in given groups, all of them has to be ones
             # created from plugins. We store this info in _group_data JSON
             # field
-            try:
-                groups = auth['groups'] or []
-                log.debug(
-                    'Performing user_group sync based on set `%s` '
-                    'returned by this plugin', groups)
-                UserGroupModel().enforce_groups(user, groups, self.name)
-            except Exception:
-                # for any reason group syncing fails, we should
-                # proceed with login
-                log.error(traceback.format_exc())
+
+            if auth['user_group_sync']:
+                try:
+                    groups = auth['groups'] or []
+                    log.debug(
+                        'Performing user_group sync based on set `%s` '
+                        'returned by `%s` plugin', groups, self.name)
+                    UserGroupModel().enforce_groups(user, groups, self.name)
+                except Exception:
+                    # for any reason group syncing fails, we should
+                    # proceed with login
+                    log.error(traceback.format_exc())
+
             Session().commit()
         return auth
 
@@ -694,7 +677,7 b' def authenticate(username, password, env'
                 environ=environ or {})
 
         if plugin_cache_active:
-            log.debug('Trying to fetch cached auth by %s', _password_hash[:6])
+            log.debug('Trying to fetch cached auth by `...%s`', _password_hash[:6])
             plugin_user = cache_manager.get(
                 _password_hash, createfunc=auth_func)
         else:

rhodecode/authentication/interface.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2017 RhodeCode GmbH
+# Copyright (C) 2012-2018 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

rhodecode/authentication/plugins/auth_crowd.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2017 RhodeCode GmbH
+# Copyright (C) 2012-2018 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
@@ -267,6 +267,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
             'firstname': crowd_user["first-name"] or firstname,
             'lastname': crowd_user["last-name"] or lastname,
             'groups': crowd_user["groups"],
+            'user_group_sync': True,
             'email': crowd_user["email"] or email,
             'admin': admin,
             'active': active,

rhodecode/authentication/plugins/auth_headers.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2017 RhodeCode GmbH
+# Copyright (C) 2012-2018 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
@@ -212,6 +212,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
             'firstname': safe_unicode(firstname or username),
             'lastname': safe_unicode(lastname or ''),
             'groups': [],
+            'user_group_sync': False,
             'email': email or '',
             'admin': admin or False,
             'active': active,

rhodecode/authentication/plugins/auth_jasig_cas.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2017 RhodeCode GmbH
+# Copyright (C) 2012-2018 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
@@ -154,6 +154,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
             'firstname': safe_unicode(firstname or username),
             'lastname': safe_unicode(lastname or ''),
             'groups': [],
+            'user_group_sync': False,
             'email': email or '',
             'admin': admin or False,
             'active': active,

rhodecode/authentication/plugins/auth_ldap.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -460,6 +460,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
                 'lastname': safe_unicode(
                     get_ldap_attr('attr_lastname') or lastname),
                 'groups': groups,
+                'user_group_sync': False,
                 'email': get_ldap_attr('attr_email') or email,
                 'admin': admin,
                 'active': active,

rhodecode/authentication/plugins/auth_pam.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2017 RhodeCode GmbH
+# Copyright (C) 2012-2018 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
@@ -136,6 +136,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
             'lastname': lastname,
             'groups': [g.gr_name for g in grp.getgrall()
                        if username in g.gr_mem],
+            'user_group_sync': True,
             'email': email,
             'admin': admin,
             'active': active,

rhodecode/authentication/plugins/auth_rhodecode.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2017 RhodeCode GmbH
+# Copyright (C) 2012-2018 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
@@ -100,6 +100,7 b' class RhodeCodeAuthPlugin(RhodeCodeAuthP'
             "firstname": userobj.firstname,
             "lastname": userobj.lastname,
             "groups": [],
+            'user_group_sync': False,
             "email": userobj.email,
             "admin": userobj.admin,
             "active": userobj.active,

rhodecode/authentication/plugins/auth_token.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -111,6 +111,7 b' class RhodeCodeAuthPlugin(RhodeCodeAuthP'
             "firstname": userobj.firstname,
             "lastname": userobj.lastname,
             "groups": [],
+            'user_group_sync': False,
             "email": userobj.email,
             "admin": userobj.admin,
             "active": userobj.active,

rhodecode/authentication/registry.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2017 RhodeCode GmbH
+# Copyright (C) 2012-2018 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

rhodecode/authentication/routes.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2017 RhodeCode GmbH
+# Copyright (C) 2012-2018 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

rhodecode/authentication/schema.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2017 RhodeCode GmbH
+# Copyright (C) 2012-2018 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

rhodecode/authentication/tests/conftest.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -22,7 +22,7 b''
 import pytest
 
 
-class EnabledAuthPlugin():
+class EnabledAuthPlugin(object):
     """
     Context manager that updates the 'auth_plugins' setting in DB to enable
     a plugin. Previous setting is restored on exit. The rhodecode auth plugin

rhodecode/authentication/tests/functional/test_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -23,7 +23,7 b' import pytest'
 
 from rhodecode.authentication.tests.conftest import (
     EnabledAuthPlugin, DisabledAuthPlugin)
-from rhodecode.config.routing import ADMIN_PREFIX
+from rhodecode.apps._base import ADMIN_PREFIX
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')

rhodecode/authentication/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2017 RhodeCode GmbH
+# Copyright (C) 2012-2018 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
@@ -26,25 +26,25 b' from pyramid.httpexceptions import HTTPF'
 from pyramid.renderers import render
 from pyramid.response import Response
 
+from rhodecode.apps._base import BaseAppView
 from rhodecode.authentication.base import (
     get_auth_cache_manager, get_perms_cache_manager, get_authn_registry)
-from rhodecode.lib import auth
-from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
+from rhodecode.lib import helpers as h
+from rhodecode.lib.auth import (
+    LoginRequired, HasPermissionAllDecorator, CSRFRequired)
 from rhodecode.model.forms import AuthSettingsForm
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import SettingsModel
-from rhodecode.translation import _
 
 log = logging.getLogger(__name__)
 
 
-class AuthnPluginViewBase(object):
+class AuthnPluginViewBase(BaseAppView):
 
-    def __init__(self, context, request):
-        self.request = request
-        self.context = context
-        self.plugin = context.plugin
-        self._rhodecode_user = request.user
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        self.plugin = self.context.plugin
+        return c
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
@@ -52,6 +52,7 b' class AuthnPluginViewBase(object):'
         """
         View that displays the plugin settings as a form.
         """
+        c = self.load_default_context()
         defaults = defaults or {}
         errors = errors or {}
         schema = self.plugin.get_settings_schema()
@@ -70,15 +71,17 b' class AuthnPluginViewBase(object):'
             'resource': self.context,
         }
 
-        return template_context
+        return self._get_template_context(c, **template_context)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
-    @auth.CSRFRequired()
+    @CSRFRequired()
     def settings_post(self):
         """
         View that validates and stores the plugin settings.
         """
+        _ = self.request.translate
+        self.load_default_context()
         schema = self.plugin.get_settings_schema()
         data = self.request.params
 
@@ -86,10 +89,10 b' class AuthnPluginViewBase(object):'
             valid_data = schema.deserialize(data)
         except colander.Invalid as e:
             # Display error message and display form again.
-            self.request.session.flash(
+            h.flash(
                 _('Errors exist when saving plugin settings. '
                   'Please check the form inputs.'),
-                queue='error')
+                category='error')
             defaults = {key: data[key] for key in data if key in schema}
             return self.settings_get(errors=e.asdict(), defaults=defaults)
 
@@ -99,31 +102,22 b' class AuthnPluginViewBase(object):'
         Session().commit()
 
         # Display success message and redirect.
-        self.request.session.flash(
-            _('Auth settings updated successfully.'),
-            queue='success')
+        h.flash(_('Auth settings updated successfully.'), category='success')
         redirect_to = self.request.resource_path(
             self.context, route_name='auth_home')
         return HTTPFound(redirect_to)
 
 
-# TODO: Ongoing migration in these views.
-# - Maybe we should also use a colander schema for these views.
-class AuthSettingsView(object):
-    def __init__(self, context, request):
-        self.context = context
-        self.request = request
-
-        # TODO: Move this into a utility function. It is needed in all view
-        # classes during migration. Maybe a mixin?
-
-        # Some of the decorators rely on this attribute to be present on the
-        # class of the decorated method.
-        self._rhodecode_user = request.user
+class AuthSettingsView(BaseAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        return c
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def index(self, defaults=None, errors=None, prefix_error=False):
+        c = self.load_default_context()
+
         defaults = defaults or {}
         authn_registry = get_authn_registry(self.request.registry)
         enabled_plugins = SettingsModel().get_auth_plugins()
@@ -135,8 +129,8 b' class AuthSettingsView(object):'
             'enabled_plugins': enabled_plugins,
         }
         html = render('rhodecode:templates/admin/auth/auth_settings.mako',
-                      template_context,
-                      request=self.request)
+                      self._get_template_context(c, **template_context),
+                      self.request)
 
         # Create form default values and fill the form.
         form_defaults = {
@@ -155,11 +149,12 b' class AuthSettingsView(object):'
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
-    @auth.CSRFRequired()
+    @CSRFRequired()
     def auth_settings(self):
+        _ = self.request.translate
         try:
-            form = AuthSettingsForm()()
-            form_result = form.to_python(self.request.params)
+            form = AuthSettingsForm(self.request.translate)()
+            form_result = form.to_python(self.request.POST)
             plugins = ','.join(form_result['auth_plugins'])
             setting = SettingsModel().create_or_update_setting(
                 'auth_plugins', plugins)
@@ -172,24 +167,19 b' class AuthSettingsView(object):'
             cache_manager = get_perms_cache_manager()
             cache_manager.clear()
 
-            self.request.session.flash(
-                _('Auth settings updated successfully.'),
-                queue='success')
+            h.flash(_('Auth settings updated successfully.'), category='success')
         except formencode.Invalid as errors:
             e = errors.error_dict or {}
-            self.request.session.flash(
-                _('Errors exist when saving plugin setting. '
-                  'Please check the form inputs.'),
-                queue='error')
+            h.flash(_('Errors exist when saving plugin setting. '
+                      'Please check the form inputs.'), category='error')
             return self.index(
                 defaults=errors.value,
                 errors=e,
                 prefix_error=False)
         except Exception:
             log.exception('Exception in auth_settings')
-            self.request.session.flash(
-                _('Error occurred during update of auth settings.'),
-                queue='error')
+            h.flash(_('Error occurred during update of auth settings.'),
+                    category='error')
 
         redirect_to = self.request.resource_path(
             self.context, route_name='auth_home')

rhodecode/config/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/config/conf.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2013-2017 RhodeCode GmbH
+# Copyright (C) 2013-2018 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

rhodecode/config/environment.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -18,121 +18,19 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-"""
-Pylons environment configuration
-"""
 
 import os
 import logging
 import rhodecode
-import platform
-import re
-import io
-
-from mako.lookup import TemplateLookup
-from pylons.configuration import PylonsConfig
-from pylons.error import handle_mako_error
-from pyramid.settings import asbool
-
-# ------------------------------------------------------------------------------
-# CELERY magic until refactor - issue #4163 - import order matters here:
-from rhodecode.lib import celerypylons  # this must be first, celerypylons
-                                        # sets config settings upon import
-
-import rhodecode.integrations           # any modules using celery task
-                                        # decorators should be added afterwards:
-# ------------------------------------------------------------------------------
-
-from rhodecode.lib import app_globals
-from rhodecode.config import utils
-from rhodecode.config.routing import make_map
-from rhodecode.config.jsroutes import generate_jsroutes_content
-
-from rhodecode.lib import helpers
-from rhodecode.lib.auth import set_available_permissions
-from rhodecode.lib.utils import (
-    repo2db_mapper, make_db_config, set_rhodecode_config,
-    load_rcextensions)
-from rhodecode.lib.utils2 import str2bool, aslist
-from rhodecode.lib.vcs import connect_vcs, start_vcs_server
-from rhodecode.model.scm import ScmModel
-
-log = logging.getLogger(__name__)
-
-def load_environment(global_conf, app_conf, initial=False,
-                     test_env=None, test_index=None):
-    """
-    Configure the Pylons environment via the ``pylons.config``
-    object
-    """
-    config = PylonsConfig()
 
 
-    # Pylons paths
-    root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    paths = {
-        'root': root,
-        'controllers': os.path.join(root, 'controllers'),
-        'static_files': os.path.join(root, 'public'),
-        'templates': [os.path.join(root, 'templates')],
-    }
-
-    # Initialize config with the basic options
-    config.init_app(global_conf, app_conf, package='rhodecode', paths=paths)
-
-    # store some globals into rhodecode
-    rhodecode.CELERY_ENABLED = str2bool(config['app_conf'].get('use_celery'))
-    rhodecode.CELERY_EAGER = str2bool(
-        config['app_conf'].get('celery.always.eager'))
-
-    config['routes.map'] = make_map(config)
-
-    config['pylons.app_globals'] = app_globals.Globals(config)
-    config['pylons.h'] = helpers
-    rhodecode.CONFIG = config
-
-    load_rcextensions(root_path=config['here'])
-
-    # Setup cache object as early as possible
-    import pylons
-    pylons.cache._push_object(config['pylons.app_globals'].cache)
+from rhodecode.config import utils
 
-    # Create the Mako TemplateLookup, with the default auto-escaping
-    config['pylons.app_globals'].mako_lookup = TemplateLookup(
-        directories=paths['templates'],
-        error_handler=handle_mako_error,
-        module_directory=os.path.join(app_conf['cache_dir'], 'templates'),
-        input_encoding='utf-8', default_filters=['escape'],
-        imports=['from webhelpers.html import escape'])
-
-    # sets the c attribute access when don't existing attribute are accessed
-    config['pylons.strict_tmpl_context'] = True
-
-    # configure channelstream
-    config['channelstream_config'] = {
-        'enabled': asbool(config.get('channelstream.enabled', False)),
-        'server': config.get('channelstream.server'),
-        'secret': config.get('channelstream.secret')
-    }
+from rhodecode.lib.utils import load_rcextensions
+from rhodecode.lib.utils2 import str2bool
+from rhodecode.lib.vcs import connect_vcs
 
-    db_cfg = make_db_config(clear_session=True)
-
-    repos_path = list(db_cfg.items('paths'))[0][1]
-    config['base_path'] = repos_path
-
-    # store db config also in main global CONFIG
-    set_rhodecode_config(config)
-
-    # configure instance id
-    utils.set_instance_id(config)
-
-    # CONFIGURATION OPTIONS HERE (note: all config options will override
-    # any Pylons config options)
-
-    # store config reference into our module to skip import magic of pylons
-    rhodecode.CONFIG.update(config)
-
-    return config
+log = logging.getLogger(__name__)
 
 
 def load_pyramid_environment(global_config, settings):
@@ -140,10 +38,13 b' def load_pyramid_environment(global_conf'
     settings_merged = global_config.copy()
     settings_merged.update(settings)
 
-    # Store the settings to make them available to other modules.
-    rhodecode.PYRAMID_SETTINGS = settings_merged
-    # NOTE(marcink): needs to be enabled after full port to pyramid
-    # rhodecode.CONFIG = config
+    # TODO(marcink): probably not required anymore
+    # configure channelstream,
+    settings_merged['channelstream_config'] = {
+        'enabled': str2bool(settings_merged.get('channelstream.enabled', False)),
+        'server': settings_merged.get('channelstream.server'),
+        'secret': settings_merged.get('channelstream.secret')
+    }
 
     # If this is a test run we prepare the test environment like
     # creating a test database, test search index and test repositories.
@@ -157,6 +58,8 b' def load_pyramid_environment(global_conf'
     # Initialize the database connection.
     utils.initialize_database(settings_merged)
 
+    load_rcextensions(root_path=settings_merged['here'])
+
     # Limit backends to `vcs.backends` from configuration
     for alias in rhodecode.BACKENDS.keys():
         if alias not in settings['vcs.backends']:
@@ -166,17 +69,13 b' def load_pyramid_environment(global_conf'
     # initialize vcs client and optionally run the server if enabled
     vcs_server_uri = settings['vcs.server']
     vcs_server_enabled = settings['vcs.server.enable']
-    start_server = (
-        settings['vcs.start_server'] and
-        not int(os.environ.get('RC_VCSSERVER_TEST_DISABLE', '0')))
-
-    if vcs_server_enabled and start_server:
-        log.info("Starting vcsserver")
-        start_vcs_server(server_and_port=vcs_server_uri,
-                         protocol=utils.get_vcs_server_protocol(settings),
-                         log_level=settings['vcs.server.log_level'])
 
     utils.configure_vcs(settings)
 
+    # Store the settings to make them available to other modules.
+
+    rhodecode.PYRAMID_SETTINGS = settings_merged
+    rhodecode.CONFIG = settings_merged
+
     if vcs_server_enabled:
         connect_vcs(vcs_server_uri, utils.get_vcs_server_protocol(settings))

rhodecode/config/hook_templates/git_post_receive.py.tmpl

@@ -16,7 +16,7 b" RC_HOOK_VER = '_TMPL_'"
 
 def main():
     if hooks is None:
-        # exit with success if we cannot import rhodecode.lib.hooks !!
+        # exit with success if we cannot import vcsserver.hooks !!
         # this allows simply push to this repo even without rhodecode
         sys.exit(0)
 

rhodecode/config/hook_templates/git_pre_receive.py.tmpl

@@ -16,7 +16,7 b" RC_HOOK_VER = '_TMPL_'"
 
 def main():
     if hooks is None:
-        # exit with success if we cannot import rhodecode.lib.hooks !!
+        # exit with success if we cannot import vcsserver.hooks !!
         # this allows simply push to this repo even without rhodecode
         sys.exit(0)
 

rhodecode/config/jsroutes.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/config/licenses.json

@@ -43,10 +43,7 b''
   }, 
   "python2.7-Pygments-2.2.0": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
-  }, 
-  "python2.7-Pylons-1.0.2.rhodecode-patch1": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
-  }, 
+  },
   "python2.7-Routes-1.13": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
@@ -77,13 +74,7 b''
   }, 
   "python2.7-alembic-0.8.4": {
     "MIT License": "http://spdx.org/licenses/MIT"
-  }, 
-  "python2.7-amqplib-1.0.2": {
-    "GNU Lesser General Public License v3.0 only": "http://spdx.org/licenses/LGPL-3.0"
-  }, 
-  "python2.7-anyjson-0.3.3": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
-  }, 
+  },
   "python2.7-appenlight-client-0.6.14": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
@@ -195,7 +186,7 b''
   "python2.7-jupyter-core-4.3.0": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
-  "python2.7-kombu-1.5.1": {
+  "python2.7-kombu-4.1.0": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-mistune-0.7.4": {
@@ -327,7 +318,7 b''
     "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0", 
     "Zope Public License 2.0": "http://spdx.org/licenses/ZPL-2.0"
   }, 
-  "python2.7-setuptools-scm-1.15.0": {
+  "python2.7-setuptools-scm-1.15.6": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-simplegeneric-0.8.1": {

rhodecode/config/middleware.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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
@@ -18,41 +18,31 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-"""
-Pylons middleware initialization
-"""
 import logging
 import traceback
-from collections import OrderedDict
+import collections
 
-from paste.registry import RegistryManager
 from paste.gzipper import make_gzip_middleware
-from pylons.wsgiapp import PylonsApp
+from pyramid.wsgi import wsgiapp
 from pyramid.authorization import ACLAuthorizationPolicy
 from pyramid.config import Configurator
 from pyramid.settings import asbool, aslist
-from pyramid.wsgi import wsgiapp
 from pyramid.httpexceptions import (
-    HTTPException, HTTPError, HTTPInternalServerError, HTTPFound)
+    HTTPException, HTTPError, HTTPInternalServerError, HTTPFound, HTTPNotFound)
 from pyramid.events import ApplicationCreated
 from pyramid.renderers import render_to_response
-from routes.middleware import RoutesMiddleware
-import rhodecode
 
 from rhodecode.model import meta
 from rhodecode.config import patches
 from rhodecode.config import utils as config_utils
-from rhodecode.config.routing import STATIC_FILE_PREFIX
-from rhodecode.config.environment import (
-    load_environment, load_pyramid_environment)
+from rhodecode.config.environment import load_pyramid_environment
 
+from rhodecode.lib.middleware.vcs import VCSMiddleware
 from rhodecode.lib.vcs import VCSCommunicationError
 from rhodecode.lib.exceptions import VCSServerUnavailable
 from rhodecode.lib.middleware.appenlight import wrap_in_appenlight_if_enabled
-from rhodecode.lib.middleware.error_handling import (
-    PylonsErrorHandlingMiddleware)
 from rhodecode.lib.middleware.https_fixup import HttpsFixup
-from rhodecode.lib.middleware.vcs import VCSMiddleware
+from rhodecode.lib.celerylib.loader import configure_celery
 from rhodecode.lib.plugins.utils import register_rhodecode_plugin
 from rhodecode.lib.utils2 import aslist as rhodecode_aslist, AttributeDict
 from rhodecode.subscribers import (
@@ -63,157 +53,67 b' from rhodecode.subscribers import ('
 log = logging.getLogger(__name__)
 
 
-# this is used to avoid avoid the route lookup overhead in routesmiddleware
-# for certain routes which won't go to pylons to - eg. static files, debugger
-# it is only needed for the pylons migration and can be removed once complete
-class SkippableRoutesMiddleware(RoutesMiddleware):
-    """ Routes middleware that allows you to skip prefixes """
-
-    def __init__(self, *args, **kw):
-        self.skip_prefixes = kw.pop('skip_prefixes', [])
-        super(SkippableRoutesMiddleware, self).__init__(*args, **kw)
-
-    def __call__(self, environ, start_response):
-        for prefix in self.skip_prefixes:
-            if environ['PATH_INFO'].startswith(prefix):
-                # added to avoid the case when a missing /_static route falls
-                # through to pylons and causes an exception as pylons is
-                # expecting wsgiorg.routingargs to be set in the environ
-                # by RoutesMiddleware.
-                if 'wsgiorg.routing_args' not in environ:
-                    environ['wsgiorg.routing_args'] = (None, {})
-                return self.app(environ, start_response)
-
-        return super(SkippableRoutesMiddleware, self).__call__(
-            environ, start_response)
-
-
-def make_app(global_conf, static_files=True, **app_conf):
-    """Create a Pylons WSGI application and return it
-
-    ``global_conf``
-        The inherited configuration for this application. Normally from
-        the [DEFAULT] section of the Paste ini file.
-
-    ``app_conf``
-        The application's local configuration. Normally specified in
-        the [app:<name>] section of the Paste ini file (where <name>
-        defaults to main).
-
-    """
-    # Apply compatibility patches
-    patches.kombu_1_5_1_python_2_7_11()
-    patches.inspect_getargspec()
-
-    # Configure the Pylons environment
-    config = load_environment(global_conf, app_conf)
-
-    # The Pylons WSGI app
-    app = PylonsApp(config=config)
-
-    # Establish the Registry for this application
-    app = RegistryManager(app)
-
-    app.config = config
-
-    return app
+def is_http_error(response):
+    # error which should have traceback
+    return response.status_code > 499
 
 
 def make_pyramid_app(global_config, **settings):
     """
-    Constructs the WSGI application based on Pyramid and wraps the Pylons based
-    application.
+    Constructs the WSGI application based on Pyramid.
 
     Specials:
 
-    * We migrate from Pylons to Pyramid. While doing this, we keep both
-      frameworks functional. This involves moving some WSGI middlewares around
-      and providing access to some data internals, so that the old code is
-      still functional.
-
     * The application can also be integrated like a plugin via the call to
       `includeme`. This is accompanied with the other utility functions which
       are called. Changing this should be done with great care to not break
       cases when these fragments are assembled from another place.
 
     """
-    # The edition string should be available in pylons too, so we add it here
-    # before copying the settings.
-    settings.setdefault('rhodecode.edition', 'Community Edition')
-
-    # As long as our Pylons application does expect "unprepared" settings, make
-    # sure that we keep an unmodified copy. This avoids unintentional change of
-    # behavior in the old application.
-    settings_pylons = settings.copy()
-
     sanitize_settings_and_apply_defaults(settings)
 
     config = Configurator(settings=settings)
+
+    # Apply compatibility patches
+    patches.inspect_getargspec()
+
     load_pyramid_environment(global_config, settings)
 
-    add_pylons_compat_data(config.registry, global_config, settings_pylons)
+    # Static file view comes first
+    includeme_first(config)
 
-    includeme_first(config)
     includeme(config)
 
     pyramid_app = config.make_wsgi_app()
     pyramid_app = wrap_app_in_wsgi_middlewares(pyramid_app, config)
     pyramid_app.config = config
 
+    config.configure_celery(global_config['__file__'])
     # creating the app uses a connection - return it after we are done
     meta.Session.remove()
 
+    log.info('Pyramid app %s created and configured.', pyramid_app)
     return pyramid_app
 
 
-def make_not_found_view(config):
+def not_found_view(request):
     """
     This creates the view which should be registered as not-found-view to
-    pyramid. Basically it contains of the old pylons app, converted to a view.
-    Additionally it is wrapped by some other middlewares.
+    pyramid.
     """
-    settings = config.registry.settings
-    vcs_server_enabled = settings['vcs.server.enable']
 
-    # Make pylons app from unprepared settings.
-    pylons_app = make_app(
-        config.registry._pylons_compat_global_config,
-        **config.registry._pylons_compat_settings)
-    config.registry._pylons_compat_config = pylons_app.config
-
-    # Appenlight monitoring.
-    pylons_app, appenlight_client = wrap_in_appenlight_if_enabled(
-        pylons_app, settings)
+    if not getattr(request, 'vcs_call', None):
+        # handle like regular case with our error_handler
+        return error_handler(HTTPNotFound(), request)
 
-    # The pylons app is executed inside of the pyramid 404 exception handler.
-    # Exceptions which are raised inside of it are not handled by pyramid
-    # again. Therefore we add a middleware that invokes the error handler in
-    # case of an exception or error response. This way we return proper error
-    # HTML pages in case of an error.
-    reraise = (settings.get('debugtoolbar.enabled', False) or
-               rhodecode.disable_error_handler)
-    pylons_app = PylonsErrorHandlingMiddleware(
-        pylons_app, error_handler, reraise)
+    # handle not found view as a vcs call
+    settings = request.registry.settings
+    ae_client = getattr(request, 'ae_client', None)
+    vcs_app = VCSMiddleware(
+        HTTPNotFound(), request.registry, settings,
+        appenlight_client=ae_client)
 
-    # The VCSMiddleware shall operate like a fallback if pyramid doesn't find a
-    # view to handle the request. Therefore it is wrapped around the pylons
-    # app. It has to be outside of the error handling otherwise error responses
-    # from the vcsserver are converted to HTML error pages. This confuses the
-    # command line tools and the user won't get a meaningful error message.
-    if vcs_server_enabled:
-        pylons_app = VCSMiddleware(
-            pylons_app, settings, appenlight_client, registry=config.registry)
-
-    # Convert WSGI app to pyramid view and return it.
-    return wsgiapp(pylons_app)
-
-
-def add_pylons_compat_data(registry, global_config, settings):
-    """
-    Attach data to the registry to support the Pylons integration.
-    """
-    registry._pylons_compat_global_config = global_config
-    registry._pylons_compat_settings = settings
+    return wsgiapp(vcs_app)(None, request)
 
 
 def error_handler(exception, request):
@@ -229,10 +129,6 b' def error_handler(exception, request):'
     elif isinstance(exception, VCSCommunicationError):
         base_response = VCSServerUnavailable()
 
-    def is_http_error(response):
-        # error which should have traceback
-        return response.status_code > 499
-
     if is_http_error(base_response):
         log.exception(
             'error occurred handling this request for path: %s', request.path)
@@ -272,26 +168,46 b' def error_handler(exception, request):'
     return response
 
 
+def includeme_first(config):
+    # redirect automatic browser favicon.ico requests to correct place
+    def favicon_redirect(context, request):
+        return HTTPFound(
+            request.static_path('rhodecode:public/images/favicon.ico'))
+
+    config.add_view(favicon_redirect, route_name='favicon')
+    config.add_route('favicon', '/favicon.ico')
+
+    def robots_redirect(context, request):
+        return HTTPFound(
+            request.static_path('rhodecode:public/robots.txt'))
+
+    config.add_view(robots_redirect, route_name='robots')
+    config.add_route('robots', '/robots.txt')
+
+    config.add_static_view(
+        '_static/deform', 'deform:static')
+    config.add_static_view(
+        '_static/rhodecode', path='rhodecode:public', cache_max_age=3600 * 24)
+
+
 def includeme(config):
     settings = config.registry.settings
 
     # plugin information
-    config.registry.rhodecode_plugins = OrderedDict()
+    config.registry.rhodecode_plugins = collections.OrderedDict()
 
     config.add_directive(
         'register_rhodecode_plugin', register_rhodecode_plugin)
 
+    config.add_directive('configure_celery', configure_celery)
+
     if asbool(settings.get('appenlight', 'false')):
         config.include('appenlight_client.ext.pyramid_tween')
 
-    if 'mako.default_filters' not in settings:
-        # set custom default filters if we don't have it defined
-        settings['mako.imports'] = 'from rhodecode.lib.base import h_filter'
-        settings['mako.default_filters'] = 'h_filter'
-
     # Includes which are required. The application would fail without them.
     config.include('pyramid_mako')
     config.include('pyramid_beaker')
+    config.include('rhodecode.lib.caches')
 
     config.include('rhodecode.authentication')
     config.include('rhodecode.integrations')
@@ -331,16 +247,17 b' def includeme(config):'
     config.add_subscriber(write_metadata_if_needed, ApplicationCreated)
     config.add_subscriber(write_js_routes_if_enabled, ApplicationCreated)
 
-    config.add_request_method(
-        'rhodecode.lib.partial_renderer.get_partial_renderer',
-        'get_partial_renderer')
-
     # events
     # TODO(marcink): this should be done when pyramid migration is finished
     # config.add_subscriber(
     #     'rhodecode.integrations.integrations_event_handler',
     #     'rhodecode.events.RhodecodeEvent')
 
+    # request custom methods
+    config.add_request_method(
+        'rhodecode.lib.partial_renderer.get_partial_renderer',
+        'get_partial_renderer')
+
     # Set the authorization policy.
     authz_policy = ACLAuthorizationPolicy()
     config.set_authorization_policy(authz_policy)
@@ -357,65 +274,29 b' def includeme(config):'
     for inc in includes:
         config.include(inc)
 
-    # This is the glue which allows us to migrate in chunks. By registering the
-    # pylons based application as the "Not Found" view in Pyramid, we will
-    # fallback to the old application each time the new one does not yet know
-    # how to handle a request.
-    config.add_notfound_view(make_not_found_view(config))
-
+    # custom not found view, if our pyramid app doesn't know how to handle
+    # the request pass it to potential VCS handling ap
+    config.add_notfound_view(not_found_view)
     if not settings.get('debugtoolbar.enabled', False):
         # disabled debugtoolbar handle all exceptions via the error_handlers
         config.add_view(error_handler, context=Exception)
 
+    # all errors including 403/404/50X
     config.add_view(error_handler, context=HTTPError)
 
 
-def includeme_first(config):
-    # redirect automatic browser favicon.ico requests to correct place
-    def favicon_redirect(context, request):
-        return HTTPFound(
-            request.static_path('rhodecode:public/images/favicon.ico'))
-
-    config.add_view(favicon_redirect, route_name='favicon')
-    config.add_route('favicon', '/favicon.ico')
-
-    def robots_redirect(context, request):
-        return HTTPFound(
-            request.static_path('rhodecode:public/robots.txt'))
-
-    config.add_view(robots_redirect, route_name='robots')
-    config.add_route('robots', '/robots.txt')
-
-    config.add_static_view(
-        '_static/deform', 'deform:static')
-    config.add_static_view(
-        '_static/rhodecode', path='rhodecode:public', cache_max_age=3600 * 24)
-
-
 def wrap_app_in_wsgi_middlewares(pyramid_app, config):
     """
     Apply outer WSGI middlewares around the application.
-
-    Part of this has been moved up from the Pylons layer, so that the
-    data is also available if old Pylons code is hit through an already ported
-    view.
     """
     settings = config.registry.settings
 
     # enable https redirects based on HTTP_X_URL_SCHEME set by proxy
     pyramid_app = HttpsFixup(pyramid_app, settings)
 
-    # Add RoutesMiddleware to support the pylons compatibility tween during
-    # migration to pyramid.
-
-    # TODO(marcink): remove after migration to pyramid
-    if hasattr(config.registry, '_pylons_compat_config'):
-        routes_map = config.registry._pylons_compat_config['routes.map']
-        pyramid_app = SkippableRoutesMiddleware(
-            pyramid_app, routes_map,
-            skip_prefixes=(STATIC_FILE_PREFIX, '/_debug_toolbar'))
-
-    pyramid_app, _ = wrap_in_appenlight_if_enabled(pyramid_app, settings)
+    pyramid_app, _ae_client = wrap_in_appenlight_if_enabled(
+        pyramid_app, settings)
+    config.registry.ae_client = _ae_client
 
     if settings['gzip_responses']:
         pyramid_app = make_gzip_middleware(
@@ -452,16 +333,21 b' def sanitize_settings_and_apply_defaults'
     function.
     """
 
-    # Pyramid's mako renderer has to search in the templates folder so that the
-    # old templates still work. Ported and new templates are expected to use
-    # real asset specifications for the includes.
-    mako_directories = settings.setdefault('mako.directories', [
-        # Base templates of the original Pylons application
-        'rhodecode:templates',
-    ])
-    log.debug(
-        "Using the following Mako template directories: %s",
-        mako_directories)
+    settings.setdefault('rhodecode.edition', 'Community Edition')
+
+    if 'mako.default_filters' not in settings:
+        # set custom default filters if we don't have it defined
+        settings['mako.imports'] = 'from rhodecode.lib.base import h_filter'
+        settings['mako.default_filters'] = 'h_filter'
+
+    if 'mako.directories' not in settings:
+        mako_directories = settings.setdefault('mako.directories', [
+            # Base templates of the original application
+            'rhodecode:templates',
+        ])
+        log.debug(
+            "Using the following Mako template directories: %s",
+            mako_directories)
 
     # Default includes, possible to change as a user
     pyramid_includes = settings.setdefault('pyramid.includes', [
@@ -526,10 +412,10 b' def _int_setting(settings, name, default'
 
 
 def _bool_setting(settings, name, default):
-    input = settings.get(name, default)
-    if isinstance(input, unicode):
-        input = input.encode('utf8')
-    settings[name] = asbool(input)
+    input_val = settings.get(name, default)
+    if isinstance(input_val, unicode):
+        input_val = input_val.encode('utf8')
+    settings[name] = asbool(input_val)
 
 
 def _list_setting(settings, name, default):

rhodecode/config/patches.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2017 RhodeCode GmbH
+# Copyright (C) 2016-2018 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
@@ -32,26 +32,10 b' Please keep the following principles in '
 """
 
 
-def kombu_1_5_1_python_2_7_11():
-    """
-    Kombu 1.5.1 relies on a private method which got removed in Python 2.7.11.
-
-    This patch adds the symbol to the module :mod:`uuid` and assigns the value
-    ``None`` to it. This causes kombu to fall back to the public API of
-    :mod:`uuid`.
-
-    This patch can most probably be removed once celery and kombu are updated
-    to more recent versions.
-    """
-    import uuid
-
-    if not hasattr(uuid, '_uuid_generate_random'):
-        uuid._uuid_generate_random = None
-
 
 def inspect_getargspec():
     """
-    Pyramid and Pylons rely on inspect.getargspec to lookup the signature of
+    Pyramid rely on inspect.getargspec to lookup the signature of
     view functions. This is not compatible with cython, therefore we replace
     getargspec with a custom version.
     Code is inspired by the inspect module from Python-3.4

rhodecode/config/routing_links.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/config/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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

rhodecode/controllers/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2010-2018 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