release: Merge default into stable for release preparation

docs/auth/auth-saml-duosecurity.rst

@@ -0,0 +1,105 b''
+.. _config-saml-duosecurity-ref:
+
+
+SAML 2.0 with Duo Security
+--------------------------
+
+**This plugin is available only in EE Edition.**
+
+|RCE| supports SAML 2.0 Authentication with Duo Security provider. This allows
+users to log-in to RhodeCode via SSO mechanism of external identity provider
+such as Duo. The login can be triggered either by the external IDP, or internally
+by clicking specific authentication button on the log-in page.
+
+
+Configuration steps
+^^^^^^^^^^^^^^^^^^^
+
+To configure Duo Security SAML authentication, use the following steps:
+
+1. From the |RCE| interface, select
+   :menuselection:`Admin --> Authentication`
+2. Activate the `Duo Security` plugin and select :guilabel:`Save`
+3. Go to newly available menu option called `Duo Security` on the left side.
+4. Check the `enabled` check box in the plugin configuration section,
+   and fill in the required SAML information and :guilabel:`Save`, for more details,
+   see :ref:`config-saml-duosecurity`
+
+
+.. _config-saml-duosecurity:
+
+
+Example SAML Duo Security configuration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Example configuration for SAML 2.0 with Duo Security provider::
+
+    *option*: `enabled` => `True`
+    # Enable or disable this authentication plugin.
+
+    *option*: `cache_ttl` => `0`
+    # Amount of seconds to cache the authentication and permissions check response call for this plugin.
+    # Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled).
+
+    *option*: `debug` => `True`
+    # Enable or disable debug mode that shows SAML errors in the RhodeCode logs.
+
+    *option*: `entity_id` => `http://rc-app.com/dag/saml2/idp/metadata.php`
+    # Identity Provider entity/metadata URI.
+    # E.g. https://duo-gateway.com/dag/saml2/idp/metadata.php
+
+    *option*: `sso_service_url` => `http://rc-app.com/dag/saml2/idp/SSOService.php?spentityid=http://rc.local.pl/_admin/auth/duosecurity/saml-metadata`
+    # SSO (SingleSignOn) endpoint URL of the IdP. This can be used to initialize login
+    # E.g. https://duo-gateway.com/dag/saml2/idp/SSOService.php?spentityid=<metadata_entity_id>
+
+    *option*: `slo_service_url` => `http://rc-app.com/dag/saml2/idp/SingleLogoutService.php?ReturnTo=http://rc-app.com/dag/module.php/duosecurity/logout.php`
+    # SLO (SingleLogout) endpoint URL of the IdP.
+    # E.g. https://duo-gateway.com/dag/saml2/idp/SingleLogoutService.php?ReturnTo=http://duo-gateway.com/_admin/saml/sign-out-endpoint
+
+    *option*: `x509cert` => `<CERTIFICATE_STRING>`
+    # Identity provider public x509 certificate. It will be converted to single-line format without headers
+
+    *option*: `name_id_format` => `sha-1`
+    # The format that specifies how the NameID is sent to the service provider.
+
+    *option*: `signature_algo` => `sha-256`
+    # Type of Algorithm to use for verification of SAML signature on Identity provider side
+
+    *option*: `digest_algo` => `sha-256`
+    # Type of Algorithm to use for verification of SAML digest on Identity provider side
+
+    *option*: `cert_dir` => `/etc/saml/`
+    # Optional directory to store service provider certificate and private keys.
+    # Expected certs for the SP should be stored in this folder as:
+    #  * sp.key     Private Key
+    #  * sp.crt     Public cert
+    #  * sp_new.crt Future Public cert
+    #
+    # Also you can use other cert to sign the metadata of the SP using the:
+    #  * metadata.key
+    #  * metadata.crt
+
+    *option*: `user_id_attribute` => `PersonImmutableID`
+    # User ID Attribute name. This defines which attribute in SAML response will be used to link accounts via unique id.
+    # Ensure this is returned from DuoSecurity for example via duo_username
+
+    *option*: `username_attribute` => `User.username`
+    # Username Attribute name. This defines which attribute in SAML response will map to an username.
+
+    *option*: `email_attribute` => `User.email`
+    # Email Attribute name. This defines which attribute in SAML response will map to an email address.
+
+
+Below is example setup from DUO Administration page that can be used with above config.
+
+.. image:: ../images/saml-duosecurity-service-provider-example.png
+   :alt: DUO Security SAML setup example
+   :scale: 50 %
+
+
+Below is an example attribute mapping set for IDP provider required by the above config.
+
+
+.. image:: ../images/saml-duosecurity-attributes-example.png
+   :alt: DUO Security SAML setup example
+   :scale: 50 %
  No newline at end of file

docs/auth/auth-saml-generic.rst

@@ -0,0 +1,18 b''
+.. _config-saml-generic-ref:
+
+
+SAML 2.0 Authentication
+-----------------------
+
+
+**This plugin is available only in EE Edition.**
+
+RhodeCode Supports standard SAML 2.0 SSO for the web-application part.
+
+Please check for reference two example providers:
+
+.. toctree::
+
+   auth-saml-duosecurity
+   auth-saml-onelogin
+

docs/auth/auth-saml-onelogin.rst

@@ -0,0 +1,106 b''
+.. _config-saml-onelogin-ref:
+
+
+SAML 2.0 with One Login
+-----------------------
+
+**This plugin is available only in EE Edition.**
+
+|RCE| supports SAML 2.0 Authentication with OneLogin provider. This allows
+users to log-in to RhodeCode via SSO mechanism of external identity provider
+such as OneLogin. The login can be triggered either by the external IDP, or internally
+by clicking specific authentication button on the log-in page.
+
+
+Configuration steps
+^^^^^^^^^^^^^^^^^^^
+
+To configure OneLogin SAML authentication, use the following steps:
+
+1. From the |RCE| interface, select
+   :menuselection:`Admin --> Authentication`
+2. Activate the `OneLogin` plugin and select :guilabel:`Save`
+3. Go to newly available menu option called `OneLogin` on the left side.
+4. Check the `enabled` check box in the plugin configuration section,
+   and fill in the required SAML information and :guilabel:`Save`, for more details,
+   see :ref:`config-saml-onelogin`
+
+
+.. _config-saml-onelogin:
+
+
+Example SAML OneLogin configuration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Example configuration for SAML 2.0 with OneLogin provider::
+
+    *option*: `enabled` => `True`
+    # Enable or disable this authentication plugin.
+
+    *option*: `cache_ttl` => `0`
+    # Amount of seconds to cache the authentication and permissions check response call for this plugin.
+    # Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled).
+
+    *option*: `debug` => `True`
+    # Enable or disable debug mode that shows SAML errors in the RhodeCode logs.
+
+    *option*: `entity_id` => `https://app.onelogin.com/saml/metadata/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`
+    # Identity Provider entity/metadata URI.
+    # E.g. https://app.onelogin.com/saml/metadata/<onelogin_connector_id>
+
+    *option*: `sso_service_url` => `https://customer-domain.onelogin.com/trust/saml2/http-post/sso/xxxxxx`
+    # SSO (SingleSignOn) endpoint URL of the IdP. This can be used to initialize login
+    # E.g. https://app.onelogin.com/trust/saml2/http-post/sso/<onelogin_connector_id>
+
+    *option*: `slo_service_url` => `https://customer-domain.onelogin.com/trust/saml2/http-redirect/slo/xxxxxx`
+    # SLO (SingleLogout) endpoint URL of the IdP.
+    # E.g. https://app.onelogin.com/trust/saml2/http-redirect/slo/<onelogin_connector_id>
+
+    *option*: `x509cert` => `<CERTIFICATE_STRING>`
+    # Identity provider public x509 certificate. It will be converted to single-line format without headers
+
+    *option*: `name_id_format` => `sha-1`
+    # The format that specifies how the NameID is sent to the service provider.
+
+    *option*: `signature_algo` => `sha-256`
+    # Type of Algorithm to use for verification of SAML signature on Identity provider side
+
+    *option*: `digest_algo` => `sha-256`
+    # Type of Algorithm to use for verification of SAML digest on Identity provider side
+
+    *option*: `cert_dir` => `/etc/saml/`
+    # Optional directory to store service provider certificate and private keys.
+    # Expected certs for the SP should be stored in this folder as:
+    #  * sp.key     Private Key
+    #  * sp.crt     Public cert
+    #  * sp_new.crt Future Public cert
+    #
+    # Also you can use other cert to sign the metadata of the SP using the:
+    #  * metadata.key
+    #  * metadata.crt
+
+    *option*: `user_id_attribute` => `PersonImmutableID`
+    # User ID Attribute name. This defines which attribute in SAML response will be used to link accounts via unique id.
+    # Ensure this is returned from OneLogin for example via Internal ID
+
+    *option*: `username_attribute` => `User.username`
+    # Username Attribute name. This defines which attribute in SAML response will map to an username.
+
+    *option*: `email_attribute` => `User.email`
+    # Email Attribute name. This defines which attribute in SAML response will map to an email address.
+
+
+
+Below is example setup that can be used with OneLogin SAML authentication that can be used with above config..
+
+.. image:: ../images/saml-onelogin-config-example.png
+   :alt: OneLogin SAML setup example
+   :scale: 50 %
+
+
+Below is an example attribute mapping set for IDP provider required by the above config.
+
+
+.. image:: ../images/saml-onelogin-attributes-example.png
+   :alt: OneLogin SAML setup example
+   :scale: 50 %
  No newline at end of file

docs/release-notes/release-notes-4.15.0.rst

@@ -0,0 +1,81 b''
+|RCE| 4.15.0 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2018-12-10
+
+
+New Features
+^^^^^^^^^^^^
+
+- Authentication: Added SAML 2.0 Authentication, with support of OneLogin and DUO Security.
+- Core: add debug mode that switches logging to debug.
+  It's no longer required to reconfigure all logging. A `debug=true` set in .ini file
+  does it automatically.
+
+
+General
+^^^^^^^
+
+- Authentication: rename oauth to external identity as it would now be serving both
+  oAuth and SAML.
+- Authentication: allow setting extern type with registration.
+  This will allow external identity plugins to define proper externs instead of always
+  using "rhodecode" one.
+- Authentication: show if plugin is activated and enabled in the list.
+- Authentication: add better logging for ldap related attributes to help track
+  LDAP connection problems more easily.
+- Visual: add change logo header template
+- UI: updated error pages style to be consistent with other pages.
+- Utils: updated request generation so ishell can run some automation scripts.
+- Docs: updated documentation for SVN 1.10 Wandisco repositories.
+- System info: expose base_url set in .ini file.
+- Style: update pygments template styling.
+- Style: updated li style and markdown style.
+- Dependencies: added python-saml library.
+- Dependencies: bumped hgsubversion to 1.9.3 release.
+- Dependencies: bumped gevent to 1.3.7 release.
+- Dependencies: bumped lxml to 4.2.5 release.
+- Dependencies: bumped gevent to 1.3.7 release.
+- Dependencies: bumped alembic to 1.0.5 release.
+- Dependencies: bumped peppercorn to 0.6 release.
+- Dependencies: bumped pyotp to 2.2.7 release.
+- Dependencies: bumped deform to 2.0.7 release
+- Dependencies: bumped py-gfm to 0.1.4 release.
+- Dependencies: bumped colander to 1.5.1 release
+- Dependencies: bumped appenlight-client to 0.6.26 release.
+- Dependencies: bumped bleach to 3.0.2 release.
+- Dependencies: bumped pygments to 2.3.0
+
+
+Security
+^^^^^^^^
+
+- Mercurial: support evolve sub-commands when checking for permissions.
+  Those defaulted to write, while only read is required for evolve.
+- auth/security: enforce that external users cannot reset their password.
+  External users don't use RhodeCode passwords, so resetting them shouldn't be allowed.
+
+
+Performance
+^^^^^^^^^^^
+
+- Markdown: use lazy loaded markdown initialization to speed up app startup.
+- Gevent: changed DNS resolver to ares for better stability on long running processes.
+
+
+Fixes
+^^^^^
+
+- Default Reviewers: use target repo owner as default reviewer in case of CE edition.
+- LDAP: ensure the proper cert files and dirs are set.
+  It's also now possible to specify custom paths for those.
+- Markdown: fixed auto checkbox generation from markdown code
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- LDAP cert dirs
  No newline at end of file

rhodecode/config/rcextensions/examples/custom_email_integration_template.py

@@ -0,0 +1,175 b''
+# This code allows override the integrations templates. Put this into the __init__.py
+# file of rcextensions
+
+
+# EMAIL
+from rhodecode.integrations import email
+email.REPO_PUSH_TEMPLATE_HTML = email.Template('''
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <title>${subject}</title>
+    <style type="text/css">
+        /* Based on The MailChimp Reset INLINE: Yes. */
+        #outlook a {padding:0;} /* Force Outlook to provide a "view in browser" menu link. */
+        body{width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0;}
+        /* Prevent Webkit and Windows Mobile platforms from changing default font sizes.*/
+        .ExternalClass {width:100%;} /* Force Hotmail to display emails at full width */
+        .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;}
+        /* Forces Hotmail to display normal line spacing.  More on that: http://www.emailonacid.com/forum/viewthread/43/ */
+        #backgroundTable {margin:0; padding:0; line-height: 100% !important;}
+        /* End reset */
+
+        /* defaults for images*/
+        img {outline:none; text-decoration:none; -ms-interpolation-mode: bicubic;}
+        a img {border:none;}
+        .image_fix {display:block;}
+
+        body {line-height:1.2em;}
+        p {margin: 0 0 20px;}
+        h1, h2, h3, h4, h5, h6 {color:#323232!important;}
+        a {color:#427cc9;text-decoration:none;outline:none;cursor:pointer;}
+        a:focus {outline:none;}
+        a:hover {color: #305b91;}
+        h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {color:#427cc9!important;text-decoration:none!important;}
+        h1 a:active, h2 a:active,  h3 a:active, h4 a:active, h5 a:active, h6 a:active {color: #305b91!important;}
+        h1 a:visited, h2 a:visited,  h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited {color: #305b91!important;}
+        table {font-size:13px;border-collapse:collapse;mso-table-lspace:0pt;mso-table-rspace:0pt;}
+        table td {padding:.65em 1em .65em 0;border-collapse:collapse;vertical-align:top;text-align:left;}
+        input {display:inline;border-radius:2px;border-style:solid;border: 1px solid #dbd9da;padding:.5em;}
+        input:focus {outline: 1px solid #979797}
+        @media only screen and (-webkit-min-device-pixel-ratio: 2) {
+        /* Put your iPhone 4g styles in here */
+        }
+
+        /* Android targeting */
+        @media only screen and (-webkit-device-pixel-ratio:.75){
+        /* Put CSS for low density (ldpi) Android layouts in here */
+        }
+        @media only screen and (-webkit-device-pixel-ratio:1){
+        /* Put CSS for medium density (mdpi) Android layouts in here */
+        }
+        @media only screen and (-webkit-device-pixel-ratio:1.5){
+        /* Put CSS for high density (hdpi) Android layouts in here */
+        }
+        /* end Android targeting */
+
+    </style>
+
+    <!-- Targeting Windows Mobile -->
+    <!--[if IEMobile 7]>
+    <style type="text/css">
+
+    </style>
+    <![endif]-->
+
+    <!--[if gte mso 9]>
+        <style>
+        /* Target Outlook 2007 and 2010 */
+        </style>
+    <![endif]-->
+</head>
+<body>
+<!-- Wrapper/Container Table: Use a wrapper table to control the width and the background color consistently of your email. Use this approach instead of setting attributes on the body tag. -->
+<table cellpadding="0" cellspacing="0" border="0" id="backgroundTable" align="left" style="margin:1%;width:97%;padding:0;font-family:sans-serif;font-weight:100;border:1px solid #dbd9da">
+    <tr>
+        <td valign="top" style="padding:0;">
+            <table cellpadding="0" cellspacing="0" border="0" align="left" width="100%">
+                <tr><td style="width:100%;padding:7px;background-color:#202020" valign="top">
+                    <a style="color:#eeeeee;text-decoration:none;" href="${instance_url}">
+                        ${'RhodeCode'}
+                    </a>
+                </td></tr>
+                <tr>
+                    <td style="padding:15px;" valign="top">
+                        % if data['push']['commits']:
+                            % for commit in data['push']['commits']:
+                            <a href="${commit['url']}">${commit['short_id']}</a> by ${commit['author']} at ${commit['date']} <br/>
+                            ${commit['message_html']} <br/>
+                            <br/>
+                            % endfor
+                        % else:
+                            No commit data
+                        % endif
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+<!-- End of wrapper table -->
+<p><a style="margin-top:15px;margin-left:1%;font-family:sans-serif;font-weight:100;font-size:11px;color:#666666;text-decoration:none;" href="${instance_url}">
+    ${'This is a notification from RhodeCode. %(instance_url)s' % {'instance_url': instance_url}}
+</a></p>
+</body>
+</html>
+''')
+
+
+# JIRA (EE ONLY)
+from rc_integrations import jira_tracker
+
+jira_tracker.COMMENT_TEMPLATE_PULL_REQUEST = jira_tracker.Template('''
+${action} by ${author} (status: ${status}). \n
+pull-request: ${url}
+''')
+
+
+jira_tracker.COMMENT_TEMPLATE_COMMIT = jira_tracker.Template('''
+Commit `${short_id}` by ${author} on `${branch}` branch references this issue. \n
+${url}\n
+
+## MODIFICATION add custom COMMIT message to the comment
+${commit['message']}
+''')
+
+
+jira_tracker.COMMENT_TEMPLATE_COMMIT_WITH_STATUS = jira_tracker.Template('''
+Commit `${short_id}` by ${author} on `${branch}` branch changed this issue. \n
+'{url}\n
+
+## MODIFICATION add custom COMMIT message to the comment
+${commit['message']} 
+''')
+
+
+# REDMINE (EE ONLY)
+from rc_integrations import redmine_tracker
+
+redmine_tracker.COMMENT_TEMPLATE_COMMIT = redmine_tracker.Template('''
+Commit `${short_id}` by ${author} on `${branch}` branch references this issue. \n
+commit: ${url}\n
+
+## MODIFICATION add custom COMMIT message to the comment
+message:
+```
+${commit['message']}
+```
+
+''')
+
+redmine_tracker.COMMENT_TEMPLATE_COMMIT_WITH_STATUS = redmine_tracker.Template('''
+Commit `${short_id}` by ${author} on `${branch}` branch changed this issue. \n
+commit: ${url}\n
+
+## MODIFICATION add custom COMMIT message to the comment
+message:
+```
+${commit['message']}
+```
+
+''')
+
+redmine_tracker.COMMENT_TEMPLATE_PULL_REQUEST = redmine_tracker.Template('''
+${action} by ${author} (status: ${status}). \n'
+${url}\n
+
+## MODIFICATION add custom COMMIT message to the comment
+message:
+```
+${commit['message']}
+```
+
+''')

rhodecode/config/rcextensions/examples/validate_commit_message_author.py

@@ -0,0 +1,91 b''
+# Example to validate commit message or author using some sort of rules
+
+
+@has_kwargs({
+    'server_url': 'url of instance that triggered this hook',
+    'config': 'path to .ini config used',
+    'scm': 'type of version control "git", "hg", "svn"',
+    'username': 'username of actor who triggered this event',
+    'ip': 'ip address of actor who triggered this hook',
+    'action': '',
+    'repository': 'repository name',
+    'repo_store_path': 'full path to where repositories are stored',
+    'commit_ids': 'pre transaction metadata for commit ids',
+    'hook_type': '',
+    'user_agent': 'Client user agent, e.g git or mercurial CLI version',
+})
+@has_kwargs({
+    'server_url': 'url of instance that triggered this hook',
+    'config': 'path to .ini config used',
+    'scm': 'type of version control "git", "hg", "svn"',
+    'username': 'username of actor who triggered this event',
+    'ip': 'ip address of actor who triggered this hook',
+    'action': '',
+    'repository': 'repository name',
+    'repo_store_path': 'full path to where repositories are stored',
+    'commit_ids': 'pre transaction metadata for commit ids',
+    'hook_type': '',
+    'user_agent': 'Client user agent, e.g git or mercurial CLI version',
+})
+def _pre_push_hook(*args, **kwargs):
+    """
+    Post push hook
+    To stop version control from storing the transaction and send a message to user
+    use non-zero HookResponse with a message, e.g return HookResponse(1, 'Not allowed')
+
+    This message will be shown back to client during PUSH operation
+
+    Commit ids might look like that::
+
+    [{u'hg_env|git_env': ...,
+      u'multiple_heads': [],
+      u'name': u'default',
+      u'new_rev': u'd0befe0692e722e01d5677f27a104631cf798b69',
+      u'old_rev': u'd0befe0692e722e01d5677f27a104631cf798b69',
+      u'ref': u'',
+      u'total_commits': 2,
+      u'type': u'branch'}]
+    """
+    import re
+    from .helpers import extra_fields, extract_pre_commits
+    from .utils import str2bool
+
+    # returns list of dicts with key-val fetched from extra fields
+    repo_extra_fields = extra_fields.run(**kwargs)
+
+    # optionally use 'extra fields' to control the logic per repo
+    should_validate = str2bool(repo_extra_fields.get('validate_author', True))
+
+    # optionally store validation regex into extra fields
+    validation_regex = repo_extra_fields.get('validation_regex', '')
+
+    def validate_commit_message(commit_message, message_regex=None):
+        """
+        This function validates commit_message against some sort of rules.
+        It should return a valid boolean, and a reason for failure
+        """
+
+        if "secret_string" in commit_message:
+            msg = "!!Push forbidden: secret string found in commit messages"
+            return False, msg
+
+        if validation_regex:
+            regexp = re.compile(validation_regex)
+            if not regexp.match(message):
+                msg = "!!Push forbidden: commit message does not match regexp"
+                return False, msg
+
+        return True, ''
+
+    if should_validate:
+        # returns list of dicts with key-val fetched from extra fields
+        commit_list = extract_pre_commits.run(**kwargs)
+
+        for commit_data in commit_list:
+            message = commit_data['message']
+
+            message_valid, reason = validate_commit_message(message, validation_regex)
+            if not message_valid:
+                return HookResponse(1, reason)
+
+    return HookResponse(0, '')

.bumpversion.cfg

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

.release.cfg

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

README.rst

@@ -7,18 +7,20 b' About'
 
 ``RhodeCode`` is a fast and powerful management tool for Mercurial_ and GIT_
 and Subversion_ with a built in push/pull server, full text search,
-pull requests and powerful code-review system. It works on http/https and
+pull requests and powerful code-review system. It works on http/https, SSH and
 has a few unique features like:
 
- - plugable architecture
- - advanced permission system with IP restrictions
- - rich set of authentication plugins including LDAP,
-   ActiveDirectory, Atlassian Crowd, Http-Headers, Pam, Token-Auth.
- - live code-review chat
- - full web based file editing
- - unified multi vcs support
- - snippets (gist) system
- - integration with all 3rd party issue trackers
+- plugable architecture from Pyramid web-framework.
+- advanced permission system with IP restrictions, inheritation, and user-groups.
+- rich set of authentication plugins including LDAP, ActiveDirectory, SAML 2.0,
+  Atlassian Crowd, Http-Headers, Pam, Token-Auth, OAuth.
+- live code-review chat, and reviewer rules.
+- full web based file editing.
+- unified multi vcs support.
+- snippets (gist) system.
+- integration framework for Slack, CI systems, Webhooks.
+- integration with all 3rd party issue trackers.
+
 
 RhodeCode also provides rich API, and multiple event hooks so it's easy
 integrable with existing external systems.

configs/development.ini

@@ -1,10 +1,11 b''
 
 
 ################################################################################
-##                 RHODECODE COMMUNITY EDITION CONFIGURATION                  ##
+##                RHODECODE COMMUNITY  EDITION CONFIGURATION                  ##
 ################################################################################
 
 [DEFAULT]
+## Debug flag sets all loggers to debug, and enables request tracking
 debug = true
 
 ################################################################################
@@ -414,6 +415,7 b' search.location = %(here)s/data/index'
 ########################################
 ## channelstream enables persistent connections and live notification
 ## in the system. It's also used by the chat system
+
 channelstream.enabled = false
 
 ## server address for channelstream server on the backend
@@ -490,14 +492,6 b' appenlight.request_keys_blacklist ='
 ## (by default the client ignores own entries: appenlight_client.client)
 appenlight.log_namespace_blacklist =
 
-
-################################################################################
-## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##
-## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##
-## execute malicious code after an exception is raised.                       ##
-################################################################################
-#set debug = false
-
 # enable debug style page
 debug_style = true
 

configs/production.ini

@@ -1,11 +1,12 b''
 
 
 ################################################################################
-##                 RHODECODE COMMUNITY EDITION CONFIGURATION                  ##
+##                RHODECODE COMMUNITY  EDITION CONFIGURATION                  ##
 ################################################################################
 
 [DEFAULT]
-debug = true
+## Debug flag sets all loggers to debug, and enables request tracking
+debug = false
 
 ################################################################################
 ##                            EMAIL CONFIGURATION                             ##
@@ -389,6 +390,7 b' search.location = %(here)s/data/index'
 ########################################
 ## channelstream enables persistent connections and live notification
 ## in the system. It's also used by the chat system
+
 channelstream.enabled = false
 
 ## server address for channelstream server on the backend
@@ -466,14 +468,6 b' appenlight.request_keys_blacklist ='
 appenlight.log_namespace_blacklist =
 
 
-################################################################################
-## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##
-## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##
-## execute malicious code after an exception is raised.                       ##
-################################################################################
-set debug = false
-
-
 ###########################################
 ###   MAIN RHODECODE DATABASE CONFIG    ###
 ###########################################
@@ -524,6 +518,7 b' vcs.scm_app_implementation = http'
 ## Push/Pull operations hooks protocol, available options are:
 ## `http` - use http-rpc backend (default)
 vcs.hooks.protocol = http
+
 ## Host on which this instance is listening for hooks. If vcsserver is in other location
 ## this should be adjusted.
 vcs.hooks.host = 127.0.0.1

docs/admin/adding-anonymous-user.rst

@@ -3,19 +3,19 b''
 Anonymous Users
 ---------------
 
-By default, |RCM| provides |repo| access for registered users only. It can be
+By default, |RCE| provides |repo| access for registered users only. It can be
 configured to be **world-open** in terms of read and write permissions. This
-configuration is called "Anonymous Access" and allows |RCM| to be used as a
+configuration is called "Anonymous Access" and allows |RCE| to be used as a
 public hub where unregistered users have access to your |repos|.
 
 Anonymous access is useful for open source projects, universities,
 or if running inside a restricted internal corporate network to serve
 documents to all employees. Anonymous users get the default user permission
-settings that are applied across the whole |RCM| system.
+settings that are applied across the whole |RCE| system.
 
 To enable anonymous access to your |repos|, use the following steps:
 
-1. From the |RCM| interface, select :menuselection:`Admin --> Permissions`.
+1. From the |RCE| interface, select :menuselection:`Admin --> Permissions`.
 2. On the Application tab, check the :guilabel:`Allow anonymous access` box.
 3. Select :guilabel:`Save`.
 4. To set the anonymous user access permissions, which are based on the

docs/admin/admin-tricks.rst

@@ -166,7 +166,7 b' 2. Add your custom hook details, you can'
    ``pretxnchangegroup.example`` with value ``python:/path/to/custom_hook.py:my_func_name``
 3. Select :guilabel:`Save`
 
-Also, see the |RC| Extensions section of the :ref:`rc-tools` guide. |RC|
+Also, see the RhodeCode Extensions section of the :ref:`rc-tools` guide. RhodeCode
 Extensions can be used to add additional hooks to your instance and comes
 with a number of pre-built plugins if you chose to install them.
 

docs/admin/apache-wsgi-coding.rst

@@ -3,7 +3,7 b''
 Apache WSGI Configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-|RCM| can also be set up with Apache under ``mod_wsgi``. To configure this
+|RCE| can also be set up with Apache under ``mod_wsgi``. To configure this
 use the following steps.
 
 1. Install ``mod_wsgi`` using the following command:
@@ -50,6 +50,6 b' The following is an example ``wsgi`` dis'
 .. note::
 
    When using `mod_wsgi` the same version of |hg| must be running in your
-   system's |PY| environment and on |RCM|. To check the |RCM| version,
+   system's |PY| environment and on |RCE|. To check the |RCE| version,
    on the interface go to
    :menuselection:`Admin --> Settings --> System Info`

docs/admin/config-files-overview.rst

@@ -67,7 +67,7 b' sections.'
         Default location: :file:`/home/{user}/.rccontrol/cache/MANIFEST`
 
         |RCC| uses this file to source the latest available builds from the
-        secure |RC| download channels. The only reason to mess with this file
+        secure RhodeCode download channels. The only reason to mess with this file
         is if you need to do an offline installation,
         see the :ref:`Offline Installation<control:offline-installer-ref>`
         instructions, otherwise |RCC| will completely manage this file.

docs/admin/enable-debug.rst

@@ -3,6 +3,16 b''
 Enabling Debug Mode
 -------------------
 
+Debug Mode will enable debug logging, and request tracking middleware. Debug Mode
+enabled DEBUG log-level which allows tracking various information about authentication
+failures, LDAP connection, email etc.
+
+The request tracking will add a special
+unique ID: `| req_id:00000000-0000-0000-0000-000000000000` at the end of each log line.
+The req_id is the same for each individual requests, it means that if you want to
+track particular user logs only, and exclude other concurrent ones
+simply grep by `req_id` uuid which you'll have to find for the individual request.
+
 To enable debug mode on a |RCE| instance you need to set the debug property
 in the :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file. To
 do this, use the following steps
@@ -11,14 +21,10 b' 1. Open the file and set the ``debug`` l'
 2. Restart you instance using the ``rccontrol restart`` command,
    see the following example:
 
-You can also set the log level, the follow are the valid options;
-``debug``, ``info``, ``warning``, or ``fatal``.
-
 .. code-block:: ini
 
     [DEFAULT]
     debug = true
-    pdebug = false
 
 .. code-block:: bash
 
@@ -27,6 +33,7 b' You can also set the log level, the foll'
     Instance "enterprise-1" successfully stopped.
     Instance "enterprise-1" successfully started.
 
+
 Debug and Logging Configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -47,7 +54,7 b' the ``debug`` level.'
     ### LOGGING CONFIGURATION   ####
     ################################
     [loggers]
-    keys = root, sqlalchemy, rhodecode, ssh_wrapper
+    keys = root, sqlalchemy, beaker, celery, rhodecode, ssh_wrapper
 
     [handlers]
     keys = console, console_sql, file, file_rotating
@@ -62,11 +69,16 b' the ``debug`` level.'
     level = NOTSET
     handlers = console
 
-    [logger_routes]
+    [logger_sqlalchemy]
+    level = INFO
+    handlers = console_sql
+    qualname = sqlalchemy.engine
+    propagate = 0
+
+    [logger_beaker]
     level = DEBUG
     handlers =
-    qualname = routes.middleware
-    ## "level = DEBUG" logs the route matched and routing variables.
+    qualname = beaker.container
     propagate = 1
 
     [logger_rhodecode]
@@ -75,11 +87,16 b' the ``debug`` level.'
     qualname = rhodecode
     propagate = 1
 
-    [logger_sqlalchemy]
-    level = INFO
-    handlers = console_sql
-    qualname = sqlalchemy.engine
-    propagate = 0
+    [logger_ssh_wrapper]
+    level = DEBUG
+    handlers =
+    qualname = ssh_wrapper
+    propagate = 1
+
+    [logger_celery]
+    level = DEBUG
+    handlers =
+    qualname = celery
 
     ##############
     ## HANDLERS ##
@@ -87,19 +104,19 b' the ``debug`` level.'
 
     [handler_console]
     class = StreamHandler
-    args = (sys.stderr,)
-    level = INFO
+    args = (sys.stderr, )
+    level = DEBUG
     formatter = generic
 
     [handler_console_sql]
     class = StreamHandler
-    args = (sys.stderr,)
-    level = WARN
+    args = (sys.stderr, )
+    level = INFO
     formatter = generic
 
     [handler_file]
     class = FileHandler
-    args = ('rhodecode.log', 'a',)
+    args = ('rhodecode_debug.log', 'a',)
     level = INFO
     formatter = generic
 
@@ -107,6 +124,25 b' the ``debug`` level.'
     class = logging.handlers.TimedRotatingFileHandler
     # 'D', 5 - rotate every 5days
     # you can set 'h', 'midnight'
-    args = ('rhodecode.log', 'D', 5, 10,)
+    args = ('rhodecode_debug_rotated.log', 'D', 5, 10,)
     level = INFO
     formatter = generic
+
+    ################
+    ## FORMATTERS ##
+    ################
+
+    [formatter_generic]
+    class = rhodecode.lib.logging_formatter.ExceptionAwareFormatter
+    format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
+    datefmt = %Y-%m-%d %H:%M:%S
+
+    [formatter_color_formatter]
+    class = rhodecode.lib.logging_formatter.ColorFormatter
+    format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
+    datefmt = %Y-%m-%d %H:%M:%S
+
+    [formatter_color_formatter_sql]
+    class = rhodecode.lib.logging_formatter.ColorFormatterSql
+    format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
+    datefmt = %Y-%m-%d %H:%M:%S
  No newline at end of file

docs/admin/glossary.rst

@@ -33,7 +33,7 b' Glossary'
         Adding more machines or workers into your pool of resources.
 
     Instance
-        A single installed version of one of the |RC| products. It could
+        A single installed version of one of the RhodeCode products. It could
         refer to |RCE| or the VCS server depending on the context.
 
     Plugin

docs/admin/indexing.rst

@@ -3,7 +3,7 b''
 Full-text Search
 ----------------
 
-By default |RC| is configured to use `Whoosh`_ to index |repos| and
+By default RhodeCode is configured to use `Whoosh`_ to index |repos| and
 provide full-text search.
 
 |RCE| also provides support for `Elasticsearch`_ as a backend for scalable
@@ -46,7 +46,7 b' Configure the ``.rhoderc`` File'
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 |RCT| uses the :file:`/home/{user}/.rhoderc` file for connection details
-to |RCM| instances. If this file is not automatically created,
+to |RCE| instances. If this file is not automatically created,
 you can configure it using the following example. You need to configure the
 details for each instance you want to index.
 
@@ -62,7 +62,7 b' details for each instance you want to in'
      - VERSION: 1.5.0
      - URL: http://127.0.0.1:10000
 
-To get your API Token, on the |RCM| interface go to
+To get your API Token, on the |RCE| interface go to
 :menuselection:`username --> My Account --> Auth tokens`
 
 .. code-block:: ini

docs/admin/public-access.rst

@@ -3,7 +3,7 b''
 Public Access
 -------------
 
-By default |RCM| allows users to read all **public** |repos|. User
+By default |RCE| allows users to read all **public** |repos|. User
 permissions and |repo| access can be configured explicitly,
 and those permissions will override any default settings. The default
 settings can be found under the following section:

docs/admin/repo-extra-fields.rst

@@ -7,7 +7,7 b' Extra fields attached to a |repo| allow '
 each repository. This allows storing custom data per-repository.
 
 It can be used in :ref:`integrations-webhook` or in |RCX|.
-To install and read more about |RCX|, see the :ref:`install-rcx` section.
+To read more about |RCX|, see the :ref:`integrations-rcextensions` section.
 
 
 Enabling Extra Fields

docs/admin/repo-hooks.rst

@@ -46,11 +46,6 b' This is the complete list of |repos| hoo'
 Using Repository Hooks
 ----------------------
 
-To use these hooks you need to install |RCX|. For more information, see the
-:ref:`install-rcx` section.
+To use these hooks you need to setup |RCX|. For more information, see the
+:ref:`integrations-rcextensions` section.
 
-Creating Extensions
--------------------
-
-To create your own extensions using these hooks, see the :ref:`dev-plug`
-section.

docs/admin/setting-default-permissions.rst

@@ -3,7 +3,7 b''
 Setting Default Permissions
 ---------------------------
 
-Default permissions allow you to configure |RCM| so that when a new |repo|, user group,
+Default permissions allow you to configure |RCE| so that when a new |repo|, user group,
 or user is created their permissions are already defined. To set default permissions you need administrator
 privileges. See the following sections for setting up your permissions system:
 
@@ -19,7 +19,7 b' Setting User defaults'
 
 To set default user permissions, use the following steps.
 
-1. From the |RCM| interface, select :menuselection:`Admin --> Permissions`
+1. From the |RCE| interface, select :menuselection:`Admin --> Permissions`
 2. Select the :guilabel:`Global` tab from the left-hand menu. The permissions
    set on this screen apply to users and user-groups across the whole instance.
 3. Save your changes
@@ -31,7 +31,7 b' Setting User Group defaults'
 
 To set default user group permissions, use the following steps.
 
-1. From the |RCM| interface, select :menuselection:`Admin --> User groups`
+1. From the |RCE| interface, select :menuselection:`Admin --> User groups`
 2. Select :guilabel:`Permissions`, and configure the default user
    permissions. All users will get these permissions unless
    individually set.
@@ -48,7 +48,7 b' Setting Repository defaults'
 
 To set default |repo| permissions, use the following steps.
 
-1. From the |RCM| interface, select :menuselection:`Admin --> Permissions`
+1. From the |RCE| interface, select :menuselection:`Admin --> Permissions`
 2. Select the :guilabel:`Object` tab from the left-hand menu and set the
    |perm| permissions
 3. Save your changes
@@ -60,7 +60,7 b' Setting Repository Group defaults'
 
 To set default Repository Group permissions, use the following steps.
 
-1. From the |RCM| interface, select :menuselection:`Admin --> Repository Groups`
+1. From the |RCE| interface, select :menuselection:`Admin --> Repository Groups`
 2. Select :guilabel:`Edit` beside the |repo| group you wish to configure
 3. On the left-hand pane select :guilabel:`Permissions`
 4. Set the default permissions for all |repos| created in this group

docs/admin/setting-repo-perms.rst

@@ -3,12 +3,12 b''
 Repository Administration
 =========================
 
-Repository permissions in |RCM| can be managed in a number of different ways.
+Repository permissions in |RCE| can be managed in a number of different ways.
 This overview should give you an insight into how you could adopt particular
 settings for your needs:
 
 * Global |repo| permissions: This allows you to set the default permissions
-  for each new |repo| created within |RCM|, see :ref:`repo-default-ref`. All
+  for each new |repo| created within |RCE|, see :ref:`repo-default-ref`. All
   |repos| created will inherit these permissions unless explicitly configured.
 * Individual |repo| permissions: To set individual |repo| permissions,
   see :ref:`set-repo-perms`.

docs/admin/svn-http.rst

@@ -18,13 +18,14 b' Prerequisites'
 .. tip::
 
    We recommend using Wandisco repositories which provide latest SVN versions
-   for most platforms.
+   for most platforms. If you skip this version you'll have to ensure the Client version
+   is compatible with installed SVN version which might differ depending on the operating system.
    Here is an example how to add the Wandisco repositories for Ubuntu.
 
     .. code-block:: bash
 
-        $ sudo sh -c 'echo "deb http://opensource.wandisco.com/ubuntu `lsb_release -cs` svn19" >> /etc/apt/sources.list.d/subversion19.list'
-        $ sudo wget -q http://opensource.wandisco.com/wandisco-debian.gpg -O- | sudo apt-key add -
+        $ sudo sh -c 'echo "deb http://opensource.wandisco.com/ubuntu `lsb_release -cs` svn110" >> /etc/apt/sources.list.d/subversion110.list'
+        $ sudo wget -q http://opensource.wandisco.com/wandisco-debian-new.gpg -O- | sudo apt-key add -
         $ sudo apt-get update
 
     Here is an example how to add the Wandisco repositories for Centos/Redhat. Using
@@ -46,7 +47,7 b' Example installation of required compone'
 .. code-block:: bash
 
     $ sudo apt-get install apache2
-    $ sudo apt-get install libapache2-mod-svn
+    $ sudo apt-get install libapache2-svn
 
 Once installed you need to enable ``dav_svn`` on Ubuntu:
 
@@ -76,6 +77,12 b' Once installed you need to enable ``dav_'
     LoadModule headers_module     modules/mod_headers.so
     LoadModule authn_anon_module  modules/mod_authn_anon.so
 
+.. tip::
+
+   To check the installed mod_dav_svn module version, you can use such command.
+
+   `strings /usr/lib/apache2/modules/mod_dav_svn.so | grep 'Powered by'`
+
 
 Configuring Apache Setup
 ========================

docs/admin/system-overview.rst

@@ -59,7 +59,7 b' Supported Browsers'
 System Requirements
 -------------------
 
-|RCM| performs best on machines with ultra-fast hard disks. Generally disk
+|RCE| performs best on machines with ultra-fast hard disks. Generally disk
 performance is more important than CPU performance. In a corporate production
 environment handling 1000s of users and |repos| you should deploy on a 12+
 core 64GB RAM server. In short, the more RAM the better.
@@ -68,7 +68,7 b' core 64GB RAM server. In short, the more'
 For example:
 
  - for team of 1 - 5 active users you can run on 1GB RAM machine with 1CPU
- - above 250 active users, |RCM| needs at least 8GB of memory.
+ - above 250 active users, |RCE| needs at least 8GB of memory.
    Number of CPUs is less important, but recommended to have at least 2-3 CPUs
 
 
@@ -114,7 +114,7 b' Connection Methods'
 
 * HTTPS
 * SSH
-* |RCM| API
+* |RCE| API
 
 Internationalization Support
 ----------------------------

docs/admin/tuning-scale-horizontally-cluster.rst

@@ -146,7 +146,7 b' persistent sessions across nodes. Please'
 
 .. code-block:: ini
 
-    # use an unique generated long string
+    # use a unique generated long string
     beaker.session.secret = 70e116cae2274656ba7265fd860aebbd
 
 3) Configure stored cached/archive cache to our shared NFS `rc-node-1`

docs/admin/user-admin.rst

@@ -3,7 +3,7 b''
 User Administration
 ===================
 
-|RCM| enables you to define permissions for the following entities within the
+|RCE| enables you to define permissions for the following entities within the
 system; **users**, **user groups**, **repositories**, **repository groups**.
 
 Within each one of these entities you can set default settings,

docs/admin/vcs-server.rst

@@ -3,13 +3,13 b''
 VCS Server Management
 ---------------------
 
-The VCS Server handles |RCM| backend functionality. You need to configure
-a VCS Server to run with a |RCM| instance. If you do not, you will be missing
-the connection between |RCM| and its |repos|. This will cause error messages
+The VCS Server handles |RCE| backend functionality. You need to configure
+a VCS Server to run with a |RCE| instance. If you do not, you will be missing
+the connection between |RCE| and its |repos|. This will cause error messages
 on the web interface. You can run your setup in the following configurations,
 currently the best performance is one of following:
 
-* One VCS Server per |RCM| instance.
+* One VCS Server per |RCE| instance.
 * One VCS Server handling multiple instances.
 
 .. important::
@@ -49,7 +49,7 b' To configure a |RCE| instance to use a V'
 |RCE| VCS Server Options
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-The following list shows the available options on the |RCM| side of the
+The following list shows the available options on the |RCE| side of the
 connection to the VCS Server. The settings are configured per
 instance in the
 :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file.
@@ -75,7 +75,7 b' instance in the'
 
     \vcs.server <host:port>
         Set the host, either hostname or IP Address, and port of the VCS server
-        you wish to run with your |RCM| instance.
+        you wish to run with your |RCE| instance.
 
 .. code-block:: ini
 

docs/api/api.rst

@@ -22,12 +22,12 b' API access can also be turned on for eac'
 decorated with a `@LoginRequired` decorator. To enable API access, change
 the standard login decorator to `@LoginRequired(api_access=True)`.
 
-From |RCM| version 1.7.0 you can configure a white list
+From |RCE| version 1.7.0 you can configure a white list
 of views that have API access enabled by default. To enable these,
-edit the |RCM| configuration ``.ini`` file. The default location is:
+edit the |RCE| configuration ``.ini`` file. The default location is:
 
-* |RCM| Pre-2.2.7 :file:`root/rhodecode/data/production.ini`
-* |RCM| 3.0 :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini`
+* |RCE| Pre-2.2.7 :file:`root/rhodecode/data/production.ini`
+* |RCE| 3.0 :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini`
 
 To configure the white list, edit this section of the file. In this
 configuration example, API access is granted to the patch/diff raw file and

docs/auth/auth-crowd.rst

@@ -5,8 +5,8 b' Crowd'
 
 To enable Crowd authentication, use the following steps:
 
-1. From the |RCM| interface, go to :menuselection:`Admin --> Authentication`
-2. Enable the ``rhodecode.lib.auth_modules.auth_crowd`` library and select
+1. From the |RCE| interface, go to :menuselection:`Admin --> Authentication`
+2. Activate the ``rhodecode.lib.auth_modules.auth_crowd`` library and select
    :guilabel:`Save`
 3. On the Crowd plugin settings section, do the following:
 

docs/auth/auth-ldap-groups.rst

@@ -3,25 +3,24 b''
 LDAP/AD With User Groups Sync
 -----------------------------
 
-|RCM| supports LDAP (Lightweight Directory Access Protocol) or
+**This plugin is available only in EE Edition.**
+
+|RCE| supports LDAP (Lightweight Directory Access Protocol) or
 AD (active Directory) authentication.
-All LDAP versions are supported, with the following |RCM| plugins managing each:
-
-* For LDAP/AD with user group sync use ``LDAP + User Groups (egg:rhodecode-enterprise-ee#ldap_group)``
+All LDAP versions are currently supported.
 
 RhodeCode reads all data defined from plugin and creates corresponding
 accounts on local database after receiving data from LDAP. This is done on
 every user log-in including operations like pushing/pulling/checkout.
 In addition group membership is read from LDAP and following operations are done:
 
-- automatic addition of user to |RCM| user group
-- automatic removal of user from any other  |RCM| user groups not specified in LDAP.
+- automatic addition of user to |RCE| user group
+- automatic removal of user from any other  |RCE| user groups not specified in LDAP.
   The removal is done *only* on groups that are marked to be synced from ldap.
   This setting can be changed in advanced settings on user groups
-- automatic creation of user groups if they aren't yet existing in |RCM|
+- automatic creation of user groups if they aren't yet existing in |RCE|
 - marking user as super-admins if he is a member of any admin group defined in plugin settings
 
-This plugin is available only in EE Edition.
 
 .. important::
 
@@ -39,11 +38,12 b' LDAP Configuration Steps'
 
 To configure |LDAP|, use the following steps:
 
-1. From the |RCM| interface, select
+1. From the |RCE| interface, select
    :menuselection:`Admin --> Authentication`
-2. Enable the ldap+ groups plugin and select :guilabel:`Save`
-3. Select the :guilabel:`Enabled` check box in the plugin configuration section
-4. Add the required LDAP information and :guilabel:`Save`, for more details,
+2. Activate the `LDAP + User Groups` plugin and select :guilabel:`Save`
+3. Go to newly available menu option called `LDAP + User Groups` on the left side.
+4. Check the `enabled` check box in the plugin configuration section,
+   and fill in the required LDAP information and :guilabel:`Save`, for more details,
    see :ref:`config-ldap-groups-examples`
 
 For a more detailed description of LDAP objects, see :ref:`ldap-gloss-ref`:
@@ -52,59 +52,107 b' For a more detailed description of LDAP '
 
 Example LDAP configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. code-block:: bash
+
+Below is example setup that can be used with Active Directory and LDAP server with groups sync::
+
+    *option*: `enabled` => `True`
+    # Enable or disable this authentication plugin.
+
+    *option*: `cache_ttl` => `360`
+    # Amount of seconds to cache the authentication and permissions check response call for this plugin.
+    # Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled).
+
+    *option*: `host` => `192.168.245.143,192.168.1.240`
+    # Host[s] of the LDAP Server
+    # (e.g., 192.168.2.154, or ldap-server.domain.com.
+    #  Multiple servers can be specified using commas
+
+    *option*: `port` => `389`
+    # Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)
+
+    *option*: `timeout` => `300`
+    # Timeout for LDAP connection
+
+    *option*: `dn_user` => `[e-mail]`
+    # Optional user DN/account to connect to LDAP if authentication is required.
+    # e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or [e-mail]
+
+    *option*: `dn_pass` => `SomeSecret`
+    # Password to authenticate for given user DN.
+
+    *option*: `tls_kind` => `PLAIN`
+    # TLS Type
+
+    *option*: `tls_reqcert` => `NEVER`
+    # Require Cert over TLS?. Self-signed and custom certificates can be used when
+    #  `RhodeCode Certificate` found in admin > settings > system info page is extended.
+
+    *option*: `tls_cert_file` => ``
+    # This specifies the PEM-format file path containing certificates for use in TLS connection.
+    # If not specified `TLS Cert dir` will be used
+
+    *option*: `tls_cert_dir` => `/etc/openldap/cacerts`
+    # This specifies the path of a directory that contains individual CA certificates in separate files.
+
+    *option*: `base_dn` => `dc=rhodecode,dc=com`
+    # Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials
+    # (e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)
+
+    *option*: `user_search_base` => `ou=RC-Users`
+    # User search base will extend the Base DN
+    # (e.g., ou=Users will result in ou=Users,dc=mydomain,dc=com root DN)
 
-        # Auth Cache TTL, Defines the caching for authentication to offload LDAP server.
-        # This means that cache result will be saved for 3600 before contacting LDAP server to verify the user access
-        3600
-        # Host, comma seperated format is optionally possible to specify more than 1 server
-        https://ldap1.server.com/ldap-admin/,https://ldap2.server.com/ldap-admin/
-        # Default LDAP Port, use 689 for LDAPS
-        389
-        # Account, used for SimpleBind if LDAP server requires an authentication
-        e.g [e-mail]
-        # Password used for simple bind
-        ldap-user-password
-        # LDAP connection security
-        LDAPS
-        # Certificate checks level
-        DEMAND
-        # Base DN
-        cn=Rufus Magillacuddy,ou=users,dc=rhodecode,dc=com
-        # User Search Base
-        ou=groups,ou=users
-        # LDAP search filter to narrow the results
-        (objectClass=person)
-        # LDAP search scope
-        SUBTREE
-        # Login attribute
-        sAMAccountName
-        # First Name Attribute to read
-        givenName
-        # Last Name Attribute to read
-        sn
-        # Email Attribute to read email address from
-        mail
-        # group extraction method
-        rfc2307bis
-        # Group search base
-        ou=RC-Groups
-        # Group Name Attribute, field to read the group name from
-        sAMAAccountName
-        # User Member of Attribute, field in which groups are stored
-        memberOf
-        # LDAP Group Search Filter, allows narrowing the results
+    *option*: `user_search_filter` => ``
+    # Filter to narrow results
+    # (e.g., (&(objectCategory=Person)(objectClass=user)), or
+    # (memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))
+
+    *option*: `search_scope` => `SUBTREE`
+    # How deep to search LDAP. If unsure set to SUBTREE
+
+    *option*: `attr_login` => `sAMAccountName`
+    # LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)
+
+    *option*: `attr_email` => `mail`
+    # LDAP Attribute to map to email address (e.g., mail).
+    # Emails are a crucial part of RhodeCode.
+    # If possible add a valid email attribute to ldap users.
+
+    *option*: `attr_firstname` => `givenName`
+    # LDAP Attribute to map to first name (e.g., givenName)
+
+    *option*: `attr_lastname` => `sn`
+    # LDAP Attribute to map to last name (e.g., sn)
+
+    *option*: `group_extraction_type` => `rfc2307bis`
+    # With rfc2307, group members are listed by name in the memberUid attribute
+    # With rfc2307bis (Microsoft AD compatible) group members are listed by DN and stored in the member attribute
 
-        # Admin Groups. Comma separated list of groups. If user is member of
-        # any of those he will be marked as super-admin in RhodeCode
-        admins, management
+    *option*: `group_search_base` => `ou=RC-Groups`
+    # Group search base will extend the Base DN (e.g. ou=Groups will result in ou=Groups,dc=mydomain,dc=com)
 
+    *option*: `group_name_attr` => `sAMAccountName`
+    # LDAP Attribute to map to group name (e.g., cn, or sAMAccountName)
+
+    *option*: `user_member_of` => `memberOf`
+    # Users Attribute used to fetch the group membership.
+    # Use if users have stored group membership inside their attributes
+    # (e.g., memberOf, or userMemberOf)
 
-Below is example setup that can be used with Active Directory and ldap groups.
+    *option*: `group_search_filter` => ``
+    # Filter to narrow results (e.g., (&(objectCategory=Group)(objectClass=group)), etc)
+
+    *option*: `group_member_of` => `memberOf`
+    # LDAP Attribute used to resolve the parent group (e.g., memberOf)
 
-.. image:: ../images/ldap-groups-example.png
-   :alt: LDAP/AD setup example
-   :scale: 50 %
+    *option*: `admin_groups` => `Admins,Management`
+    # A comma separated list of group names that identify users as RhodeCode Administrators (e.g., admins)
+
+    *option*: `admin_groups_sync` => `full`
+    # Way to sync Admin groups.
+    # Full means admin flag is set to on or off according to membership in administrator group defined above.
+    # On-only means the flag is only set to on, and not turned off once user is no longer a member
+
 
 .. toctree::
 

docs/auth/auth-ldap.rst

@@ -3,11 +3,9 b''
 LDAP/AD
 -------
 
-|RCM| supports LDAP (Lightweight Directory Access Protocol) or
+|RCE| supports LDAP (Lightweight Directory Access Protocol) or
 AD (active Directory) authentication.
-All LDAP versions are supported, with the following |RCM| plugins managing each:
-
-* For LDAP or Active Directory use ``LDAP (egg:rhodecode-enterprise-ce#ldap)``
+All LDAP versions are currently supported.
 
 RhodeCode reads all data defined from plugin and creates corresponding
 accounts on local database after receiving data from LDAP. This is done on
@@ -30,11 +28,12 b' LDAP Configuration Steps'
 
 To configure |LDAP|, use the following steps:
 
-1. From the |RCM| interface, select
+1. From the |RCE| interface, select
    :menuselection:`Admin --> Authentication`
-2. Enable the ldap plugin and select :guilabel:`Save`
-3. Select the :guilabel:`Enabled` check box in the plugin configuration section
-4. Add the required LDAP information and :guilabel:`Save`, for more details,
+2. Activate the `LDAP` plugin and select :guilabel:`Save`
+3. Go to newly available menu option called `LDAP` on the left side.
+4. Check the `enabled` check box in the plugin configuration section,
+   and fill in the required LDAP information and :guilabel:`Save`, for more details,
    see :ref:`config-ldap-examples`
 
 For a more detailed description of LDAP objects, see :ref:`ldap-gloss-ref`:
@@ -43,44 +42,73 b' For a more detailed description of LDAP '
 
 Example LDAP configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. code-block:: bash
+
+Below is example setup that can be used with Active Directory/LDAP server::
+
+    *option*: `enabled` => `True`
+    # Enable or disable this authentication plugin.
+
+    *option*: `cache_ttl` => `360`
+    # Amount of seconds to cache the authentication and permissions check response call for this plugin.
+    # Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled).
+
+    *option*: `host` => `192.168.245.143,192.168.1.240`
+    # Host[s] of the LDAP Server
+    # (e.g., 192.168.2.154, or ldap-server.domain.com.
+    #  Multiple servers can be specified using commas
+
+    *option*: `port` => `389`
+    # Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)
+
+    *option*: `timeout` => `300`
+    # Timeout for LDAP connection
+
+    *option*: `dn_user` => `[e-mail]`
+    # Optional user DN/account to connect to LDAP if authentication is required.
+    # e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or [e-mail]
+
+    *option*: `dn_pass` => `SomeSecret`
+    # Password to authenticate for given user DN.
+
+    *option*: `tls_kind` => `PLAIN`
+    # TLS Type
 
-        # Auth Cache TTL, Defines the caching for authentication to offload LDAP server.
-        # This means that cache result will be saved for 3600 before contacting LDAP server to verify the user access
-        3600
-        # Host, comma seperated format is optionally possible to specify more than 1 server
-        https://ldap1.server.com/ldap-admin/,https://ldap2.server.com/ldap-admin/
-        # Default LDAP Port, use 689 for LDAPS
-        389
-        # Account, used for SimpleBind if LDAP server requires an authentication
-        e.g [e-mail]
-        # Password used for simple bind
-        ldap-user-password
-        # LDAP connection security
-        LDAPS
-        # Certificate checks level
-        DEMAND
-        # Base DN
-        cn=Rufus Magillacuddy,ou=users,dc=rhodecode,dc=com
-        # LDAP search filter to narrow the results
-        (objectClass=person)
-        # LDAP search scope
-        SUBTREE
-        # Login attribute
-        sAMAccountName
-        # First Name Attribute to read
-        givenName
-        # Last Name Attribute to read
-        sn
-        # Email Attribute to read email address from
-        mail
+    *option*: `tls_reqcert` => `NEVER`
+    # Require Cert over TLS?. Self-signed and custom certificates can be used when
+    #  `RhodeCode Certificate` found in admin > settings > system info page is extended.
+
+    *option*: `tls_cert_file` => ``
+    # This specifies the PEM-format file path containing certificates for use in TLS connection.
+    # If not specified `TLS Cert dir` will be used
+
+    *option*: `tls_cert_dir` => `/etc/openldap/cacerts`
+    # This specifies the path of a directory that contains individual CA certificates in separate files.
+
+    *option*: `base_dn` => `cn=Rufus Magillacuddy,ou=users,dc=rhodecode,dc=com`
+    # Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials
+    # (e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)
 
+    *option*: `filter` => `(objectClass=person)`
+    # Filter to narrow results
+    # (e.g., (&(objectCategory=Person)(objectClass=user)), or
+    # (memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))
 
-Below is example setup that can be used with Active Directory/LDAP server.
+    *option*: `search_scope` => `SUBTREE`
+    # How deep to search LDAP. If unsure set to SUBTREE
+
+    *option*: `attr_login` => `sAMAccountName`
+    # LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)
 
-.. image:: ../images/ldap-example.png
-   :alt: LDAP/AD setup example
-   :scale: 50 %
+    *option*: `attr_email` => `mail`
+    # LDAP Attribute to map to email address (e.g., mail).
+    # Emails are a crucial part of RhodeCode.
+    # If possible add a valid email attribute to ldap users.
+
+    *option*: `attr_firstname` => `givenName`
+    # LDAP Attribute to map to first name (e.g., givenName)
+
+    *option*: `attr_lastname` => `sn`
+    # LDAP Attribute to map to last name (e.g., sn)
 
 
 .. toctree::

docs/auth/auth-pam.rst

@@ -5,8 +5,8 b' PAM'
 
 To enable PAM authentication, use the following steps:
 
-1. From the |RCM| interface, go to :menuselection:`Admin --> Authentication`
-2. Enable the ``rhodecode.lib.auth_modules.auth_pam`` library and select save
+1. From the |RCE| interface, go to :menuselection:`Admin --> Authentication`
+2. Activate the ``rhodecode.lib.auth_modules.auth_pam`` library and select save
 3. On the PAM plugin settings section, do the following:
 
    * Check the :guilabel:`Enable` checkbox

docs/auth/auth-token.rst

@@ -3,7 +3,10 b''
 Authentication Tokens
 ---------------------
 
-|RCE| has 4 different kinds of authentication tokens.
+|RCE| has 4 different kinds of authentication tokens. `API token`, `Feed tokens` work
+without a need to enable any additional authentication. `VCS tokens` require dedicated
+authentication plugin to be activated. `Web Interface tokens` are controlled by the
+white_list configuration.
 
 * *API tokens*: API tokens can only be used to execute |RCE| API operations.
   You can store your API token and assign it to each instance in
@@ -11,15 +14,7 b' Authentication Tokens'
   example in :ref:`indexing-ref` section for more details.
 
 * *Feed tokens*: The feed token can only be used to access the RSS feed.
-   Usually those are safe to store inside your RSS feed reader.
-
-* *VCS tokens*: You can use these to authenticate with |git|, |hg| and |svn|
-  operations instead of a password. They are designed to be used with
-  CI Servers or other third party tools that require |repo| access.
-  They are also a good replacement for SSH based access.
-  To use these tokens you need be enabled special authentication method on
-  |RCE|, as they are disabled by default.
-  See :ref:`enable-vcs-tokens`.
+  Usually those are safe to store inside your RSS feed reader.
 
 * *Web Interface tokens*: These token allows users to access the web
   interface of |RCE| without logging in.
@@ -41,7 +36,16 b' Authentication Tokens'
    https://rhodecode.com/repo/archive/tip.zip?auth_token=<web-api-token>
 
    # To show commit diff without logging into Web UI
-   https://rhodecode.com/repo/changeset-diff/<sha>?auth_token=<web-api-token>
+   https://rhodecode.com/repo/raw-diff/<sha>?auth_token=<web-api-token>
+
+* *VCS tokens*: You can use these to authenticate with |git|, |hg| and |svn|
+  operations instead of a password. They are designed to be used with
+  CI Servers or other third party tools that require |repo| access.
+  They are also a good replacement for SSH based access.
+  To use these tokens you need be enabled special authentication method on
+  |RCE|, as they are disabled by default.
+  See :ref:`enable-vcs-tokens`.
+
 
 .. _enable-vcs-tokens:
 
@@ -51,7 +55,7 b' Enabling VCS Tokens'
 To enable VCS Tokens, use the following steps:
 
 1. Go to :menuselection:`Admin --> Authentication`.
-2. Enable the ``rhodecode.lib.auth_modules.auth_token`` plugin.
+2. Activate the ``rhodecode.lib.auth_modules.auth_token`` plugin.
 3. Click :guilabel:`Save`.
 
 Authentication Token Tips
@@ -67,7 +71,7 b' Creating Tokens'
 
 To create authentication tokens for an user, use the following steps:
 
-1. From the |RCM| interface go to
+1. From the |RCE| interface go to
    :menuselection:`Username --> My Account --> Auth tokens`.
 
 2. Label and Add the tokens you wish to use with |RCE|.

docs/auth/auth.rst

@@ -4,29 +4,31 b' Authentication Options'
 ======================
 
 |RCE| provides a built in authentication against its own database. This is
-implemented using ``rhodecode.lib.auth_rhodecode`` plugin. This plugin is
-enabled by default.
+implemented using ``RhodeCode Internal`` plugin. This plugin is enabled by default.
 Additionally, |RCE| provides a Pluggable Authentication System. This gives the
 administrator greater control over how users authenticate with the system.
 
 .. important::
 
-  You can disable the built in |RCM| authentication plugin
-  ``rhodecode.lib.auth_rhodecode`` and force all authentication to go
+  You can disable the built in |RCE| authentication plugin
+  ``RhodeCode Internal`` and force all authentication to go
   through your authentication plugin of choice e.g LDAP only.
   However, if you do this, and your external authentication tools fails,
-  you will be unable to access |RCM|.
+  accessing |RCE| will be blocked unless a fallback plugin is
+  enabled via :file: rhodecode.ini
 
-|RCM| comes with the following user authentication management plugins:
+
+|RCE| comes with the following user authentication management plugins:
 
 
 .. toctree::
 
+    auth-token
     auth-ldap
     auth-ldap-groups
+    auth-saml-generic
+    auth-saml-onelogin
+    auth-saml-duosecurity
     auth-crowd
     auth-pam
-    auth-token
     ssh-connection
-
-

docs/auth/ldap-active-directory.rst

@@ -3,27 +3,73 b''
 Active Directory
 ----------------
 
-|RCM| can use Microsoft Active Directory for user authentication. This is
+|RCE| can use Microsoft Active Directory for user authentication. This is
 done through an LDAP or LDAPS connection to Active Directory. Use the
 following example LDAP configuration setting to set your Active Directory
-authentication.
-
-.. code-block:: ini
-    
-    # Set the Base DN
-    Base DN              = OU=SBSUsers,OU=Users,OU=MyBusiness,DC=v3sys,DC=local
-    # Set the Active Directory SAM-Account-Name
-    Login Attribute      = sAMAccountName
-    # Set the Active Directory user name
-    First Name Attribute = usernameame
-    # Set the Active Directory user surname
-    Last Name Attribute  = user_surname
-    # Set the Active Directory user email
-    E-mail Attribute     = userEmail
+authentication::
 
 
-Below is example setup that can be used with Active Directory and ldap groups.
+    *option*: `enabled` => `True`
+    # Enable or disable this authentication plugin.
+
+    *option*: `cache_ttl` => `360`
+    # Amount of seconds to cache the authentication and permissions check response call for this plugin.
+    # Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled).
+
+    *option*: `host` => `192.168.245.143,192.168.1.240`
+    # Host[s] of the LDAP Server
+    # (e.g., 192.168.2.154, or ldap-server.domain.com.
+    #  Multiple servers can be specified using commas
+
+    *option*: `port` => `389`
+    # Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)
+
+    *option*: `timeout` => `300`
+    # Timeout for LDAP connection
+
+    *option*: `dn_user` => `[e-mail]`
+    # Optional user DN/account to connect to LDAP if authentication is required.
+    # e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or [e-mail]
+
+    *option*: `dn_pass` => `SomeSecret`
+    # Password to authenticate for given user DN.
+
+    *option*: `tls_kind` => `PLAIN`
+    # TLS Type
+
+    *option*: `tls_reqcert` => `NEVER`
+    # Require Cert over TLS?. Self-signed and custom certificates can be used when
+    #  `RhodeCode Certificate` found in admin > settings > system info page is extended.
 
-.. image:: ../images/ldap-groups-example.png
-   :alt: LDAP/AD setup example
-   :scale: 50 %
  No newline at end of file
+    *option*: `tls_cert_file` => ``
+    # This specifies the PEM-format file path containing certificates for use in TLS connection.
+    # If not specified `TLS Cert dir` will be used
+
+    *option*: `tls_cert_dir` => `/etc/openldap/cacerts`
+    # This specifies the path of a directory that contains individual CA certificates in separate files.
+
+    *option*: `base_dn` => `OU=SBSUsers,OU=Users,OU=MyBusiness,DC=v3sys,DC=local`
+    # Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials
+    # (e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)
+
+    *option*: `filter` => `(objectClass=person)`
+    # Filter to narrow results
+    # (e.g., (&(objectCategory=Person)(objectClass=user)), or
+    # (memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))
+
+    *option*: `search_scope` => `SUBTREE`
+    # How deep to search LDAP. If unsure set to SUBTREE
+
+    *option*: `attr_login` => `sAMAccountName`
+    # LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)
+
+    *option*: `attr_email` => `userEmail`
+    # LDAP Attribute to map to email address (e.g., mail).
+    # Emails are a crucial part of RhodeCode.
+    # If possible add a valid email attribute to ldap users.
+
+    *option*: `attr_firstname` => `user_firstname`
+    # LDAP Attribute to map to first name (e.g., givenName)
+
+    *option*: `attr_lastname` => `user_surname`
+    # LDAP Attribute to map to last name (e.g., sn)

docs/auth/ldap-authentication.rst

@@ -46,7 +46,7 b' The following LDAP attributes are requir'
 * The LDAP username or account used to connect to |RCE|. This will be added
   to the LDAP filter for locating the user object.
 * For example, if an LDAP filter is specified as `LDAPFILTER`,
-  the login attribute is specified as `uid`, and the user connects as
+  the login/username attribute is specified as `uid`, and the user connects as
   `jsmith`, then the LDAP Filter will be like the following example.
       
 .. code-block:: vim
@@ -68,7 +68,7 b' The following LDAP attributes are requir'
 Optional settings
 ^^^^^^^^^^^^^^^^^
 
-The following are optional when enabling LDAP on |RCM|
+The following are optional when enabling LDAP on |RCE|
  
 * An LDAP account is only required if the LDAP server does not allow
   anonymous browsing of records.
@@ -104,10 +104,4 b' The following are optional when enabling'
    following directory: `/etc/openldap/cacerts`
 
 
-Below is example setup that can be used with Active Directory and ldap groups.
-
-.. image:: ../images/ldap-groups-example.png
-   :alt: LDAP/AD setup example
-   :scale: 50 %
-
 .. _RFC 2254: http://www.rfc-base.org/rfc-2254.html
  No newline at end of file

docs/code-review/code-review.rst

@@ -3,7 +3,7 b''
 Code Review
 ===========
 
-|RCM| provides two ways in which you can review code. You can review |prs| or
+|RCE| provides two ways in which you can review code. You can review |prs| or
 commits. To better understand |prs|, see the :ref:`pull-requests-ref`
 and :ref:`collaborate-ref` sections. For more information about why
 code review matters, see these posts on the topic:

docs/code-review/review-diffs.rst

@@ -16,7 +16,7 b' review purposes.'
 Reviewing Changes
 -----------------
 
-|RCM| displays all code changes made with each commit. Removed content is
+|RCE| displays all code changes made with each commit. Removed content is
 marked in red and new content in green.
 
 .. image:: ../images/plain-diff.png

docs/collaboration/approve-pull-request.rst

@@ -10,7 +10,7 b' 3. Leave a commit message that outlines '
 4. Set the review status to :guilabel:`Approved`
 5. Select :guilabel:`Comment`
 
-If you approve the |pr|, you will be able to merge automatically if |RCM|
+If you approve the |pr|, you will be able to merge automatically if |RCE|
 detects that it can do so safely. You will see this message:
 
 :guilabel:`This pull request can be automatically merged.`

docs/collaboration/collaboration.rst

@@ -7,7 +7,7 b' Collaboration'
 
    Forking and branching does not work with |svn| |repos|.
 
-Collaboration in |RCM| is accomplished through a combination of the following
+Collaboration in |RCE| is accomplished through a combination of the following
 functions:
 
 .. only:: latex

docs/collaboration/forks-branches.rst

@@ -55,7 +55,7 b' on the web interface. To branch a |git| '
     $ git commit -a -m "ghost script: initial file"
     $ git push
 
-Once it is pushed to the |RCM| server, you can switch to the newly created
+Once it is pushed to the |RCE| server, you can switch to the newly created
 branch using the following steps:
 
 1. Select :menuselection:`Admin --> Repositories`.

docs/collaboration/mention-reviewer-function.rst

@@ -4,7 +4,7 b' Using Notifications'
 -------------------
 
 To notify users of items that require their attention you can use the mention
-function. The mention function allows you to use ``@username`` within |RCM|.
+function. The mention function allows you to use ``@username`` within |RCE|.
 The notification function can be used within the following
 items to highlight their need for attention:
   

docs/collaboration/merge-pull-request.rst

@@ -3,7 +3,7 b''
 Merge a |pr|
 ------------
 
-|RCM| can detect if it can automatically merge the changes in a |pr|. If it
+|RCE| can detect if it can automatically merge the changes in a |pr|. If it
 can, you will see the following message:
 :guilabel:`This pull request can be automatically merged.` To merge,
 click the big blue button! To enable this feature, see :ref:`server-side-merge`.
@@ -21,7 +21,7 b' messages:'
 Manual Merge a |PR|
 ^^^^^^^^^^^^^^^^^^^
 
-If |RCM| cannot safely merge the changes in a |pr|,
+If |RCE| cannot safely merge the changes in a |pr|,
 usually due to conflicts, you need to manually merge the changes on the
 command line. You can see more information for each |repo| type at the
 following links:

docs/collaboration/notifications-overview.rst

@@ -1,7 +1,7 b''
 Notifications Overview
 ----------------------
 
-|RCM| has an integrated notification system which alerts users to requests
+|RCE| has an integrated notification system which alerts users to requests
 that they have received. Notifications can occur for the following reasons:
 
 * Pull request reviews

docs/collaboration/pull-req-mgmt.rst

@@ -3,7 +3,7 b' Pull request management'
 
 .. only:: html
 
-    There are two ways of tracking |prs| within |RCM|.
+    There are two ways of tracking |prs| within |RCE|.
 
     1. :ref:`prs-your-review`
     2. :ref:`prs-per-repo`
@@ -15,7 +15,7 b' Pull requests for your review'
 
 To view pull requests for your review, use the following steps:
 
-1. From the |RCM| interface, Select
+1. From the |RCE| interface, Select
    :menuselection:`username --> Notifications`
 2. Select :guilabel:`Pull Requests`
 

docs/collaboration/review-pull-request.rst

@@ -20,7 +20,7 b' 3. Set the review status from one of the'
 4. Select Comment
 
 When the |pr| is approved by all reviewers you will be able to merge
-automatically if |RCM| detects that it can do so safely. You will see this
+automatically if |RCE| detects that it can do so safely. You will see this
 message: `This pull request can be automatically merged.`
 
 If rejected, you can fix the issues raised during review and then update the

docs/collaboration/supported-workflows.rst

@@ -1,7 +1,7 b''
 Supported Workflows
 -------------------
 
-|RCM| can be used to develop using a variety of different workflows.
+|RCE| can be used to develop using a variety of different workflows.
 
 * Centralized, using |svn|, |git|, or |hg| |repos|
 * Feature-Branch, using |git| or |hg| |repos|

docs/common.py

@@ -20,10 +20,7 b" rst_epilog = '''"
 .. |psf| replace:: Python Software Foundation
 .. |repo| replace:: repository
 .. |repos| replace:: repositories
-.. |RCI| replace:: RhodeCode Control
 .. |RCC| replace:: RhodeCode Control
-.. |RCV| replace:: RhodeCode Enterprise
-.. |RCM| replace:: RhodeCode Enterprise
 .. |RCE| replace:: RhodeCode Enterprise
 .. |RCCE| replace:: RhodeCode Community
 .. |RCEE| replace:: RhodeCode Enterprise
@@ -31,6 +28,5 b" rst_epilog = '''"
 .. |RCT| replace:: RhodeCode Tools
 .. |RCEBOLD| replace:: **RhodeCode Enterprise**
 .. |RCEITALICS| replace:: `RhodeCode Enterprise`
-.. |RC| replace:: RhodeCode
 .. |RNS| replace:: Release Notes
 '''

docs/extensions/extensions-hooks.rst

@@ -18,7 +18,7 b' so to clarify what is meant each time, r'
 Hooks
 -----
 
-Within |RCM| there are two types of supported hooks.
+Within |RCE| there are two types of supported hooks.
 
 * **Internal built-in hooks**: The internal |hg|, |git| or |svn| hooks are
   triggered by different VCS operations, like push, pull,

docs/index.rst

@@ -1,13 +1,13 b''
-|RCM|
+|RCE|
 =====
 
-|RCM| is a high-performance source code management and collaboration system.
+|RCE| is a high-performance source code management and collaboration system.
 It enables you to develop projects securely behind the firewall while
 providing collaboration tools that work with |git|, |hg|,
 and |svn| |repos|. The user interface allows you to create, edit,
 and commit files and |repos| while managing their security permissions.
 
-|RCM| provides the following features:
+|RCE| provides the following features:
 
 * Source code management.
 * Extended permissions management.
@@ -18,7 +18,7 b' and commit files and |repos| while manag'
 * Web-based hook management.
 * Native |svn| support.
 * Migration from existing databases.
-* |RCM| SDK.
+* |RCE| SDK.
 * Built-in analytics
 * Built in integrations including: Slack, Webhooks (used for Jenkins/TeamCity and other CIs), Jira, Redmine, Hipchat
 * Pluggable authentication system.

docs/install/install-database.rst

@@ -5,8 +5,24 b' Supported Databases'
 
 .. important::
 
-   We do not recommend using SQLite in a production environment. It is
-   supported by |RCE| for evaluation purposes.
+   We do not recommend using SQLite in a production environment of more than 5 people.
+   It is not suited for higher usage and mayb cause problems.
+
+
+|RCE| supports the following databases. The recommended encoding is UTF-8.
+
+.. only:: latex
+
+   * :ref:`install-sqlite-database`
+   * :ref:`install-mysql-database`
+   * :ref:`install-postgresql-database`
+
+.. toctree::
+
+   using-mysql
+   using-postgresql
+   using-sqllite
+
 
 Database Overview
 -----------------
@@ -48,21 +64,3 b' following example to configure the corre'
      # for the RCE instance you are installing
      Database name: example-db-name-for-2xx # The 2xx version database
      Database name: example-db-name-for-3xx # The 3xx version database
-
-Supported Databases
--------------------
-
-|RCM| supports the following databases. The recommended encoding is Unicode
-UTF-8.
-
-.. only:: latex
-
-   * :ref:`install-sqlite-database`
-   * :ref:`install-mysql-database`
-   * :ref:`install-postgresql-database`
-
-.. toctree::
-
-   using-mysql
-   using-postgresql
-   using-sqllite

docs/install/install-steps.rst

@@ -4,7 +4,7 b' Post Installation Tasks'
 =======================
 
 The following tasks are the most common post installation requirements. Use
-the information in these sections to configure your instance of |RCM|.
+the information in these sections to configure your instance of |RCE|.
 
 .. toctree::
 

docs/install/migrate-repos.rst

@@ -3,21 +3,21 b''
 Migrating |repos|
 -----------------
 
-If you have installed |RCM| and have |repos| that you wish to migrate into
+If you have installed |RCE| and have |repos| that you wish to migrate into
 the system, use the following instructions.
 
-1. On the |RCM| interface, check your |repo| storage location under
+1. On the |RCE| interface, check your |repo| storage location under
    :menuselection:`Admin --> Settings --> System Info`. For example,
    Storage location: /home/{username}/repos.
 
-2. Copy the |repos| that you want |RCM| to manage to this location.
+2. Copy the |repos| that you want |RCE| to manage to this location.
 3. Remap and rescan the |repos|, see :ref:`remap-rescan`
 
 .. important::
 
-   Directories create |repo| groups inside |RCM|.
+   Directories create |repo| groups inside |RCE|.
 
-   Importing adds |RCM| git hooks to your |repos|.
+   Importing adds |RCE| git hooks to your |repos|.
 
    You should verify if custom ``.hg`` or ``.hgrc`` files inside
-   repositories should be adjusted since |RCM| reads the content of them.
+   repositories should be adjusted since |RCE| reads the content of them.

docs/install/quick-start.rst

@@ -27,9 +27,12 b' 2. Run the |RCC| installer and accept th'
 
 .. code-block:: bash
 
-    $ chmod 755 RhodeCode-installer-linux-*
+    $ chmod +x RhodeCode-installer-linux-*
     $ ./RhodeCode-installer-linux-*
 
+    Do you accept the RhodeCode Control license?
+    Press [Y] to accept license and [V] to view license text: y
+
 3. Install a VCS Server, and configure it to start at boot.
 
 .. code-block:: bash

docs/install/setup-email.rst

@@ -3,12 +3,12 b''
 Set up Email
 ------------
 
-To setup email with your |RCM| instance, open the default
+To setup email with your |RCE| instance, open the default
 :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini`
 file and uncomment and configure the email section. If it is not there,
 use the below example to insert it.
 
-Once configured you can check the settings for your |RCM| instance on the
+Once configured you can check the settings for your |RCE| instance on the
 :menuselection:`Admin --> Settings --> Email` page.
 
 .. code-block:: ini

docs/install/using-mysql.rst

@@ -4,15 +4,15 b' MySQL or MariaDB'
 ----------------
 
 To use a MySQL or MariaDB database you should install and configure the
-database before installing |RCM|. This is because during |RCM| installation
+database before installing |RCE|. This is because during |RCE| installation
 you will setup a connection to your MySQL or MariaDB database. To work with
 either, use the following steps:
 
 1. Depending on your |os|, install a MySQL or MariaDB database following the
    appropriate instructions from the `MySQL website`_ or `MariaDB website`_.
 2. Configure the database with a username and password which you will use
-   with |RCM|.
-3. Install |RCM|, and during installation select MySQL as your database.
+   with |RCE|.
+3. Install |RCE|, and during installation select MySQL as your database.
 4. Enter the following information during the database setup:
 
    * Your network IP Address

docs/install/using-postgresql.rst

@@ -4,15 +4,15 b' PostgreSQL'
 ----------
 
 To use a PostgreSQL database, you should install and configure the database
-before installing |RCV|. This is because during |RCV| installation you will
+before installing |RCE|. This is because during |RCE| installation you will
 setup the connection to your PostgreSQL database. To work with PostgreSQL,
 use the following steps:
 
 1. Depending on your |os|, install a PostgreSQL database following the
    appropriate instructions from the `PostgreSQL website`_.
 2. Configure the database with a username and password, which you will use
-   with |RCV|.
-3. Install |RCV|, and during installation select PostgreSQL as your database.
+   with |RCE|.
+3. Install |RCE|, and during installation select PostgreSQL as your database.
 4. Enter the following information during the database setup:
 
    * Your network IP Address

docs/install/using-sqllite.rst

@@ -9,15 +9,15 b' SQLite'
     as it has an internal locking mechanism which can become a performance
     bottleneck when there are more than 5 concurrent users.
 
-|RCM| installs SQLite as the default database if you do not specify another
+|RCE| installs SQLite as the default database if you do not specify another
 during installation. SQLite is suitable for small teams,
 projects with a low load, and evaluation purposes since it is built into
-|RCM| and does not require any additional database server.
+|RCE| and does not require any additional database server.
 
 Using MySQL or PostgreSQL in an large setup gives you much greater
 performance, and while migration tools exist to move from one database type
 to another, it is better to get it right first time and to immediately use
-MySQL or PostgreSQL when you deploy |RCM| in a production environment.
+MySQL or PostgreSQL when you deploy |RCE| in a production environment.
 
 Migrating From SQLite to PostgreSQL
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

docs/integrations/integrations.rst

@@ -11,20 +11,20 b' different Slack channels, for example.'
 Supported integrations
 ^^^^^^^^^^^^^^^^^^^^^^
 
-================================    ============    ========================================
-Type/Name                           |RC| Edition    Description
-================================    ============    ========================================
-:ref:`integrations-webhook`         |RCCEshort|     Trigger events as `json` to a custom url
-:ref:`integrations-slack`           |RCCEshort|     Integrate with https://slack.com/
-:ref:`integrations-hipchat`         |RCCEshort|     Integrate with https://www.hipchat.com/
-:ref:`integrations-email`           |RCCEshort|     Send repo push commits by email
-:ref:`integrations-ci`              |RCCEshort|     Trigger Builds for Common CI Systems
-:ref:`integrations-rcextensions`    |RCCEshort|     Advanced low-level integration framework
+================================    ==================    ========================================
+Type/Name                           RhodeCode Edition     Description
+================================    ==================    ========================================
+:ref:`integrations-webhook`         |RCCEshort|           Trigger events as `json` to a custom url
+:ref:`integrations-slack`           |RCCEshort|           Integrate with https://slack.com/
+:ref:`integrations-hipchat`         |RCCEshort|           Integrate with https://www.hipchat.com/
+:ref:`integrations-email`           |RCCEshort|           Send repo push commits by email
+:ref:`integrations-ci`              |RCCEshort|           Trigger Builds for Common CI Systems
+:ref:`integrations-rcextensions`    |RCCEshort|           Advanced low-level integration framework
 
-:ref:`integrations-jenkins`         |RCEEshort|     Trigger Builds for Jenkins CI System
-:ref:`integrations-redmine`         |RCEEshort|     Close/Resolve/Reference Redmine issues
-:ref:`integrations-jira`            |RCEEshort|     Close/Resolve/Reference JIRA issues
-================================    ============    ========================================
+:ref:`integrations-jenkins`         |RCEEshort|           Trigger Builds for Jenkins CI System
+:ref:`integrations-redmine`         |RCEEshort|           Close/Resolve/Reference Redmine issues
+:ref:`integrations-jira`            |RCEEshort|           Close/Resolve/Reference JIRA issues
+================================    ==================    ========================================
 
 .. _creating-integrations:
 

docs/issue-trackers/issue-trackers.rst

@@ -9,7 +9,7 b' You can set an issue tracker connection '
 * At the |repo| level, you can configure an integration with a different issue
   tracker.
 
-To integrate |RCM| with an issue tracker, you need to define a regular
+To integrate |RCE| with an issue tracker, you need to define a regular
 expression that will fetch the issue ID stored in commit messages, and replace
 it with a URL. This enables |RCE| to generate a link matching each issue to the
 target |repo|.

docs/known-issues/error-msg-guide.rst

@@ -7,7 +7,7 b' Error Message'
 Error creating repository repo-name
 
 Cause
-As of |RCM| 3.0, a VCS Server is required to run backend operations.
+As of |RCE| 3.0, a VCS Server is required to run backend operations.
 
 Solution
 Install a VCS Server. See the `Install a VCS Server`_ section of |RCC|

docs/nix/nix.rst

@@ -3,7 +3,7 b''
 Nix Packaging
 =============
 
-|RCM| is installed using |Nix Package Manager|. The Nix environment provides
+|RCE| is installed using |Nix Package Manager|. The Nix environment provides
 the following features for maintenance and deployment:
 
 * Atomic upgrades and rollbacks

docs/python-packages-generated.nix

@@ -5,11 +5,11 b''
 
 self: super: {
   "alabaster" = super.buildPythonPackage {
-    name = "alabaster-0.7.11";
+    name = "alabaster-0.7.12";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/3f/46/9346ea429931d80244ab7f11c4fce83671df0b7ae5a60247a2b588592c46/alabaster-0.7.11.tar.gz";
-      sha256 = "1mvm69xsn5xf1jc45kdq1mn0yq0pfn54mv2jcww4s1vwqx6iyfxn";
+      url = "https://files.pythonhosted.org/packages/cc/b4/ed8dcb0d67d5cfb7f83c4d5463a7614cb1d078ad7ae890c9143edebbf072/alabaster-0.7.12.tar.gz";
+      sha256 = "00nwwjj2d2ym4s2kk217x7jkx1hnczc3fvm8yxbqmsp6b0nxfqd6";
     };
   };
   "babel" = super.buildPythonPackage {
@@ -24,11 +24,11 b' self: super: {'
     };
   };
   "certifi" = super.buildPythonPackage {
-    name = "certifi-2018.8.24";
+    name = "certifi-2018.11.29";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/e1/0f/f8d5e939184547b3bdc6128551b831a62832713aa98c2ccdf8c47ecc7f17/certifi-2018.8.24.tar.gz";
-      sha256 = "0f0nhrj9mlrf79iway4578wrsgmjh0fmacl9zv8zjckdy7b90rip";
+      url = "https://files.pythonhosted.org/packages/55/54/3ce77783acba5979ce16674fc98b1920d00b01d337cfaaf5db22543505ed/certifi-2018.11.29.tar.gz";
+      sha256 = "1dvccavd2fzq4j37w0sznylp92ps14zi6gvlxzm23in0yhzciya7";
     };
   };
   "chardet" = super.buildPythonPackage {
@@ -83,31 +83,31 b' self: super: {'
     };
   };
   "packaging" = super.buildPythonPackage {
-    name = "packaging-17.1";
+    name = "packaging-18.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."pyparsing"
       self."six"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/77/32/439f47be99809c12ef2da8b60a2c47987786d2c6c9205549dd6ef95df8bd/packaging-17.1.tar.gz";
-      sha256 = "0nrpayk8kij1zm9sjnk38ldz3a6705ggvw8ljylqbrb4vmqbf6gh";
+      url = "https://files.pythonhosted.org/packages/cf/50/1f10d2626df0aa97ce6b62cf6ebe14f605f4e101234f7748b8da4138a8ed/packaging-18.0.tar.gz";
+      sha256 = "01wq9c53ix5rz6qg2c98gy8n4ff768rmanifm8m5jpjiaizj51h8";
     };
   };
   "pygments" = super.buildPythonPackage {
-    name = "pygments-2.2.0";
+    name = "pygments-2.3.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
-      sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
+      url = "https://files.pythonhosted.org/packages/63/a2/91c31c4831853dedca2a08a0f94d788fc26a48f7281c99a303769ad2721b/Pygments-2.3.0.tar.gz";
+      sha256 = "1z34ms51dh4jq4h3cizp7vd1dmsxcbvffkjsd2xxfav22nn6lrl2";
     };
   };
   "pyparsing" = super.buildPythonPackage {
-    name = "pyparsing-2.2.0";
+    name = "pyparsing-2.3.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/3c/ec/a94f8cf7274ea60b5413df054f82a8980523efd712ec55a59e7c3357cf7c/pyparsing-2.2.0.tar.gz";
-      sha256 = "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8";
+      url = "https://files.pythonhosted.org/packages/d0/09/3e6a5eeb6e04467b737d55f8bba15247ac0876f98fae659e58cd744430c6/pyparsing-2.3.0.tar.gz";
+      sha256 = "14k5v7n3xqw8kzf42x06bzp184spnlkya2dpjyflax6l3yrallzk";
     };
   };
   "pytz" = super.buildPythonPackage {
@@ -119,7 +119,7 b' self: super: {'
     };
   };
   "requests" = super.buildPythonPackage {
-    name = "requests-2.19.1";
+    name = "requests-2.20.1";
     doCheck = false;
     propagatedBuildInputs = [
       self."chardet"
@@ -128,16 +128,16 b' self: super: {'
       self."certifi"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/54/1f/782a5734931ddf2e1494e4cd615a51ff98e1879cbe9eecbdfeaf09aa75e9/requests-2.19.1.tar.gz";
-      sha256 = "0snf8xxdzsgh1x2zv3vilvbrv9jbpmnfagzzb1rjmmvflckdh8pc";
+      url = "https://files.pythonhosted.org/packages/40/35/298c36d839547b50822985a2cf0611b3b978a5ab7a5af5562b8ebe3e1369/requests-2.20.1.tar.gz";
+      sha256 = "0qzj6cgv3k9wyj7wlxgz7xq0cfg4jbbkfm24pp8dnhczwl31527a";
     };
   };
   "setuptools" = super.buildPythonPackage {
-    name = "setuptools-40.2.0";
+    name = "setuptools-40.6.2";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/ef/1d/201c13e353956a1c840f5d0fbf0461bd45bbd678ea4843ebf25924e8984c/setuptools-40.2.0.zip";
-      sha256 = "19ng5m7kigllg3x96c91y3a2k28g6kwnbb1v4warrnp4xma1v227";
+      url = "https://files.pythonhosted.org/packages/b0/d1/8acb42f391cba52e35b131e442e80deffbb8d0676b93261d761b1f0ef8fb/setuptools-40.6.2.zip";
+      sha256 = "0r2c5hapirlzm34h7pl1lgkm6gk7bcrlrdj28qgsvaqg3f74vfw6";
     };
   };
   "six" = super.buildPythonPackage {
@@ -157,7 +157,7 b' self: super: {'
     };
   };
   "sphinx" = super.buildPythonPackage {
-    name = "sphinx-1.7.8";
+    name = "sphinx-1.8.2";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
@@ -175,8 +175,8 b' self: super: {'
       self."typing"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/ac/54/4ef326d0c654da1ed91341a7a1f43efc18a8c770ddd2b8e45df97cb79d82/Sphinx-1.7.8.tar.gz";
-      sha256 = "1ryz0w4c31930f1br2sjwrxwx9cmsy7cqdb0d81g98n9bj250w50";
+      url = "https://files.pythonhosted.org/packages/4c/ea/7388faba7cf02999e1bc42f6a8eb1ea0120aec3dd93474cee21cea2d693f/Sphinx-1.8.2.tar.gz";
+      sha256 = "1sia2h5rfzy76rbsd69ghr8bbidhsjzzinf3f523dcmivp5k41qj";
     };
   };
   "sphinx-rtd-theme" = super.buildPythonPackage {
@@ -207,11 +207,11 b' self: super: {'
     };
   };
   "urllib3" = super.buildPythonPackage {
-    name = "urllib3-1.23";
+    name = "urllib3-1.24.1";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/3c/d2/dc5471622bd200db1cd9319e02e71bc655e9ea27b8e0ce65fc69de0dac15/urllib3-1.23.tar.gz";
-      sha256 = "1bvbd35q3zdcd7gsv38fwpizy7p06dr0154g5gfybrvnbvhwb2m6";
+      url = "https://files.pythonhosted.org/packages/b1/53/37d82ab391393565f2f831b8eedbffd57db5a718216f82f1a8b4d381a1c1/urllib3-1.24.1.tar.gz";
+      sha256 = "08lwd9f3hqznyf32vnzwvp87pchx062nkbgyrf67rwlkgj0jk5fy";
     };
   };
 

docs/release-notes/release-notes-3.0.0.rst

@@ -1,7 +1,7 b''
 |RCE| 3.0.0 |RNS|
 -----------------
 
-As |RCM| 3.0 is a big release, the release notes have been split into the following sections:
+As |RCE| 3.0 is a big release, the release notes have been split into the following sections:
 
 * :ref:`general-rn-ref`
 * :ref:`security-rn-ref`

docs/release-notes/release-notes.rst

@@ -9,6 +9,7 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.15.0.rst
    release-notes-4.14.1.rst
    release-notes-4.14.0.rst
    release-notes-4.13.3.rst

docs/requirements_docs.txt

@@ -1,8 +1,8 b''
-sphinx==1.7.8
+sphinx==1.8.2
 six==1.11.0
 sphinx_rtd_theme==0.4.1
 docutils==0.14.0
-pygments==2.2.0
+pygments==2.3.0
 markupsafe==1.0.0
 jinja2==2.9.6
 pytz==2018.4

docs/tools/install-tools.rst

@@ -44,10 +44,10 b' following example:'
 Installing |RCT|
 ^^^^^^^^^^^^^^^^
 
-|RCT| enable you to automate many of the most common |RCM| functions through
+|RCT| enable you to automate many of the most common |RCE| functions through
 the API. Installing them on a local machine lets you carry out maintenance on
 the server remotely. Once installed you can use them to index your |repos|
-to setup full-text search, strip commits, or install |RC| Extensions for
+to setup full-text search, strip commits, or install RhodeCode Extensions for
 additional functionality.
 
 For more detailed instructions about using |RCT| for indexing and full-text

docs/tools/rhodecode-tools.rst

@@ -3,7 +3,7 b''
 |RCT|
 =====
 
-|RCT| enable you to automate many of the most common |RCM| functions through
+|RCT| enable you to automate many of the most common |RCE| functions through
 the API.
 
 .. toctree::

docs/tools/tools-cli.rst

@@ -16,7 +16,7 b' rhodecode-tools'
 ---------------
 
 Use |RCT| to setup automation, run the indexer, and install extensions for
-your |RCM| instances. Options:
+your |RCE| instances. Options:
 
 .. rst-class:: dl-horizontal
 
@@ -49,7 +49,7 b' Example usage:'
 rhodecode-api
 -------------
 
-The |RC| API lets you connect to |RCE| and carry out management tasks from a
+The RhodeCode API lets you connect to |RCE| and carry out management tasks from a
 remote machine, for more information about the API, see the :ref:`api`. To
 pass arguments on the command-line use the ``method:option`` syntax.
 
@@ -117,7 +117,7 b' Options:'
 rhodecode-cleanup-gists
 -----------------------
 
-Use this to delete gists within |RCM|. Options:
+Use this to delete gists within |RCE|. Options:
 
 .. rst-class:: dl-horizontal
 
@@ -166,7 +166,7 b' Example usage:'
 rhodecode-cleanup-repos
 -----------------------
 
-Use this to manage |repos| and |repo| groups within |RCM|. Options:
+Use this to manage |repos| and |repo| groups within |RCE|. Options:
 
 .. rst-class:: dl-horizontal
 
@@ -280,7 +280,7 b' the using :ref:`integrations-rcextension'
 rhodecode-gist
 --------------
 
-Use this to create, list, show, or delete gists within |RCM|. Options:
+Use this to create, list, show, or delete gists within |RCE|. Options:
 
 .. rst-class:: dl-horizontal
 

docs/tools/tools-overview.rst

@@ -7,7 +7,7 b' To install |RCT| correctly, see the inst'
 :ref:`install-tools`, and :ref:`config-rhoderc`.
 
 Once |RCT| is installed, and the :file:`/home/{user}/.rhoderc` file is
-configured you can then use |RCT| on each |RCM| instance to carry out admin
+configured you can then use |RCT| on each |RCE| instance to carry out admin
 tasks. Use the following example to configure that file,
 and once configured see the :ref:`tools-cli` for more details.
 

docs/tutorials/deploy-from-host.rst

@@ -95,10 +95,10 b' but below is the example shortcut.'
 
     # Check that the script is uploaded to your home directory
     $ ls -1
-    RhodeCode-installer-linux-391_b1a804c4d69b_d6c087d520e3
+    RhodeCode-installer-linux-buildYYYYXXXX_ZZZZ
 
     # Change the script permissions
-    $ chmod 755 RhodeCode-installer-linux*
+    $ chmod +x RhodeCode-installer-linux*
 
     # Run the installer and accept the prompts
     $ ./RhodeCode-installer-linux-*

docs/tutorials/git-lfs-ext.rst

@@ -7,13 +7,13 b''
 Git Large File Storage (or LFS) is a new, open-source extension to Git that
 aims to improve handling of large files. It does this by replacing large files
 in your repository—such as graphics and videos—with simple text pointers.
-|RC| Server includes an embedded LFS object store server, allowing storage of
+RhodeCode Server includes an embedded LFS object store server, allowing storage of
 large files without the need for an external object store.
 Git LFS is disabled by default, globally, and for each individual repository.
 
 .. note::
 
-    |RC| implements V2 API of Git LFS. Please make sure your git client is
+    RhodeCode implements V2 API of Git LFS. Please make sure your git client is
     using the latest version (2.0.X recommended) to leverage full feature set
     of the V2 API.
 
@@ -22,7 +22,7 b' Git LFS is disabled by default, globally'
 Enabling Git LFS
 ++++++++++++++++
 
-Git LFS is disabled by default within |RC| Server.
+Git LFS is disabled by default within RhodeCode Server.
 
 To enable Git LFS Globally:
 
@@ -87,7 +87,7 b' size in bytes. For example::'
 
 
 The object itself will be uploaded to a separate location via the Git LFS Batch API.
-The transfer is validated and authorized by |RC| server itself.
+The transfer is validated and authorized by RhodeCode server itself.
 
 If give repository has Git LFS disabled, a proper message will be sent back to
 the client and upload of LFS objects will be forbidden.

docs/tutorials/hg-large-ext.rst

@@ -13,7 +13,7 b' of the current revision. This saves both'
 Enabling HG Largefiles
 ++++++++++++++++++++++
 
-Mercurial Largefiles extension is disabled by default within |RC| Server.
+Mercurial Largefiles extension is disabled by default within RhodeCode Server.
 
 To enable Mercurial Largefiles Globally:
 

docs/tutorials/windows-to-linux.rst

@@ -25,7 +25,7 b' Pre-requisites'
 * For MySQL, do not use `localhost` in the database connection string of the
   :file:`rhodecode.ini` file.
 * InnoDB must be the database tables engine.
-* Contact |RC| for a new licence Key/Token pair. If you don't, a trial licence
+* Contact RhodeCode for a new licence Key/Token pair. If you don't, a trial licence
   will be applied so you are not locked out of the upgraded instance.
 
 You can find the specific instructions to carry out these pre-requisite steps

docs/usage/basic-vcs-commands.rst

@@ -3,19 +3,19 b''
 Getting Started with VCS
 ------------------------
 
-When using |RCM|, you will be working with |git|, |svn| or |hg| |repos| from the
+When using |RCE|, you will be working with |git|, |svn| or |hg| |repos| from the
 command line or using a GUI client such as Tortoise, Tower or SourceTree.
 
-|RCM| uses a standard |git|, |svn| and |hg| protocols. So all tools that
+|RCE| uses a standard |git|, |svn| and |hg| protocols. So all tools that
 can interact with there protocols are supported, including Eclipse or PyCharm
 plugins.
 
 
 If you have never used either before, the following information should
 help you set up your local machine so that you can sync changes with the
-|RCM| server.
+|RCE| server.
 
-All of the following instructions assume you have a |RCM| account,
+All of the following instructions assume you have a |RCE| account,
 and you can access your |repos| from the web interface.
 
 .. note::

docs/usage/file-editing.rst

@@ -3,14 +3,14 b' File Editing'
 
 To edit files using the online editor, use the following steps.
 
-1. From the |RCM| interface, select :menuselection:`Admin --> Repositories`
+1. From the |RCE| interface, select :menuselection:`Admin --> Repositories`
 2. Select the |repo| in which you want to edit a file.
 3. Select the :guilabel:`file` view of the |repo|, and double-click on the file.
 4. To open the editor, select the :guilabel:`edit on branch:default` button.
 
-   * If the filename has an extension |RCM| recognises,
+   * If the filename has an extension |RCE| recognises,
      the syntax highlighting will appear automatically.
-   * If the filename does not have an extension |RCM| recognises,
+   * If the filename does not have an extension |RCE| recognises,
      you can set the language syntax highlighter by
      choosing from the file type drop down menu.
 5. To save your changes, select :guilabel:`Commit changes`

docs/usage/gist-editing.rst

@@ -4,7 +4,7 b' Gist Editing'
 ^^^^^^^^^^^^
 
 Gists are standalone files that only the creator can edit. To work with
-gists, click on the :guilabel:`Gists` tab on the |RCM| header. The gist
+gists, click on the :guilabel:`Gists` tab on the |RCE| header. The gist
 editor also has syntax highlighting.
 
 You can set the following properties for each gist:
@@ -13,7 +13,7 b' You can set the following properties for'
   and will show up in searches.
 * :guilabel:`Gist Lifetime`: You can set a gist to expire after a set
   period by using the :guilabel:`Gist Lifetime` dropdown menu.
-  This means that when the gist expires it will be deleted from the |RCM|
+  This means that when the gist expires it will be deleted from the |RCE|
   gist database.
 * :guilabel:`Private`: This means that the gist will not show up in searches.
 * :guilabel:`Gist access level`: If you create a private gist you can have

docs/usage/online-editing.rst

@@ -1,7 +1,7 b''
 Online Editing
 --------------
 
-|RCM| has an integrated online editor, allowing you to edit files in the
+|RCE| has an integrated online editor, allowing you to edit files in the
 browser. The online editor has syntax highlighting and the ability to fork,
 merge, and commit changes to files.
 

pkgs/node-packages.nix

@@ -13,13 +13,13 b' let'
         sha512 = "tx5TauYSmzsIvmSqepUPDYbs4/Ejz2XbZ1IkD7JEGqkdNUJlh+9KU85G56Tfdk/xjEZ8zorFfN09OSwiMrIQWA==";
       };
     };
-    "@polymer/iron-a11y-announcer-3.0.1" = {
+    "@polymer/iron-a11y-announcer-3.0.2" = {
       name = "_at_polymer_slash_iron-a11y-announcer";
       packageName = "@polymer/iron-a11y-announcer";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polymer/iron-a11y-announcer/-/iron-a11y-announcer-3.0.1.tgz";
-        sha512 = "Xiqmpz0AEEbMNGYPpbrXBIrcI/xaR4tn77pmSLfxVKGGwjEUR/YrRgyIwXp4EN7lvst1dFC8kyl2hLga0uDIVQ==";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@polymer/iron-a11y-announcer/-/iron-a11y-announcer-3.0.2.tgz";
+        sha512 = "LqnMF39mXyxSSRbTHRzGbcJS8nU0NVTo2raBOgOlpxw5yfGJUVcwaTJ/qy5NtWCZLRfa4suycf0oAkuUjHTXHQ==";
       };
     };
     "@polymer/iron-a11y-keys-3.0.1" = {
@@ -229,13 +229,13 b' let'
         sha1 = "e7365648c1b42136a59c7d5040637b3b5c83b614";
       };
     };
-    "@types/node-6.14.0" = {
+    "@types/node-6.14.2" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "6.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-6.14.0.tgz";
-        sha512 = "6tQyh4Q4B5pECcXBOQDZ5KjyBIxRZGzrweGPM47sAYTdVG4+7R+2EGMTmp0h6ZwgqHrFRCeg2gdhsG9xXEl2Sg==";
+      version = "6.14.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-6.14.2.tgz";
+        sha512 = "JWB3xaVfsfnFY8Ofc9rTB/op0fqqTSqy4vBcVk1LuRJvta7KTX+D//fCkiTMeLGhdr2EbFZzQjC97gvmPilk9Q==";
       };
     };
     "@types/parse5-2.2.34" = {
@@ -409,22 +409,22 b' let'
         sha512 = "mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA==";
       };
     };
-    "@webcomponents/shadycss-1.5.2" = {
+    "@webcomponents/shadycss-1.6.0" = {
       name = "_at_webcomponents_slash_shadycss";
       packageName = "@webcomponents/shadycss";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.5.2.tgz";
-        sha512 = "0OyrmVc7S+INtzoqP2ofAo+OdVn2Nj0Qvq4wD9FEGN7nMmLRxaD2mzy6hD6EslzxUSuGH302CDU4KXiY66SEqg==";
-      };
-    };
-    "@webcomponents/webcomponentsjs-2.1.3" = {
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.6.0.tgz";
+        sha512 = "iURGZZU6BaiRJtGgjMn208QxPkY11QwT/VmuHNa4Yb+kJxU/WODe4C8b0LDOtnk4KJzJg50hCfwvPRAjePEzbA==";
+      };
+    };
+    "@webcomponents/webcomponentsjs-2.2.1" = {
       name = "_at_webcomponents_slash_webcomponentsjs";
       packageName = "@webcomponents/webcomponentsjs";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.1.3.tgz";
-        sha512 = "0UHJNY88lR3pnEYtBVT7F8cuuxOiITQGWJa0LxoELqkBSB7IabzJFOj5K99PajD3CGAsWpjB0CAeijfe376Y1w==";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.1.tgz";
+        sha512 = "lZZ+Lkke6JhsJcQQqSVk1Pny6/8y4qhJ98LO7a/MwBSRO8WqHqK1X2vscfeL8vOnYGFnmBUyVG95lwYv/AXyLQ==";
       };
     };
     "@xtuc/ieee754-1.2.0" = {
@@ -499,13 +499,13 b' let'
         sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
       };
     };
-    "ajv-6.5.4" = {
+    "ajv-6.6.1" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.5.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz";
-        sha512 = "4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==";
+      version = "6.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz";
+        sha512 = "ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==";
       };
     };
     "ajv-keywords-3.2.0" = {
@@ -1454,13 +1454,13 b' let'
         sha512 = "DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==";
       };
     };
-    "bluebird-3.5.2" = {
+    "bluebird-3.5.3" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz";
-        sha512 = "dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==";
+      version = "3.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz";
+        sha512 = "/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==";
       };
     };
     "bn.js-4.11.8" = {
@@ -1661,13 +1661,13 b' let'
         sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
       };
     };
-    "camelcase-4.1.0" = {
+    "camelcase-5.0.0" = {
       name = "camelcase";
       packageName = "camelcase";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
-        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz";
+        sha512 = "faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==";
       };
     };
     "caniuse-api-1.6.1" = {
@@ -1679,22 +1679,22 b' let'
         sha1 = "b534e7c734c4f81ec5fbe8aca2ad24354b962c6c";
       };
     };
-    "caniuse-db-1.0.30000900" = {
+    "caniuse-db-1.0.30000912" = {
       name = "caniuse-db";
       packageName = "caniuse-db";
-      version = "1.0.30000900";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000900.tgz";
-        sha512 = "fvicVRDlhHIQpt/bmbLl3hDHKUZb5ZP8O2OuZLz2fSEPlUBbvwwbhhqhGS617ldN6bDoo9A3+MQKQyFq0p7UXA==";
-      };
-    };
-    "caniuse-lite-1.0.30000900" = {
+      version = "1.0.30000912";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000912.tgz";
+        sha512 = "uiepPdHcJ06Na9t15L5l+pp3NWQU4IETbmleghD6tqCqbIYqhHSu7nVfbK2gqPjfy+9jl/wHF1UQlyTszh9tJQ==";
+      };
+    };
+    "caniuse-lite-1.0.30000912" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30000900";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000900.tgz";
-        sha512 = "xDVs8pBFr6bzq9pXUkLKpGQQnzsF/l6/yX38UnCkTcUcwC0rDl1NGZGildcJVTU+uGBxfsyniK/ZWagPNn1Oqw==";
+      version = "1.0.30000912";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000912.tgz";
+        sha512 = "M3zAtV36U+xw5mMROlTXpAHClmPAor6GPKAMD5Yi7glCB5sbMPFtnQ3rGpk4XqPdUrrTIaVYSJZxREZWNy8QJg==";
       };
     };
     "caseless-0.12.0" = {
@@ -1814,13 +1814,13 b' let'
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "clipboard-2.0.1" = {
+    "clipboard-2.0.4" = {
       name = "clipboard";
       packageName = "clipboard";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.1.tgz";
-        sha512 = "7yhQBmtN+uYZmfRjjVjKa0dZdWuabzpSKGtyQZN+9C8xlC788SSJjOHWh7tzurfwTqTD5UDYAhIv5fRJg3sHjQ==";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz";
+        sha512 = "Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==";
       };
     };
     "cliui-2.1.0" = {
@@ -2093,13 +2093,13 b' let'
         sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
       };
     };
-    "copy-webpack-plugin-4.5.4" = {
+    "copy-webpack-plugin-4.6.0" = {
       name = "copy-webpack-plugin";
       packageName = "copy-webpack-plugin";
-      version = "4.5.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz";
-        sha512 = "0lstlEyj74OAtYMrDxlNZsU7cwFijAI3Ofz2fD6Mpo9r4xCv4yegfa3uHIKvZY1NSuOtE9nvG6TAhJ+uz9gDaQ==";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz";
+        sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==";
       };
     };
     "core-js-2.5.7" = {
@@ -2201,13 +2201,13 b' let'
         sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
       };
     };
-    "css-selector-tokenizer-0.7.0" = {
+    "css-selector-tokenizer-0.7.1" = {
       name = "css-selector-tokenizer";
       packageName = "css-selector-tokenizer";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz";
-        sha1 = "e6988474ae8c953477bf5e7efecfceccd9cf4c86";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz";
+        sha512 = "xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==";
       };
     };
     "css-what-2.1.2" = {
@@ -2318,15 +2318,6 b' let'
         sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
       };
     };
-    "decamelize-2.0.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz";
-        sha512 = "Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==";
-      };
-    };
     "decode-uri-component-0.2.0" = {
       name = "decode-uri-component";
       packageName = "decode-uri-component";
@@ -2561,13 +2552,13 b' let'
         sha1 = "3a83a904e54353287874c564b7549386849a98c9";
       };
     };
-    "electron-to-chromium-1.3.82" = {
+    "electron-to-chromium-1.3.85" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.82";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz";
-        sha512 = "NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew==";
+      version = "1.3.85";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.85.tgz";
+        sha512 = "kWSDVVF9t3mft2OHVZy4K85X2beP6c6mFm3teFS/mLSDJpQwuFIWHrULCX+w6H1E55ZYmFRlT+ATAFRwhrYzsw==";
       };
     };
     "elliptic-6.4.1" = {
@@ -2912,13 +2903,13 b' let'
         sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
       };
     };
-    "fastparse-1.1.1" = {
+    "fastparse-1.1.2" = {
       name = "fastparse";
       packageName = "fastparse";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz";
-        sha1 = "d1e2643b38a94d7583b479060e6c4affc94071f8";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz";
+        sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==";
       };
     };
     "favico.js-0.3.10" = {
@@ -3308,13 +3299,13 b' let'
         sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
       };
     };
-    "graceful-fs-4.1.11" = {
+    "graceful-fs-4.1.15" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
-        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
+      version = "4.1.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz";
+        sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==";
       };
     };
     "grunt-0.4.5" = {
@@ -3326,13 +3317,13 b' let'
         sha1 = "56937cd5194324adff6d207631832a9d6ba4e7f0";
       };
     };
-    "grunt-cli-1.3.1" = {
+    "grunt-cli-1.3.2" = {
       name = "grunt-cli";
       packageName = "grunt-cli";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.3.1.tgz";
-        sha512 = "UwBRu/QpAjDc53DRLEkyilFdL0zenpxu+fddTIlsF/KJqdNcHaQmvyu1W3cDesZ9rqqZdKK5A8+QDIyLUEWoZQ==";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.3.2.tgz";
+        sha512 = "8OHDiZZkcptxVXtMfDxJvmN7MVJNE8L/yIcPb4HB7TlyFD1kDvjHrb62uhySsU14wJx9ORMnTuhRMQ40lH/orQ==";
       };
     };
     "grunt-contrib-concat-0.5.1" = {
@@ -4631,13 +4622,13 b' let'
         sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
       };
     };
-    "lru-cache-4.1.3" = {
+    "lru-cache-4.1.5" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz";
-        sha512 = "fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==";
+      version = "4.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
+        sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
       };
     };
     "make-dir-1.3.0" = {
@@ -4658,13 +4649,13 b' let'
         sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==";
       };
     };
-    "map-age-cleaner-0.1.2" = {
+    "map-age-cleaner-0.1.3" = {
       name = "map-age-cleaner";
       packageName = "map-age-cleaner";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz";
-        sha512 = "UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
+        sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==";
       };
     };
     "map-cache-0.2.2" = {
@@ -5261,13 +5252,13 b' let'
         sha512 = "hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==";
       };
     };
-    "pako-1.0.6" = {
+    "pako-1.0.7" = {
       name = "pako";
       packageName = "pako";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz";
-        sha512 = "lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.7.tgz";
+        sha512 = "3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ==";
       };
     };
     "parallel-transform-1.1.0" = {
@@ -5711,13 +5702,13 b' let'
         sha1 = "b2c6a98c0072cf91b932d1a496508114311735bf";
       };
     };
-    "postcss-modules-extract-imports-1.2.0" = {
+    "postcss-modules-extract-imports-1.2.1" = {
       name = "postcss-modules-extract-imports";
       packageName = "postcss-modules-extract-imports";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz";
-        sha1 = "66140ecece38ef06bf0d3e355d69bf59d141ea85";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz";
+        sha512 = "6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==";
       };
     };
     "postcss-modules-local-by-default-1.2.0" = {
@@ -6737,13 +6728,13 b' let'
         sha1 = "04e6926f662895354f3dd015203633b857297e2c";
       };
     };
-    "sshpk-1.15.1" = {
+    "sshpk-1.15.2" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.15.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz";
-        sha512 = "mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==";
+      version = "1.15.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz";
+        sha512 = "Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==";
       };
     };
     "ssri-5.3.0" = {
@@ -6863,6 +6854,15 b' let'
         sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
+    "string_decoder-1.2.0" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz";
+        sha512 = "6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==";
+      };
+    };
     "stringstream-0.0.6" = {
       name = "stringstream";
       packageName = "stringstream";
@@ -6971,22 +6971,22 b' let'
         sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5";
       };
     };
-    "tapable-0.2.8" = {
+    "tapable-0.2.9" = {
       name = "tapable";
       packageName = "tapable";
-      version = "0.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz";
-        sha1 = "99372a5c999bf2df160afc0d74bed4f47948cd22";
-      };
-    };
-    "tapable-1.1.0" = {
+      version = "0.2.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz";
+        sha512 = "2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==";
+      };
+    };
+    "tapable-1.1.1" = {
       name = "tapable";
       packageName = "tapable";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-1.1.0.tgz";
-        sha512 = "IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz";
+        sha512 = "9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==";
       };
     };
     "throttleit-1.0.0" = {
@@ -7007,13 +7007,13 b' let'
         sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
       };
     };
-    "through2-2.0.3" = {
+    "through2-2.0.5" = {
       name = "through2";
       packageName = "through2";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz";
-        sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz";
+        sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==";
       };
     };
     "timers-browserify-2.0.10" = {
@@ -7439,13 +7439,13 b' let'
         sha512 = "1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==";
       };
     };
-    "v8flags-3.0.2" = {
+    "v8flags-3.1.1" = {
       name = "v8flags";
       packageName = "v8flags";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/v8flags/-/v8flags-3.0.2.tgz";
-        sha512 = "6sgSKoFw1UpUPd3cFdF7QGnrH6tDeBgW1F3v9gy8gLY0mlbiBXq8soy8aQpY6xeeCjH5K+JvC62Acp7gtl7wWA==";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz";
+        sha512 = "iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==";
       };
     };
     "vendors-1.0.2" = {
@@ -7628,15 +7628,6 b' let'
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "xregexp-4.0.0" = {
-      name = "xregexp";
-      packageName = "xregexp";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz";
-        sha512 = "PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==";
-      };
-    };
     "xtend-4.0.1" = {
       name = "xtend";
       packageName = "xtend";
@@ -7664,13 +7655,13 b' let'
         sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
-    "yargs-12.0.2" = {
+    "yargs-12.0.5" = {
       name = "yargs";
       packageName = "yargs";
-      version = "12.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz";
-        sha512 = "e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==";
+      version = "12.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz";
+        sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==";
       };
     };
     "yargs-3.10.0" = {
@@ -7682,13 +7673,13 b' let'
         sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
       };
     };
-    "yargs-parser-10.1.0" = {
+    "yargs-parser-11.1.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "10.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz";
-        sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==";
+      version = "11.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz";
+        sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==";
       };
     };
     "yauzl-2.4.1" = {
@@ -7708,7 +7699,7 b' let'
     src = ./..;
     dependencies = [
       sources."@polymer/font-roboto-3.0.2"
-      sources."@polymer/iron-a11y-announcer-3.0.1"
+      sources."@polymer/iron-a11y-announcer-3.0.2"
       sources."@polymer/iron-a11y-keys-3.0.1"
       sources."@polymer/iron-a11y-keys-behavior-3.0.1"
       sources."@polymer/iron-ajax-3.0.1"
@@ -7732,7 +7723,7 b' let'
       sources."@polymer/paper-tooltip-3.0.1"
       sources."@polymer/polymer-3.1.0"
       sources."@types/clone-0.1.30"
-      sources."@types/node-6.14.0"
+      sources."@types/node-6.14.2"
       sources."@types/parse5-2.2.34"
       sources."@webassemblyjs/ast-1.7.10"
       sources."@webassemblyjs/floating-point-hex-parser-1.7.10"
@@ -7752,8 +7743,8 b' let'
       sources."@webassemblyjs/wasm-parser-1.7.10"
       sources."@webassemblyjs/wast-parser-1.7.10"
       sources."@webassemblyjs/wast-printer-1.7.10"
-      sources."@webcomponents/shadycss-1.5.2"
-      sources."@webcomponents/webcomponentsjs-2.1.3"
+      sources."@webcomponents/shadycss-1.6.0"
+      sources."@webcomponents/webcomponentsjs-2.2.1"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.1"
       sources."abbrev-1.1.1"
@@ -7927,7 +7918,7 b' let'
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-3.2.0"
       sources."binary-extensions-1.12.0"
-      sources."bluebird-3.5.2"
+      sources."bluebird-3.5.3"
       sources."bn.js-4.11.8"
       sources."boolbase-1.0.0"
       sources."boom-2.10.1"
@@ -7952,22 +7943,22 b' let'
       (sources."cacache-10.0.4" // {
         dependencies = [
           sources."glob-7.1.3"
-          sources."graceful-fs-4.1.11"
-          sources."lru-cache-4.1.3"
+          sources."graceful-fs-4.1.15"
+          sources."lru-cache-4.1.5"
           sources."minimatch-3.0.4"
           sources."rimraf-2.6.2"
         ];
       })
       sources."cache-base-1.0.1"
       sources."camel-case-3.0.0"
-      sources."camelcase-4.1.0"
+      sources."camelcase-5.0.0"
       (sources."caniuse-api-1.6.1" // {
         dependencies = [
           sources."browserslist-1.7.7"
         ];
       })
-      sources."caniuse-db-1.0.30000900"
-      sources."caniuse-lite-1.0.30000900"
+      sources."caniuse-db-1.0.30000912"
+      sources."caniuse-lite-1.0.30000912"
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
       sources."chalk-0.5.1"
@@ -8017,7 +8008,7 b' let'
           sources."minimatch-3.0.4"
         ];
       })
-      sources."clipboard-2.0.1"
+      sources."clipboard-2.0.4"
       (sources."cliui-4.1.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -8058,7 +8049,7 b' let'
         ];
       })
       sources."copy-descriptor-0.1.1"
-      (sources."copy-webpack-plugin-4.5.4" // {
+      (sources."copy-webpack-plugin-4.6.0" // {
         dependencies = [
           sources."is-glob-4.0.0"
           sources."minimatch-3.0.4"
@@ -8079,18 +8070,14 b' let'
       sources."css-color-names-0.0.4"
       sources."css-loader-0.28.11"
       sources."css-select-1.2.0"
-      (sources."css-selector-tokenizer-0.7.0" // {
+      (sources."css-selector-tokenizer-0.7.1" // {
         dependencies = [
           sources."regexpu-core-1.0.0"
         ];
       })
       sources."css-what-2.1.2"
       sources."cssesc-0.1.0"
-      (sources."cssnano-3.10.0" // {
-        dependencies = [
-          sources."decamelize-1.2.0"
-        ];
-      })
+      sources."cssnano-3.10.0"
       sources."csso-2.3.2"
       sources."cycle-1.0.3"
       sources."cyclist-0.2.2"
@@ -8102,7 +8089,7 b' let'
       sources."date-now-0.1.4"
       sources."dateformat-1.0.2-1.2.3"
       sources."debug-2.6.9"
-      sources."decamelize-2.0.0"
+      sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
       sources."deep-for-each-2.0.3"
       sources."define-properties-1.1.3"
@@ -8139,13 +8126,13 b' let'
         ];
       })
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.82"
+      sources."electron-to-chromium-1.3.85"
       sources."elliptic-6.4.1"
       sources."emojis-list-2.1.0"
       sources."end-of-stream-1.4.1"
       (sources."enhanced-resolve-4.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.11"
+          sources."graceful-fs-4.1.15"
         ];
       })
       sources."entities-1.0.0"
@@ -8203,7 +8190,7 b' let'
       sources."eyes-0.1.8"
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."fastparse-1.1.1"
+      sources."fastparse-1.1.2"
       sources."favico.js-0.3.10"
       sources."faye-websocket-0.4.4"
       sources."fd-slicer-1.0.1"
@@ -8244,12 +8231,12 b' let'
       })
       (sources."fs-extra-1.0.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.11"
+          sources."graceful-fs-4.1.15"
         ];
       })
       (sources."fs-write-stream-atomic-1.0.10" // {
         dependencies = [
-          sources."graceful-fs-4.1.11"
+          sources."graceful-fs-4.1.15"
         ];
       })
       sources."fs.realpath-1.0.0"
@@ -8293,7 +8280,7 b' let'
       sources."good-listener-1.2.2"
       sources."graceful-fs-1.2.3"
       sources."grunt-0.4.5"
-      (sources."grunt-cli-1.3.1" // {
+      (sources."grunt-cli-1.3.2" // {
         dependencies = [
           sources."nopt-4.0.1"
         ];
@@ -8477,7 +8464,7 b' let'
       sources."json5-0.5.1"
       (sources."jsonfile-2.4.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.11"
+          sources."graceful-fs-4.1.15"
         ];
       })
       sources."jsonify-0.0.0"
@@ -8490,14 +8477,14 b' let'
       sources."kind-of-6.0.2"
       (sources."klaw-1.3.1" // {
         dependencies = [
-          sources."graceful-fs-4.1.11"
+          sources."graceful-fs-4.1.15"
         ];
       })
       sources."lazy-cache-1.0.4"
       sources."lcid-2.0.0"
       (sources."less-2.7.3" // {
         dependencies = [
-          sources."graceful-fs-4.1.11"
+          sources."graceful-fs-4.1.15"
         ];
       })
       (sources."liftoff-2.5.0" // {
@@ -8520,7 +8507,7 b' let'
       sources."lru-cache-2.7.3"
       sources."make-dir-1.3.0"
       sources."make-iterator-1.0.1"
-      sources."map-age-cleaner-0.1.2"
+      sources."map-age-cleaner-0.1.3"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."math-expression-evaluator-1.2.17"
@@ -8566,8 +8553,12 b' let'
       sources."no-case-2.3.2"
       (sources."node-libs-browser-2.1.0" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
+          (sources."readable-stream-2.3.6" // {
+            dependencies = [
+              sources."string_decoder-1.1.1"
+            ];
+          })
+          sources."string_decoder-1.2.0"
         ];
       })
       sources."nopt-1.0.10"
@@ -8616,7 +8607,7 b' let'
       sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
-      sources."pako-1.0.6"
+      sources."pako-1.0.7"
       (sources."parallel-transform-1.1.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
@@ -8706,7 +8697,7 b' let'
       sources."postcss-minify-gradients-1.0.5"
       sources."postcss-minify-params-1.2.2"
       sources."postcss-minify-selectors-2.1.1"
-      (sources."postcss-modules-extract-imports-1.2.0" // {
+      (sources."postcss-modules-extract-imports-1.2.1" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.1"
@@ -8783,7 +8774,7 b' let'
       })
       (sources."readdirp-2.2.1" // {
         dependencies = [
-          sources."graceful-fs-4.1.11"
+          sources."graceful-fs-4.1.15"
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
         ];
@@ -8851,7 +8842,7 b' let'
       sources."sax-1.2.4"
       (sources."schema-utils-0.4.7" // {
         dependencies = [
-          sources."ajv-6.5.4"
+          sources."ajv-6.6.1"
         ];
       })
       sources."select-1.1.2"
@@ -8909,7 +8900,7 b' let'
       sources."split-1.0.1"
       sources."split-string-3.1.0"
       sources."sprintf-js-1.0.3"
-      (sources."sshpk-1.15.1" // {
+      (sources."sshpk-1.15.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -8971,10 +8962,10 b' let'
           sources."js-yaml-3.7.0"
         ];
       })
-      sources."tapable-1.1.0"
+      sources."tapable-1.1.1"
       sources."throttleit-1.0.0"
       sources."through-2.3.8"
-      (sources."through2-2.0.3" // {
+      (sources."through2-2.0.5" // {
         dependencies = [
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
@@ -9004,9 +8995,9 b' let'
         dependencies = [
           sources."colors-1.3.2"
           sources."enhanced-resolve-3.4.1"
-          sources."graceful-fs-4.1.11"
+          sources."graceful-fs-4.1.15"
           sources."loader-utils-0.2.17"
-          sources."tapable-0.2.8"
+          sources."tapable-0.2.9"
         ];
       })
       sources."tslib-1.9.3"
@@ -9075,7 +9066,7 b' let'
       sources."utila-0.4.0"
       sources."uuid-3.3.2"
       sources."v8-compile-cache-2.0.2"
-      sources."v8flags-3.0.2"
+      sources."v8flags-3.1.1"
       sources."vendors-1.0.2"
       (sources."verror-1.10.0" // {
         dependencies = [
@@ -9085,13 +9076,13 b' let'
       sources."vm-browserify-0.0.4"
       (sources."watchpack-1.6.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.11"
+          sources."graceful-fs-4.1.15"
         ];
       })
       sources."waypoints-4.0.1"
       (sources."webpack-4.23.1" // {
         dependencies = [
-          sources."ajv-6.5.4"
+          sources."ajv-6.6.1"
         ];
       })
       (sources."webpack-cli-3.1.2" // {
@@ -9119,7 +9110,6 b' let'
           sources."camelcase-1.2.1"
           sources."chalk-1.1.3"
           sources."cliui-2.1.0"
-          sources."decamelize-1.2.0"
           sources."has-ansi-2.0.0"
           sources."strip-ansi-3.0.1"
           sources."supports-color-2.0.0"
@@ -9147,11 +9137,10 b' let'
         ];
       })
       sources."wrappy-1.0.2"
-      sources."xregexp-4.0.0"
       sources."xtend-4.0.1"
       sources."y18n-4.0.0"
       sources."yallist-2.1.2"
-      (sources."yargs-12.0.2" // {
+      (sources."yargs-12.0.5" // {
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
@@ -9160,7 +9149,7 b' let'
           sources."p-try-2.0.0"
         ];
       })
-      sources."yargs-parser-10.1.0"
+      sources."yargs-parser-11.1.1"
       sources."yauzl-2.4.1"
     ];
     buildInputs = globalBuildInputs;

pkgs/python-packages-overrides.nix

@@ -72,7 +72,7 b' self: super: {'
     ];
   });
 
- "nbconvert" = super."nbconvert".override (attrs: {
+  "nbconvert" = super."nbconvert".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       # marcink: plug in jupyter-client for notebook rendering
       self."jupyter-client"
@@ -120,10 +120,12 b' self: super: {'
       pkgs.curl
       pkgs.openssl
     ];
+
     preConfigure = ''
       substituteInPlace setup.py --replace '--static-libs' '--libs'
       export PYCURL_SSL_LIBRARY=openssl
     '';
+
     meta = {
       license = pkgs.lib.licenses.mit;
     };
@@ -168,14 +170,32 b' self: super: {'
     propagatedBuildInputs = [
         pkgs.pam
     ];
+
     # TODO: johbo: Check if this can be avoided, or transform into
     # a real patch
     patchPhase = ''
       substituteInPlace pam.py \
         --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so.0"'
     '';
+
     });
 
+  "python-saml" = super."python-saml".override (attrs: {
+    buildInputs = [
+      pkgs.libxml2
+      pkgs.libxslt
+    ];
+  });
+
+  "dm.xmlsec.binding" = super."dm.xmlsec.binding".override (attrs: {
+    buildInputs = [
+      pkgs.libxml2
+      pkgs.libxslt
+      pkgs.xmlsec
+      pkgs.libtool
+    ];
+  });
+
   "pyzmq" = super."pyzmq".override (attrs: {
     buildInputs = [
       pkgs.czmq

pkgs/python-packages.nix

@@ -5,7 +5,7 b''
 
 self: super: {
   "alembic" = super.buildPythonPackage {
-    name = "alembic-0.9.9";
+    name = "alembic-1.0.5";
     doCheck = false;
     propagatedBuildInputs = [
       self."sqlalchemy"
@@ -14,8 +14,8 b' self: super: {'
       self."python-dateutil"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/89/03/756d5b8e1c90bf283c3f435766aa3f20208d1c3887579dd8f2122e01d5f4/alembic-0.9.9.tar.gz";
-      sha256 = "0bmkq6isjbmy4p7nxfvfpknjsx7rb3xn9g00169y891hcfkkxgc5";
+      url = "https://files.pythonhosted.org/packages/1c/65/b8e4f5b2f345bb13b5e0a3fddd892b0b3f0e8ad4880e954fdc6a50d00d84/alembic-1.0.5.tar.gz";
+      sha256 = "0rpjqp2iq6p49x1nli18ivak1izz547nnjxi110mzrgc1v7dxzz9";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -36,7 +36,7 b' self: super: {'
     };
   };
   "appenlight-client" = super.buildPythonPackage {
-    name = "appenlight-client-0.6.25";
+    name = "appenlight-client-0.6.26";
     doCheck = false;
     propagatedBuildInputs = [
       self."webob"
@@ -44,8 +44,8 b' self: super: {'
       self."six"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/fa/44/2911ef85ea4f4fe65058fd22959d8dad598fab6a3c84e5bcb569d15c8783/appenlight_client-0.6.25.tar.gz";
-      sha256 = "1r9l2rfg677nxhamdbyb9y4fs1zgy2dy1p19c68fnvqkxz40y627";
+      url = "https://files.pythonhosted.org/packages/2e/56/418fc10379b96e795ee39a15e69a730c222818af04c3821fa354eaa859ec/appenlight_client-0.6.26.tar.gz";
+      sha256 = "0s9xw3sb8s3pk73k78nnq4jil3q4mk6bczfa1fmgfx61kdxl2712";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -146,15 +146,15 b' self: super: {'
     };
   };
   "bleach" = super.buildPythonPackage {
-    name = "bleach-2.1.4";
+    name = "bleach-3.0.2";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
-      self."html5lib"
+      self."webencodings"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/7a/b7/fa555afb61462b030abaf9ed1479b8ea031510f58c7706b06113be9f82ea/bleach-2.1.4.tar.gz";
-      sha256 = "1n337zbdml6z6zia0b1qgv6xiddx3qlwmcg9vk2mk60jcxhmzs8f";
+      url = "https://files.pythonhosted.org/packages/ae/31/680afc7d44040004296a2d8f0584983c2f2386448cd9d0964197e6c1160e/bleach-3.0.2.tar.gz";
+      sha256 = "06474zg7f73hv8h1xw2wcsmvn2ygj73zxgxxqg8zcx8ap1srdls8";
     };
     meta = {
       license = [ pkgs.lib.licenses.asl20 ];
@@ -230,15 +230,16 b' self: super: {'
     };
   };
   "colander" = super.buildPythonPackage {
-    name = "colander-1.4";
+    name = "colander-1.5.1";
     doCheck = false;
     propagatedBuildInputs = [
       self."translationstring"
       self."iso8601"
+      self."enum34"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/cc/e2/c4e716ac4a426d8ad4dfe306c34f0018a22275d2420815784005bf771c84/colander-1.4.tar.gz";
-      sha256 = "0wjfphyr5aakv5hw73q287lbc15cbm0aardajv7i2mqf377rl3p2";
+      url = "https://files.pythonhosted.org/packages/ec/d1/fcca811a0a692c69d27e36b4d11a73acb98b4bab48323442642b6fd4386d/colander-1.5.1.tar.gz";
+      sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
@@ -317,7 +318,7 b' self: super: {'
     };
   };
   "deform" = super.buildPythonPackage {
-    name = "deform-2.0.5";
+    name = "deform-2.0.7";
     doCheck = false;
     propagatedBuildInputs = [
       self."chameleon"
@@ -328,11 +329,37 b' self: super: {'
       self."zope.deprecation"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/0c/b1/ba711d5808c12538c8504f534d79c124ed834f19ac36f0ac5391c3bbd1c1/deform-2.0.5.tar.gz";
-      sha256 = "0ybg9zsnfac1kaxrjanmkjk0xaklf4d3piywxwr08l1cl1336kc7";
+      url = "https://files.pythonhosted.org/packages/cf/a1/bc234527b8f181de9acd80e796483c00007658d1e32b7de78f1c2e004d9a/deform-2.0.7.tar.gz";
+      sha256 = "0jnpi0zr2hjvbmiz6nm33yqv976dn9lf51vhlzqc0i75xcr9rwig";
+    };
+    meta = {
+      license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
+  };
+  "defusedxml" = super.buildPythonPackage {
+    name = "defusedxml-0.5.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/74/ba/4ba4e89e21b5a2e267d80736ea674609a0a33cc4435a6d748ef04f1f9374/defusedxml-0.5.0.tar.gz";
+      sha256 = "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4";
     };
     meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+      license = [ pkgs.lib.licenses.psfl ];
+    };
+  };
+  "dm.xmlsec.binding" = super.buildPythonPackage {
+    name = "dm.xmlsec.binding-1.3.7";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."setuptools"
+      self."lxml"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/2c/9e/7651982d50252692991acdae614af821fd6c79bc8dcd598ad71d55be8fc7/dm.xmlsec.binding-1.3.7.tar.gz";
+      sha256 = "03jjjscx1pz2nc0dwiw9nia02qbz1c6f0f9zkyr8fmvys2n5jkb3";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   "docutils" = super.buildPythonPackage {
@@ -490,14 +517,14 b' self: super: {'
     };
   };
   "gevent" = super.buildPythonPackage {
-    name = "gevent-1.3.6";
+    name = "gevent-1.3.7";
     doCheck = false;
     propagatedBuildInputs = [
       self."greenlet"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/49/13/aa4bb3640b5167fe58875d3d7e65390cdb14f9682a41a741a566bb560842/gevent-1.3.6.tar.gz";
-      sha256 = "1ih4k73dqz2zb561hda99vbanja3m6cdch3mgxxn1mla3qwkqhbv";
+      url = "https://files.pythonhosted.org/packages/10/c1/9499b146bfa43aa4f1e0ed1bab1bd3209a4861d25650c11725036c731cf5/gevent-1.3.7.tar.gz";
+      sha256 = "0b0fr04qdk1p4sniv87fh8z5psac60x01pv054kpgi94520g81iz";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -547,27 +574,12 b' self: super: {'
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  "html5lib" = super.buildPythonPackage {
-    name = "html5lib-1.0.1";
-    doCheck = false;
-    propagatedBuildInputs = [
-      self."six"
-      self."webencodings"
-    ];
-    src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/85/3e/cf449cf1b5004e87510b9368e7a5f1acd8831c2d6691edd3c62a0823f98f/html5lib-1.0.1.tar.gz";
-      sha256 = "0dipzfrycv6j1jw82v9b7d8lzggx3x8xngx6l4xrqkxwvg7hvjv6";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
   "hupper" = super.buildPythonPackage {
-    name = "hupper-1.3.1";
+    name = "hupper-1.4.2";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/cf/4b/467b826a84c8594b81f414b5ab6794e981951dac90ca40abaf9ea1cb36b0/hupper-1.3.1.tar.gz";
-      sha256 = "03mf13n6i4dd60wlb9m99ddl4m3lmly70cjp7f82vdkibfl1v6l9";
+      url = "https://files.pythonhosted.org/packages/f1/75/1915dc7650b4867fa3049256e24ca8eddb5989998fcec788cf52b9812dfc/hupper-1.4.2.tar.gz";
+      sha256 = "16vb9fkiaakdpcp6pn56h3w0dwvm67bxq2k2dv4i382qhqwphdzb";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -671,6 +683,20 b' self: super: {'
       license = [ pkgs.lib.licenses.mit ];
     };
   };
+  "isodate" = super.buildPythonPackage {
+    name = "isodate-0.6.0";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."six"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/b1/80/fb8c13a4cd38eb5021dc3741a9e588e4d1de88d895c1910c6fc8a08b7a70/isodate-0.6.0.tar.gz";
+      sha256 = "1n7jkz68kk5pwni540pr5zdh99bf6ywydk1p5pdrqisrawylldif";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
   "itsdangerous" = super.buildPythonPackage {
     name = "itsdangerous-0.24";
     doCheck = false;
@@ -756,11 +782,11 b' self: super: {'
     };
   };
   "lxml" = super.buildPythonPackage {
-    name = "lxml-3.7.3";
+    name = "lxml-4.2.5";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/39/e8/a8e0b1fa65dd021d48fe21464f71783655f39a41f218293c1c590d54eb82/lxml-3.7.3.tar.gz";
-      sha256 = "1iv1jgkqn1hdh1xyxri6g0y1s67h01jzjkw2nhkx3rqylmw2sl5a";
+      url = "https://files.pythonhosted.org/packages/4b/20/ddf5eb3bd5c57582d2b4652b4bbcf8da301bdfe5d805cb94e805f4d7464d/lxml-4.2.5.tar.gz";
+      sha256 = "0zw0y9hs0nflxhl9cs6ipwwh53szi3w2x06wl0k9cylyqac0cwin";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -990,11 +1016,11 b' self: super: {'
     };
   };
   "peppercorn" = super.buildPythonPackage {
-    name = "peppercorn-0.5";
+    name = "peppercorn-0.6";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/45/ec/a62ec317d1324a01567c5221b420742f094f05ee48097e5157d32be3755c/peppercorn-0.5.tar.gz";
-      sha256 = "0jvp144zn7yqk9kbpxc059167mlqk85i5lpvl1niw8gsa5fvl74j";
+      url = "https://files.pythonhosted.org/packages/e4/77/93085de7108cdf1a0b092ff443872a8f9442c736d7ddebdf2f27627935f4/peppercorn-0.6.tar.gz";
+      sha256 = "1ip4bfwcpwkq9hz2dai14k2cyabvwrnvcvrcmzxmqm04g8fnimwn";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
@@ -1139,15 +1165,15 b' self: super: {'
     };
   };
   "py-gfm" = super.buildPythonPackage {
-    name = "py-gfm-0.1.3";
+    name = "py-gfm-0.1.4";
     doCheck = false;
     propagatedBuildInputs = [
       self."setuptools"
       self."markdown"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/12/e4/6b3d8678da04f97d7490d8264d8de51c2dc9fb91209ccee9c515c95e14c5/py-gfm-0.1.3.tar.gz";
-      sha256 = "162ggwwj0af9g3s1k8m4bfwbvis03x9pinnf35mj79pb90rf81zi";
+      url = "https://files.pythonhosted.org/packages/06/ee/004a03a1d92bb386dae44f6dd087db541bc5093374f1637d4d4ae5596cc2/py-gfm-0.1.4.tar.gz";
+      sha256 = "0zip06g2isivx8fzgqd4n9qzsa22c25jas1rsb7m2rnjg72m0rzg";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1212,11 +1238,11 b' self: super: {'
     };
   };
   "pygments" = super.buildPythonPackage {
-    name = "pygments-2.2.0";
+    name = "pygments-2.3.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
-      sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
+      url = "https://files.pythonhosted.org/packages/63/a2/91c31c4831853dedca2a08a0f94d788fc26a48f7281c99a303769ad2721b/Pygments-2.3.0.tar.gz";
+      sha256 = "1z34ms51dh4jq4h3cizp7vd1dmsxcbvffkjsd2xxfav22nn6lrl2";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1248,14 +1274,14 b' self: super: {'
     };
   };
   "pyotp" = super.buildPythonPackage {
-    name = "pyotp-2.2.6";
+    name = "pyotp-2.2.7";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/67/69/131f5ad63de40c30f3be88d891e4a2ea1b69398528db99bc1e5c543422fa/pyotp-2.2.6.tar.gz";
-      sha256 = "0sdxxvr3j4j0pk26v258jpxhgpbnpmyqhvzhl24hsd50j7fk14fx";
+      url = "https://files.pythonhosted.org/packages/b1/ab/477cda97b6ca7baced5106471cb1ac1fe698d1b035983b9f8ee3422989eb/pyotp-2.2.7.tar.gz";
+      sha256 = "00p69nw431f0s2ilg0hnd77p1l22m06p9rq4f8zfapmavnmzw3xy";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
   "pyparsing" = super.buildPythonPackage {
@@ -1479,14 +1505,14 b' self: super: {'
     };
   };
   "python-dateutil" = super.buildPythonPackage {
-    name = "python-dateutil-2.7.3";
+    name = "python-dateutil-2.7.5";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/a0/b0/a4e3241d2dee665fea11baec21389aec6886655cd4db7647ddf96c3fad15/python-dateutil-2.7.3.tar.gz";
-      sha256 = "1f7h54lg0w2ckch7592xpjkh8dg87k2br256h0iw49zn6bg02w72";
+      url = "https://files.pythonhosted.org/packages/0e/01/68747933e8d12263d41ce08119620d9a7e5eb72c876a3442257f74490da0/python-dateutil-2.7.5.tar.gz";
+      sha256 = "00ngwcdw36w5b37b51mdwn3qxid9zdf3kpffv2q6n9kl05y2iyc8";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.asl20 { fullName = "Dual License"; } ];
@@ -1543,6 +1569,22 b' self: super: {'
       license = [ { fullName = "License :: OSI Approved :: MIT License"; } pkgs.lib.licenses.mit ];
     };
   };
+  "python-saml" = super.buildPythonPackage {
+    name = "python-saml-2.4.2";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."dm.xmlsec.binding"
+      self."isodate"
+      self."defusedxml"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/79/a8/a6611017e0883102fd5e2b73c9d90691b8134e38247c04ee1531d3dc647c/python-saml-2.4.2.tar.gz";
+      sha256 = "0dls4hwvf13yg7x5yfjrghbywg8g38vn5vr0rsf70hli3ydbfm43";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
   "pytz" = super.buildPythonPackage {
     name = "pytz-2018.4";
     doCheck = false;
@@ -1615,7 +1657,7 b' self: super: {'
     };
   };
   "rhodecode-enterprise-ce" = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.14.1";
+    name = "rhodecode-enterprise-ce-4.15.0";
     buildInputs = [
       self."pytest"
       self."py"
@@ -1640,6 +1682,7 b' self: super: {'
       self."attrs"
       self."babel"
       self."beaker"
+      self."bleach"
       self."celery"
       self."chameleon"
       self."channelstream"
@@ -1668,8 +1711,6 b' self: super: {'
       self."markdown"
       self."markupsafe"
       self."msgpack-python"
-      self."mysql-python"
-      self."pymysql"
       self."pyotp"
       self."packaging"
       self."paste"
@@ -1678,7 +1719,6 b' self: super: {'
       self."pathlib2"
       self."peppercorn"
       self."psutil"
-      self."psycopg2"
       self."py-bcrypt"
       self."pycrypto"
       self."pycurl"
@@ -1692,11 +1732,11 b' self: super: {'
       self."pyramid-mako"
       self."pyramid"
       self."pyramid-mailer"
-      self."pysqlite"
       self."python-dateutil"
       self."python-ldap"
       self."python-memcached"
       self."python-pam"
+      self."python-saml"
       self."pytz"
       self."tzlocal"
       self."pyzmq"
@@ -1713,7 +1753,6 b' self: super: {'
       self."supervisor"
       self."tempita"
       self."translationstring"
-      self."trollius"
       self."urllib3"
       self."urlobject"
       self."venusian"
@@ -1727,8 +1766,11 b' self: super: {'
       self."zope.deprecation"
       self."zope.event"
       self."zope.interface"
+      self."mysql-python"
+      self."pymysql"
+      self."pysqlite"
+      self."psycopg2"
       self."nbconvert"
-      self."bleach"
       self."nbformat"
       self."jupyter-client"
       self."alembic"
@@ -1822,11 +1864,11 b' self: super: {'
     };
   };
   "setuptools" = super.buildPythonPackage {
-    name = "setuptools-40.4.3";
+    name = "setuptools-40.6.2";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/6e/9c/6a003320b00ef237f94aa74e4ad66c57a7618f6c79d67527136e2544b728/setuptools-40.4.3.zip";
-      sha256 = "058v6zns4634n4al2nmmvp15j8nrgwn8wjrbdks47wk3vm05gg5c";
+      url = "https://files.pythonhosted.org/packages/b0/d1/8acb42f391cba52e35b131e442e80deffbb8d0676b93261d761b1f0ef8fb/setuptools-40.6.2.zip";
+      sha256 = "0r2c5hapirlzm34h7pl1lgkm6gk7bcrlrdj28qgsvaqg3f74vfw6";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -2002,20 +2044,6 b' self: super: {'
       license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
     };
   };
-  "trollius" = super.buildPythonPackage {
-    name = "trollius-1.0.4";
-    doCheck = false;
-    propagatedBuildInputs = [
-      self."futures"
-    ];
-    src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/aa/e6/4141db437f55e6ee7a3fb69663239e3fde7841a811b4bef293145ad6c836/trollius-1.0.4.tar.gz";
-      sha256 = "0xny8y12x3wrflmyn6xi8a7n3m3ac80fgmgzphx5jbbaxkjcm148";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
-    };
-  };
   "tzlocal" = super.buildPythonPackage {
     name = "tzlocal-1.5.1";
     doCheck = false;

pkgs/shell-generate.nix

@@ -32,6 +32,11 b' pkgs.stdenv.mkDerivation {'
     # We need postgresql to be around
     pkgs.postgresql
 
+    # we need the below for saml
+    pkgs.libxml2
+    pkgs.libxslt
+    pkgs.xmlsec
+
     # Curl is needed for pycurl
     pkgs.curl
   ];

requirements.txt

@@ -8,16 +8,17 b' atomicwrites==1.2.1'
 attrs==18.2.0
 babel==1.3
 beaker==1.9.1
+bleach==3.0.2
 celery==4.1.1
 chameleon==2.24
 channelstream==0.5.2
 click==6.6
-colander==1.4.0
+colander==1.5.1
 # our custom configobj
 https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c#egg=configobj==5.0.6
 cssselect==1.0.3
 decorator==4.1.2
-deform==2.0.5
+deform==2.0.7
 docutils==0.14.0
 dogpile.cache==0.6.7
 dogpile.core==0.4.1
@@ -32,28 +33,25 b' itsdangerous==0.24'
 jinja2==2.9.6
 billiard==3.5.0.3
 kombu==4.2.0
-lxml==3.7.3
+lxml==4.2.5
 mako==1.0.7
 markdown==2.6.11
 markupsafe==1.0.0
 msgpack-python==0.5.6
-mysql-python==1.2.5
-pymysql==0.8.1
-pyotp==2.2.6
+pyotp==2.2.7
 packaging==15.2
 paste==2.0.3
 pastedeploy==1.5.2
 pastescript==2.0.2
 pathlib2==2.3.2
-peppercorn==0.5
+peppercorn==0.6
 psutil==5.4.7
-psycopg2==2.7.5
 py-bcrypt==0.4
 pycrypto==2.6.1
 pycurl==7.43.0.2
 pyflakes==0.8.1
 pygments-markdown-lexer==0.1.0.dev39
-pygments==2.2.0
+pygments==2.3.0
 pyparsing==1.5.7
 pyramid-beaker==0.8
 pyramid-debugtoolbar==4.4.0
@@ -61,15 +59,15 b' pyramid-jinja2==2.7'
 pyramid-mako==1.0.2
 pyramid==1.9.2
 pyramid_mailer==0.15.1
-pysqlite==2.8.3
 python-dateutil
 python-ldap==3.1.0
 python-memcached==1.59
 python-pam==1.8.4
+python-saml
 pytz==2018.4
 tzlocal==1.5.1
 pyzmq==14.6.0
-py-gfm==0.1.3
+py-gfm==0.1.4
 redis==2.10.6
 repoze.lru==0.7
 requests==2.9.1
@@ -82,7 +80,6 b' subprocess32==3.5.2'
 supervisor==3.3.4
 tempita==0.5.2
 translationstring==1.3
-trollius==1.0.4
 urllib3==1.21
 urlobject==2.4.3
 venusian==1.1.0
@@ -97,22 +94,26 b' zope.deprecation==4.3.0'
 zope.event==4.3.0
 zope.interface==4.5.0
 
+# DB drivers
+mysql-python==1.2.5
+pymysql==0.8.1
+pysqlite==2.8.3
+psycopg2==2.7.5
 
 # 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.3.1
-bleach==2.1.4
 nbformat==4.4.0
 jupyter_client==5.0.0
 
 ## cli tools
-alembic==0.9.9
+alembic==1.0.5
 invoke==0.13.0
 bumpversion==0.5.3
 
 ## http servers
-gevent==1.3.6
+gevent==1.3.7
 greenlet==0.4.15
 gunicorn==19.9.0
 waitress==1.1.0
@@ -126,7 +127,7 b' ipython==5.1.0'
 https://code.rhodecode.com/rhodecode-tools-ce/archive/v1.0.1.tar.gz?md5=ffb5d6bcb855305b93cfe23ad42e500b#egg=rhodecode-tools==1.0.1
 
 ## appenlight
-appenlight-client==0.6.25
+appenlight-client==0.6.26
 
 ## test related requirements
 -r requirements_test.txt

rhodecode/VERSION

@@ -1,1 +1,1 b''
-4.14.1
  No newline at end of file
+4.15.0
  No newline at end of file

rhodecode/api/tests/test_create_pull_request.py

@@ -66,7 +66,7 b' class TestCreatePullRequestApi(object):'
         expected_message = "Created new pull request `{title}`".format(
             title=data['title'])
         result = response.json
-        assert result['error'] == None
+        assert result['error'] is None
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
@@ -89,7 +89,7 b' class TestCreatePullRequestApi(object):'
         expected_message = "Created new pull request `{title}`".format(
             title=data['title'])
         result = response.json
-        assert result['error'] == None
+        assert result['error'] is None
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
@@ -129,7 +129,7 b' class TestCreatePullRequestApi(object):'
         expected_message = "Created new pull request `{title}`".format(
             title=data['title'])
         result = response.json
-        assert result['error'] == None
+        assert result['error'] is None
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
@@ -144,11 +144,15 b' class TestCreatePullRequestApi(object):'
                 entry['mandatory'] = rev.mandatory
             actual_reviewers.append(entry)
 
-        # default reviewer will be added who is an owner of the repo
-        reviewers.append(
-            {'username': pull_request.author.username,
-             'reasons': [u'Default reviewer', u'Repository owner']},
-        )
+        owner_username = pull_request.target_repo.user.username
+        for spec_reviewer in reviewers[::]:
+            # default reviewer will be added who is an owner of the repo
+            # this get's overridden by a add owner to reviewers rule
+            if spec_reviewer['username'] == owner_username:
+                spec_reviewer['reasons'] = [u'Default reviewer', u'Repository owner']
+                # since owner is more important, we don't inherit mandatory flag
+                del spec_reviewer['mandatory']
+
         assert sorted(actual_reviewers, key=lambda e: e['username']) \
                == sorted(reviewers, key=lambda e: e['username'])
 
@@ -173,7 +177,7 b' class TestCreatePullRequestApi(object):'
         expected_message = "Created new pull request `{title}`".format(
             title=data['title'])
         result = response.json
-        assert result['error'] == None
+        assert result['error'] is None
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
@@ -187,11 +191,14 b' class TestCreatePullRequestApi(object):'
             if rev.mandatory:
                 entry['mandatory'] = rev.mandatory
             actual_reviewers.append(entry)
-        # default reviewer will be added who is an owner of the repo
-        reviewers.append(
-            {'username': pull_request.author.user_id,
-             'reasons': [u'Default reviewer', u'Repository owner']},
-        )
+
+        owner_user_id = pull_request.target_repo.user.user_id
+        for spec_reviewer in reviewers[::]:
+            # default reviewer will be added who is an owner of the repo
+            # this get's overridden by a add owner to reviewers rule
+            if spec_reviewer['username'] == owner_user_id:
+                spec_reviewer['reasons'] = [u'Default reviewer', u'Repository owner']
+
         assert sorted(actual_reviewers, key=lambda e: e['username']) \
                == sorted(reviewers, key=lambda e: e['username'])
 

rhodecode/apps/_base/navigation.py

@@ -24,7 +24,7 b' import collections'
 
 from zope.interface import implementer
 
-from rhodecode.apps.admin.interfaces import IAdminNavigationRegistry
+from rhodecode.apps._base.interfaces import IAdminNavigationRegistry
 from rhodecode.lib.utils2 import str2bool
 from rhodecode.translation import _
 
@@ -117,10 +117,11 b' class NavigationRegistry(object):'
         self._registered_entries[entry.key] = entry
 
     def get_navlist(self, request):
-        navlist = [NavListEntry(i.key, i.get_localized_name(request),
-                                i.generate_url(request), i.active_list)
-                   for i in self._registered_entries.values()]
-        return navlist
+        nav_list = [
+            NavListEntry(i.key, i.get_localized_name(request),
+                         i.generate_url(request), i.active_list)
+            for i in self._registered_entries.values()]
+        return nav_list
 
 
 def navigation_registry(request, registry=None):
@@ -143,5 +144,5 b' 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
+    navigation_registry_instance = NavigationRegistry(labs_active=labs_active)
+    config.registry.registerUtility(navigation_registry_instance)

rhodecode/apps/admin/__init__.py

@@ -429,7 +429,7 b' def admin_routes(config):'
 
 
 def includeme(config):
-    from rhodecode.apps.admin.navigation import includeme as nav_includeme
+    from rhodecode.apps._base.navigation import includeme as nav_includeme
 
     # Create admin navigation registry and add it to the pyramid registry.
     nav_includeme(config)
@@ -438,7 +438,5 b' def includeme(config):'
     config.add_route(name='admin_home', pattern=ADMIN_PREFIX)
     config.include(admin_routes, route_prefix=ADMIN_PREFIX)
 
-    config.include('.subscribers')
-
     # Scan module for configuration decorators.
     config.scan('.views', ignore='.tests')

rhodecode/apps/admin/tests/test_admin_auth_settings.py

@@ -89,7 +89,7 b' class TestAuthSettingsView(object):'
             'timeout': 3600,
             'tls_kind': 'PLAIN',
             'tls_reqcert': 'NEVER',
-
+            'tls_cert_dir':'/etc/openldap/cacerts',
             'dn_user': 'test_user',
             'dn_pass': 'test_pass',
             'base_dn': 'test_base_dn',

rhodecode/apps/admin/views/exception_tracker.py

@@ -24,7 +24,7 b' from pyramid.httpexceptions import HTTPF'
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
-from rhodecode.apps.admin.navigation import navigation_list
+from rhodecode.apps._base.navigation import navigation_list
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator, CSRFRequired)

rhodecode/apps/admin/views/open_source_licenses.py

@@ -24,7 +24,7 b' import logging'
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
-from rhodecode.apps.admin.navigation import navigation_list
+from rhodecode.apps._base.navigation import navigation_list
 from rhodecode.lib.auth import (LoginRequired, HasPermissionAllDecorator)
 from rhodecode.lib.utils import read_opensource_licenses
 

rhodecode/apps/admin/views/process_management.py

@@ -25,7 +25,7 b' import signal'
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
-from rhodecode.apps.admin.navigation import navigation_list
+from rhodecode.apps._base.navigation import navigation_list
 from rhodecode.lib import system_info
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator, CSRFRequired)

rhodecode/apps/admin/views/sessions.py

@@ -24,7 +24,7 b' from pyramid.view import view_config'
 from pyramid.httpexceptions import HTTPFound
 
 from rhodecode.apps._base import BaseAppView
-from rhodecode.apps.admin.navigation import navigation_list
+from rhodecode.apps._base.navigation import navigation_list
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator, CSRFRequired)
 from rhodecode.lib.utils2 import safe_int

rhodecode/apps/admin/views/settings.py

@@ -33,7 +33,7 b' 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._base.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 (
@@ -175,8 +175,7 b' class AdminSettingsView(BaseAppView):'
 
         try:
             if c.visual.allow_repo_location_change:
-                model.update_global_path_setting(
-                    form_result['paths_root_path'])
+                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)

rhodecode/apps/admin/views/system_info.py

@@ -25,7 +25,7 b' from pyramid.view import view_config'
 
 import rhodecode
 from rhodecode.apps._base import BaseAppView
-from rhodecode.apps.admin.navigation import navigation_list
+from rhodecode.apps._base.navigation import navigation_list
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import (LoginRequired, HasPermissionAllDecorator)
 from rhodecode.lib.utils2 import str2bool
@@ -96,6 +96,7 b' class AdminSystemInfoSettingsView(BaseAp'
             # RhodeCode specific
             (_('RhodeCode Version'), val('rhodecode_app')['text'], state('rhodecode_app')),
             (_('Latest version'), version, update_state),
+            (_('RhodeCode Base URL'), val('rhodecode_config')['config'].get('app.base_url'), state('rhodecode_config')),
             (_('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')),

rhodecode/apps/admin/views/users.py

@@ -185,7 +185,7 b' class AdminUsersView(BaseAppView, DataGr'
     def users_new(self):
         _ = self.request.translate
         c = self.load_default_context()
-        c.default_extern_type = auth_rhodecode.RhodeCodeAuthPlugin.name
+        c.default_extern_type = auth_rhodecode.RhodeCodeAuthPlugin.uid
         self._set_personal_repo_group_template_vars(c)
         return self._get_template_context(c)
 
@@ -198,7 +198,7 b' class AdminUsersView(BaseAppView, DataGr'
     def users_create(self):
         _ = self.request.translate
         c = self.load_default_context()
-        c.default_extern_type = auth_rhodecode.RhodeCodeAuthPlugin.name
+        c.default_extern_type = auth_rhodecode.RhodeCodeAuthPlugin.uid
         user_model = UserModel()
         user_form = UserForm(self.request.translate)()
         try:

rhodecode/apps/channelstream/__init__.py

@@ -63,7 +63,7 b' def maybe_create_history_store(event):'
     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)
+        os.makedirs(history_dir, 0o750)
 
 
 def includeme(config):

rhodecode/apps/login/views.py

@@ -32,6 +32,7 b' from pyramid.view import view_config'
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.authentication.base import authenticate, HTTP_TYPE
+from rhodecode.authentication.plugins import auth_rhodecode
 from rhodecode.events import UserRegistered, trigger
 from rhodecode.lib import helpers as h
 from rhodecode.lib import audit_logger
@@ -55,7 +56,7 b' CaptchaData = collections.namedtuple('
     'CaptchaData', 'active, private_key, public_key')
 
 
-def _store_user_in_session(session, username, remember=False):
+def store_user_in_session(session, username, remember=False):
     user = User.get_by_username(username, case_insensitive=True)
     auth_user = AuthUser(user.user_id)
     auth_user.set_authenticated()
@@ -165,7 +166,7 b' class LoginView(BaseAppView):'
             auth_info = authenticate(
                 '', '', self.request.environ, HTTP_TYPE, skip_missing=True)
             if auth_info:
-                headers = _store_user_in_session(
+                headers = store_user_in_session(
                     self.session, auth_info.get('username'))
                 raise HTTPFound(c.came_from, headers=headers)
         except UserCreationError as e:
@@ -186,7 +187,7 b' class LoginView(BaseAppView):'
             self.session.invalidate()
             form_result = login_form.to_python(self.request.POST)
             # form checks for username/password, now we're authenticated
-            headers = _store_user_in_session(
+            headers = store_user_in_session(
                 self.session,
                 username=form_result['username'],
                 remember=form_result['remember'])
@@ -273,16 +274,26 b' class LoginView(BaseAppView):'
         route_name='register', request_method='POST',
         renderer='rhodecode:templates/register.mako')
     def register_post(self):
+        from rhodecode.authentication.plugins import auth_rhodecode
+
         self.load_default_context()
         captcha = self._get_captcha_data()
         auto_active = 'hg.register.auto_activate' in User.get_default_user()\
             .AuthUser().permissions['global']
 
+        extern_name = auth_rhodecode.RhodeCodeAuthPlugin.uid
+        extern_type = auth_rhodecode.RhodeCodeAuthPlugin.uid
+
         register_form = RegisterForm(self.request.translate)()
         try:
 
             form_result = register_form.to_python(self.request.POST)
             form_result['active'] = auto_active
+            external_identity = self.request.POST.get('external_identity')
+
+            if external_identity:
+                extern_name = external_identity
+                extern_type = external_identity
 
             if captcha.active:
                 captcha_status, captcha_message = self.validate_captcha(
@@ -295,11 +306,17 b' class LoginView(BaseAppView):'
                     raise formencode.Invalid(
                         _msg, _value, None, error_dict=error_dict)
 
-            new_user = UserModel().create_registration(form_result)
+            new_user = UserModel().create_registration(
+                form_result, extern_name=extern_name, extern_type=extern_type)
 
             action_data = {'data': new_user.get_api_data(),
                            'user_agent': self.request.user_agent}
 
+
+
+            if external_identity:
+                action_data['external_identity'] = external_identity
+
             audit_user = audit_logger.UserWrap(
                 username=new_user.username,
                 user_id=new_user.user_id,
@@ -351,15 +368,24 b' class LoginView(BaseAppView):'
         # matching emails
         msg = _('If such email exists, a password reset link was sent to it.')
 
+        def default_response():
+            log.debug('faking response on invalid password reset')
+            # make this take 2s, to prevent brute forcing.
+            time.sleep(2)
+            h.flash(msg, category='success')
+            return HTTPFound(self.request.route_path('reset_password'))
+
         if self.request.POST:
             if h.HasPermissionAny('hg.password_reset.disabled')():
                 _email = self.request.POST.get('email', '')
                 log.error('Failed attempt to reset password for `%s`.', _email)
-                h.flash(_('Password reset has been disabled.'),
-                                   category='error')
+                h.flash(_('Password reset has been disabled.'), category='error')
                 return HTTPFound(self.request.route_path('reset_password'))
 
             password_reset_form = PasswordResetForm(self.request.translate)()
+            description = u'Generated token for password reset from {}'.format(
+                datetime.datetime.now().isoformat())
+
             try:
                 form_result = password_reset_form.to_python(
                     self.request.POST)
@@ -379,10 +405,14 b' class LoginView(BaseAppView):'
                 # Generate reset URL and send mail.
                 user = User.get_by_email(user_email)
 
+                # only allow rhodecode based users to reset their password
+                # external auth shouldn't allow password reset
+                if user and user.extern_type != auth_rhodecode.RhodeCodeAuthPlugin.uid:
+                    log.warning('User %s with external type `%s` tried a password reset. '
+                                'This try was rejected', user, user.extern_type)
+                    return default_response()
+
                 # generate password reset token that expires in 10 minutes
-                description = u'Generated token for password reset from {}'.format(
-                    datetime.datetime.now().isoformat())
-
                 reset_token = UserModel().add_auth_token(
                     user=user, lifetime_minutes=10,
                     role=UserModel.auth_token_role.ROLE_PASSWORD_RESET,
@@ -395,15 +425,14 b' class LoginView(BaseAppView):'
                     _query={'key': reset_token.api_key})
                 UserModel().reset_password_link(
                     form_result, password_reset_url)
-                # Display success message and redirect.
-                h.flash(msg, category='success')
 
                 action_data = {'email': user_email,
                                'user_agent': self.request.user_agent}
                 audit_logger.store_web(
                     'user.password.reset_request', action_data=action_data,
                     user=self._rhodecode_user, commit=True)
-                return HTTPFound(self.request.route_path('reset_password'))
+
+                return default_response()
 
             except formencode.Invalid as errors:
                 template_context.update({
@@ -418,11 +447,7 b' class LoginView(BaseAppView):'
                     # case of failed captcha
                     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)
-            h.flash(msg, category='success')
-            return HTTPFound(self.request.route_path('reset_password'))
+            return default_response()
 
         return self._get_template_context(c, **template_context)
 

rhodecode/apps/repository/utils.py

@@ -51,12 +51,12 b' def get_default_reviewers_data('
     """ Return json for default reviewers of a repository """
 
     reasons = ['Default reviewer', 'Repository owner']
-    default = reviewer_as_json(
-        user=current_user, reasons=reasons, mandatory=False)
+    json_reviewers = [reviewer_as_json(
+        user=target_repo.user, reasons=reasons, mandatory=False, rules=None)]
 
     return {
         'api_ver': 'v1',  # define version for later possible schema upgrade
-        'reviewers': [default],
+        'reviewers': json_reviewers,
         'rules': {},
         'rules_data': {},
     }

rhodecode/apps/repository/views/repo_changelog.py

@@ -211,7 +211,7 b' class RepoChangelogView(RepoAppView):'
                 base_commit = self.rhodecode_vcs_repo.get_commit(commit_id)
 
                 try:
-                    collection = base_commit.get_file_history(
+                    collection = base_commit.get_path_history(
                         f_path, limit=hist_limit, pre_load=pre_load)
                     if collection and partial_xhr:
                         # for ajax call we remove first one since we're looking
@@ -221,7 +221,7 b' class RepoChangelogView(RepoAppView):'
                     # this node is not present at tip!
                     try:
                         commit = self._get_commit_or_redirect(commit_id)
-                        collection = commit.get_file_history(f_path)
+                        collection = commit.get_path_history(f_path)
                     except RepositoryError as e:
                         h.flash(safe_str(e), category='warning')
                         redirect_url = h.route_path(
@@ -315,7 +315,7 b' class RepoChangelogView(RepoAppView):'
                 raise HTTPFound(
                     h.route_path('repo_changelog', repo_name=self.db_repo_name))
 
-            collection = base_commit.get_file_history(
+            collection = base_commit.get_path_history(
                 f_path, limit=hist_limit, pre_load=pre_load)
             collection = list(reversed(collection))
         else:

rhodecode/apps/repository/views/repo_files.py

@@ -663,7 +663,7 b' class RepoFilesView(RepoAppView):'
             pass
 
         if is_file:
-            history = commit.get_file_history(f_path)
+            history = commit.get_path_history(f_path)
             prev_commit_id = history[1].raw_id \
                 if len(history) > 1 else prev_commit_id
         prev_url = h.route_path(
@@ -897,10 +897,10 b' class RepoFilesView(RepoAppView):'
         if commits is None:
             pre_load = ["author", "branch"]
             try:
-                commits = tip.get_file_history(f_path, pre_load=pre_load)
+                commits = tip.get_path_history(f_path, pre_load=pre_load)
             except (NodeDoesNotExistError, CommitError):
                 # this node is not present at tip!
-                commits = commit_obj.get_file_history(f_path, pre_load=pre_load)
+                commits = commit_obj.get_path_history(f_path, pre_load=pre_load)
 
         history = []
         commits_group = ([], _("Changesets"))

rhodecode/apps/repository/views/repo_review_rules.py

@@ -25,6 +25,7 b' from pyramid.view import view_config'
 from rhodecode.apps._base import RepoAppView
 from rhodecode.apps.repository.utils import get_default_reviewers_data
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
+from rhodecode.model.db import Repository
 
 log = logging.getLogger(__name__)
 
@@ -53,8 +54,8 b' class RepoReviewRulesView(RepoAppView):'
         renderer='json_ext')
     def repo_default_reviewers_data(self):
         self.load_default_context()
+        target_repo_name = self.request.GET.get('target_repo', self.db_repo.repo_name)
+        target_repo = Repository.get_by_repo_name(target_repo_name)
         review_data = get_default_reviewers_data(
-            self.db_repo.user, None, None, None, None)
+            self.db_repo.user, None, None, target_repo, None)
         return review_data
-
-

rhodecode/apps/svn_support/utils.py

@@ -35,15 +35,8 b' from .events import ModDavSvnConfigChang'
 log = logging.getLogger(__name__)
 
 
-def generate_mod_dav_svn_config(registry):
-    """
-    Generate the configuration file for use with subversion's mod_dav_svn
-    module. The configuration has to contain a <Location> block for each
-    available repository group because the mod_dav_svn module does not support
-    repositories organized in sub folders.
-    """
-    settings = registry.settings
-    use_ssl = str2bool(registry.settings['force_https'])
+def write_mod_dav_svn_config(settings):
+    use_ssl = str2bool(settings['force_https'])
 
     config = _render_mod_dav_svn_config(
         use_ssl=use_ssl,
@@ -54,6 +47,17 b' def generate_mod_dav_svn_config(registry'
         realm=get_rhodecode_realm(), template=settings[config_keys.template])
     _write_mod_dav_svn_config(config, settings[config_keys.config_file_path])
 
+
+def generate_mod_dav_svn_config(registry):
+    """
+    Generate the configuration file for use with subversion's mod_dav_svn
+    module. The configuration has to contain a <Location> block for each
+    available repository group because the mod_dav_svn module does not support
+    repositories organized in sub folders.
+    """
+    settings = registry.settings
+    write_mod_dav_svn_config(settings)
+
     # Trigger an event on mod dav svn configuration change.
     trigger(ModDavSvnConfigChange(), registry)
 

rhodecode/apps/user_group/__init__.py

@@ -19,7 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
-from rhodecode.apps.admin.navigation import NavigationRegistry
+from rhodecode.apps._base.navigation import NavigationRegistry
 from rhodecode.apps._base import ADMIN_PREFIX
 from rhodecode.lib.utils2 import str2bool
 

rhodecode/authentication/__init__.py

@@ -18,11 +18,9 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-import os
 import logging
 import importlib
 
-from pkg_resources import iter_entry_points
 from pyramid.authentication import SessionAuthenticationPolicy
 
 from rhodecode.authentication.registry import AuthenticationPluginRegistry
@@ -31,48 +29,26 b' from rhodecode.authentication.routes imp'
 from rhodecode.apps._base import ADMIN_PREFIX
 from rhodecode.model.settings import SettingsModel
 
-
 log = logging.getLogger(__name__)
 
-# Plugin ID prefixes to distinct between normal and legacy plugins.
-plugin_prefix = 'egg:'
 legacy_plugin_prefix = 'py:'
 plugin_default_auth_ttl = 30
 
 
-# TODO: Currently this is only used to discover the authentication plugins.
-# Later on this may be used in a generic way to look up and include all kinds
-# of supported enterprise plugins. Therefore this has to be moved and
-# refactored to a real 'plugin look up' machinery.
-# TODO: When refactoring this think about splitting it up into distinct
-# discover, load and include phases.
-def _discover_plugins(config, entry_point='enterprise.plugins1'):
-    for ep in iter_entry_points(entry_point):
-        plugin_id = '{}{}#{}'.format(
-            plugin_prefix, ep.dist.project_name, ep.name)
-        log.debug('Plugin discovered: "%s"', plugin_id)
-        try:
-            module = ep.load()
-            plugin = module(plugin_id=plugin_id)
-            config.include(plugin.includeme)
-        except Exception as e:
-            log.exception(
-                'Exception while loading authentication plugin '
-                '"{}": {}'.format(plugin_id, e.message))
-
-
 def _import_legacy_plugin(plugin_id):
     module_name = plugin_id.split(legacy_plugin_prefix, 1)[-1]
     module = importlib.import_module(module_name)
     return module.plugin_factory(plugin_id=plugin_id)
 
 
-def _discover_legacy_plugins(config, prefix=legacy_plugin_prefix):
+def discover_legacy_plugins(config, prefix=legacy_plugin_prefix):
     """
     Function that imports the legacy plugins stored in the 'auth_plugins'
     setting in database which are using the specified prefix. Normally 'py:' is
     used for the legacy plugins.
     """
+    log.debug('authentication: running legacy plugin discovery for prefix %s',
+              legacy_plugin_prefix)
     try:
         auth_plugins = SettingsModel().get_setting_by_name('auth_plugins')
         enabled_plugins = auth_plugins.app_settings_value
@@ -121,12 +97,3 b' def includeme(config):'
                     request_method='POST',
                     route_name='auth_home',
                     context=AuthnRootResource)
-
-    for key in ['RC_CMD_SETUP_RC', 'RC_CMD_UPGRADE_DB', 'RC_CMD_SSH_WRAPPER']:
-        if os.environ.get(key):
-            # skip this heavy step below on certain CLI commands
-            return
-
-    # Auto discover authentication plugins and include their configuration.
-    _discover_plugins(config)
-    _discover_legacy_plugins(config)

rhodecode/authentication/base.py

@@ -38,7 +38,8 b' from rhodecode.authentication.schema imp'
 from rhodecode.lib import rc_cache
 from rhodecode.lib.auth import PasswordGenerator, _RhodeCodeCryptoBCrypt
 from rhodecode.lib.utils2 import safe_int, safe_str
-from rhodecode.lib.exceptions import LdapConnectionError
+from rhodecode.lib.exceptions import LdapConnectionError, LdapUsernameError, \
+    LdapPasswordError
 from rhodecode.model.db import User
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import SettingsModel
@@ -52,6 +53,8 b' log = logging.getLogger(__name__)'
 VCS_TYPE = 'vcs'
 HTTP_TYPE = 'http'
 
+external_auth_session_key = 'rhodecode.external_auth'
+
 
 class hybrid_property(object):
     """
@@ -93,6 +96,9 b' class LazyFormencode(object):'
 
 
 class RhodeCodeAuthPluginBase(object):
+    # UID is used to register plugin to the registry
+    uid = None
+
     # cache the authentication request for N amount of seconds. Some kind
     # of authentication methods are very heavy and it's very efficient to cache
     # the result of a call. If it's set to None (default) cache is off
@@ -113,7 +119,7 b' class RhodeCodeAuthPluginBase(object):'
         "active":
             'True|False defines active state of user internally for RhodeCode',
         "active_from_extern":
-            "True|False\None, active state from the external auth, "
+            "True|False|None, active state from the external auth, "
             "None means use definition from RhodeCode extern_type active value"
 
     }
@@ -171,6 +177,20 b' class RhodeCodeAuthPluginBase(object):'
             db_type = '{}.encrypted'.format(db_type)
         return db_type
 
+    @classmethod
+    def docs(cls):
+        """
+        Defines documentation url which helps with plugin setup
+        """
+        return ''
+
+    @classmethod
+    def icon(cls):
+        """
+        Defines ICON in SVG format for authentication method
+        """
+        return ''
+
     def is_enabled(self):
         """
         Returns true if this plugin is enabled. An enabled plugin can be
@@ -563,7 +583,8 b' class RhodeCodeExternalAuthPlugin(RhodeC'
 class AuthLdapBase(object):
 
     @classmethod
-    def _build_servers(cls, ldap_server_type, ldap_server, port):
+    def _build_servers(cls, ldap_server_type, ldap_server, port, use_resolver=True):
+
         def host_resolver(host, port, full_resolve=True):
             """
             Main work for this function is to prevent ldap connection issues,
@@ -602,7 +623,7 b' class AuthLdapBase(object):'
         return ', '.join(
             ["{}://{}".format(
                 ldap_server_type,
-                host_resolver(host, port, full_resolve=full_resolve))
+                host_resolver(host, port, full_resolve=use_resolver and full_resolve))
              for host in ldap_server])
 
     @classmethod
@@ -616,6 +637,19 b' class AuthLdapBase(object):'
             uid = chop_at(username, "@%s" % server_addr)
         return uid
 
+    @classmethod
+    def validate_username(cls, username):
+        if "," in username:
+            raise LdapUsernameError(
+                "invalid character `,` in username: `{}`".format(username))
+
+    @classmethod
+    def validate_password(cls, username, password):
+        if not password:
+            msg = "Authenticating user %s with blank password not allowed"
+            log.warning(msg, username)
+            raise LdapPasswordError(msg)
+
 
 def loadplugin(plugin_id):
     """

rhodecode/authentication/plugins/auth_crowd.py

@@ -40,7 +40,7 b' from rhodecode.model.db import User'
 log = logging.getLogger(__name__)
 
 
-def plugin_factory(plugin_id, *args, **kwds):
+def plugin_factory(plugin_id, *args, **kwargs):
     """
     Factory function that is called during plugin discovery.
     It returns the plugin instance.
@@ -189,6 +189,7 b' class CrowdServer(object):'
 
 
 class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
+    uid = 'crowd'
     _settings_unsafe_keys = ['app_password']
 
     def includeme(self, config):
@@ -215,9 +216,13 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
     def get_display_name(self):
         return _('CROWD')
 
+    @classmethod
+    def docs(cls):
+        return "https://docs.rhodecode.com/RhodeCode-Enterprise/auth/auth-crowd.html"
+
     @hybrid_property
     def name(self):
-        return "crowd"
+        return u"crowd"
 
     def use_fake_password(self):
         return True
@@ -283,3 +288,8 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
         log.debug("Final crowd user object: \n%s", formatted_json(user_attrs))
         log.info('user `%s` authenticated correctly', user_attrs['username'])
         return user_attrs
+
+
+def includeme(config):
+    plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(RhodeCodeAuthPlugin.uid)
+    plugin_factory(plugin_id).includeme(config)

rhodecode/authentication/plugins/auth_headers.py

@@ -34,7 +34,7 b' from rhodecode.model.db import User'
 log = logging.getLogger(__name__)
 
 
-def plugin_factory(plugin_id, *args, **kwds):
+def plugin_factory(plugin_id, *args, **kwargs):
     """
     Factory function that is called during plugin discovery.
     It returns the plugin instance.
@@ -75,7 +75,7 b' class HeadersSettingsSchema(AuthnPluginS'
 
 
 class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
-
+    uid = 'headers'
     def includeme(self, config):
         config.add_authn_plugin(self)
         config.add_authn_resource(self.get_id(), HeadersAuthnResource(self))
@@ -102,7 +102,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
 
     @hybrid_property
     def name(self):
-        return 'headers'
+        return u"headers"
 
     @property
     def is_headers_auth(self):
@@ -223,3 +223,8 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
 
         log.info('user `%s` authenticated correctly', user_attrs['username'])
         return user_attrs
+
+
+def includeme(config):
+    plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(RhodeCodeAuthPlugin.uid)
+    plugin_factory(plugin_id).includeme(config)

rhodecode/authentication/plugins/auth_jasig_cas.py

@@ -42,7 +42,7 b' from rhodecode.model.db import User'
 log = logging.getLogger(__name__)
 
 
-def plugin_factory(plugin_id, *args, **kwds):
+def plugin_factory(plugin_id, *args, **kwargs):
     """
     Factory function that is called during plugin discovery.
     It returns the plugin instance.
@@ -66,6 +66,7 b' class JasigCasSettingsSchema(AuthnPlugin'
 
 
 class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
+    uid = 'jasig_cas'
 
     def includeme(self, config):
         config.add_authn_plugin(self)
@@ -93,7 +94,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
 
     @hybrid_property
     def name(self):
-        return "jasig-cas"
+        return u"jasig-cas"
 
     @property
     def is_headers_auth(self):
@@ -165,3 +166,8 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
 
         log.info('user `%s` authenticated correctly', user_attrs['username'])
         return user_attrs
+
+
+def includeme(config):
+    plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(RhodeCodeAuthPlugin.uid)
+    plugin_factory(plugin_id).includeme(config)

rhodecode/authentication/plugins/auth_ldap.py

@@ -53,7 +53,7 b' class LdapError(Exception):'
     pass
 
 
-def plugin_factory(plugin_id, *args, **kwds):
+def plugin_factory(plugin_id, *args, **kwargs):
     """
     Factory function that is called during plugin discovery.
     It returns the plugin instance.
@@ -66,6 +66,171 b' class LdapAuthnResource(AuthnPluginResou'
     pass
 
 
+class AuthLdap(AuthLdapBase):
+    default_tls_cert_dir = '/etc/openldap/cacerts'
+
+    def __init__(self, server, base_dn, port=389, bind_dn='', bind_pass='',
+                 tls_kind='PLAIN', tls_reqcert='DEMAND', tls_cert_file=None,
+                 tls_cert_dir=None, ldap_version=3,
+                 search_scope='SUBTREE', attr_login='uid',
+                 ldap_filter='', timeout=None):
+        if ldap == Missing:
+            raise LdapImportError("Missing or incompatible ldap library")
+
+        self.debug = False
+        self.timeout = timeout or 60 * 5
+        self.ldap_version = ldap_version
+        self.ldap_server_type = 'ldap'
+
+        self.TLS_KIND = tls_kind
+
+        if self.TLS_KIND == 'LDAPS':
+            port = port or 689
+            self.ldap_server_type += 's'
+
+        OPT_X_TLS_DEMAND = 2
+        self.TLS_REQCERT = getattr(ldap, 'OPT_X_TLS_%s' % tls_reqcert, OPT_X_TLS_DEMAND)
+        self.TLS_CERT_FILE = tls_cert_file or ''
+        self.TLS_CERT_DIR = tls_cert_dir or self.default_tls_cert_dir
+
+        # split server into list
+        self.SERVER_ADDRESSES = self._get_server_list(server)
+        self.LDAP_SERVER_PORT = port
+
+        # USE FOR READ ONLY BIND TO LDAP SERVER
+        self.attr_login = attr_login
+
+        self.LDAP_BIND_DN = safe_str(bind_dn)
+        self.LDAP_BIND_PASS = safe_str(bind_pass)
+
+        self.SEARCH_SCOPE = getattr(ldap, 'SCOPE_%s' % search_scope)
+        self.BASE_DN = safe_str(base_dn)
+        self.LDAP_FILTER = safe_str(ldap_filter)
+
+    def _get_ldap_conn(self):
+
+        if self.debug:
+            ldap.set_option(ldap.OPT_DEBUG_LEVEL, 255)
+
+        if self.TLS_CERT_FILE and hasattr(ldap, 'OPT_X_TLS_CACERTFILE'):
+            ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, self.TLS_CERT_FILE)
+
+        elif hasattr(ldap, 'OPT_X_TLS_CACERTDIR'):
+            ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, self.TLS_CERT_DIR)
+
+        if self.TLS_KIND != 'PLAIN':
+            ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, self.TLS_REQCERT)
+
+        ldap.set_option(ldap.OPT_REFERRALS, ldap.OPT_OFF)
+        ldap.set_option(ldap.OPT_RESTART, ldap.OPT_ON)
+
+        # init connection now
+        ldap_servers = self._build_servers(
+            self.ldap_server_type,  self.SERVER_ADDRESSES, self.LDAP_SERVER_PORT)
+        log.debug('initializing LDAP connection to:%s', ldap_servers)
+        ldap_conn = ldap.initialize(ldap_servers)
+        ldap_conn.set_option(ldap.OPT_NETWORK_TIMEOUT, self.timeout)
+        ldap_conn.set_option(ldap.OPT_TIMEOUT, self.timeout)
+        ldap_conn.timeout = self.timeout
+
+        if self.ldap_version == 2:
+            ldap_conn.protocol = ldap.VERSION2
+        else:
+            ldap_conn.protocol = ldap.VERSION3
+
+        if self.TLS_KIND == 'START_TLS':
+            ldap_conn.start_tls_s()
+
+        if self.LDAP_BIND_DN and self.LDAP_BIND_PASS:
+            log.debug('Trying simple_bind with password and given login DN: %r',
+                      self.LDAP_BIND_DN)
+            ldap_conn.simple_bind_s(self.LDAP_BIND_DN, self.LDAP_BIND_PASS)
+
+        return ldap_conn
+
+    def fetch_attrs_from_simple_bind(self, server, dn, username, password):
+        try:
+            log.debug('Trying simple bind with %r', dn)
+            server.simple_bind_s(dn, safe_str(password))
+            user = server.search_ext_s(
+                dn, ldap.SCOPE_BASE, '(objectClass=*)', )[0]
+            _, attrs = user
+            return attrs
+
+        except ldap.INVALID_CREDENTIALS:
+            log.debug(
+                "LDAP rejected password for user '%s': %s, org_exc:",
+                username, dn, exc_info=True)
+
+    def authenticate_ldap(self, username, password):
+        """
+        Authenticate a user via LDAP and return his/her LDAP properties.
+
+        Raises AuthenticationError if the credentials are rejected, or
+        EnvironmentError if the LDAP server can't be reached.
+
+        :param username: username
+        :param password: password
+        """
+
+        uid = self.get_uid(username, self.SERVER_ADDRESSES)
+        user_attrs = {}
+        dn = ''
+
+        self.validate_password(username, password)
+        self.validate_username(username)
+
+        ldap_conn = None
+        try:
+            ldap_conn = self._get_ldap_conn()
+            filter_ = '(&%s(%s=%s))' % (
+                self.LDAP_FILTER, self.attr_login, username)
+            log.debug("Authenticating %r filter %s", self.BASE_DN, filter_)
+
+            lobjects = ldap_conn.search_ext_s(
+                self.BASE_DN, self.SEARCH_SCOPE, filter_)
+
+            if not lobjects:
+                log.debug("No matching LDAP objects for authentication "
+                          "of UID:'%s' username:(%s)", uid, username)
+                raise ldap.NO_SUCH_OBJECT()
+
+            log.debug('Found matching ldap object, trying to authenticate')
+            for (dn, _attrs) in lobjects:
+                if dn is None:
+                    continue
+
+                user_attrs = self.fetch_attrs_from_simple_bind(
+                    ldap_conn, dn, username, password)
+                if user_attrs:
+                    break
+            else:
+                raise LdapPasswordError(
+                    'Failed to authenticate user `{}`'
+                    'with given password'.format(username))
+
+        except ldap.NO_SUCH_OBJECT:
+            log.debug("LDAP says no such user '%s' (%s), org_exc:",
+                      uid, username, exc_info=True)
+            raise LdapUsernameError('Unable to find user')
+        except ldap.SERVER_DOWN:
+            org_exc = traceback.format_exc()
+            raise LdapConnectionError(
+                "LDAP can't access authentication "
+                "server, org_exc:%s" % org_exc)
+        finally:
+            if ldap_conn:
+                log.debug('ldap: connection release')
+                try:
+                    ldap_conn.unbind_s()
+                except Exception:
+                    # for any reason this can raise exception we must catch it
+                    # to not crush the server
+                    pass
+
+        return dn, user_attrs
+
+
 class LdapSettingsSchema(AuthnPluginSettingsSchemaBase):
     tls_kind_choices = ['PLAIN', 'LDAPS', 'START_TLS']
     tls_reqcert_choices = ['NEVER', 'ALLOW', 'TRY', 'DEMAND', 'HARD']
@@ -84,7 +249,7 b' class LdapSettingsSchema(AuthnPluginSett'
         colander.Int(),
         default=389,
         description=_('Custom port that the LDAP server is listening on. '
-                      'Default value is: 389'),
+                      'Default value is: 389, use 689 for LDAPS(SSL)'),
         preparer=strip_whitespace,
         title=_('Port'),
         validator=colander.Range(min=0, max=65536),
@@ -133,6 +298,22 b' class LdapSettingsSchema(AuthnPluginSett'
         title=_('Certificate Checks'),
         validator=colander.OneOf(tls_reqcert_choices),
         widget='select')
+    tls_cert_file = colander.SchemaNode(
+        colander.String(),
+        default='',
+        description=_('This specifies the PEM-format file path containing '
+                      'certificates for use in TLS connection.\n'
+                      'If not specified `TLS Cert dir` will be used'),
+        title=_('TLS Cert file'),
+        missing='',
+        widget='string')
+    tls_cert_dir = colander.SchemaNode(
+        colander.String(),
+        default=AuthLdap.default_tls_cert_dir,
+        description=_('This specifies the path of a directory that contains individual '
+                      'CA certificates in separate files.'),
+        title=_('TLS Cert dir'),
+        widget='string')
     base_dn = colander.SchemaNode(
         colander.String(),
         default='',
@@ -169,6 +350,16 b' class LdapSettingsSchema(AuthnPluginSett'
         title=_('Login Attribute'),
         missing_msg=_('The LDAP Login attribute of the CN must be specified'),
         widget='string')
+    attr_email = colander.SchemaNode(
+        colander.String(),
+        default='',
+        description=_('LDAP Attribute to map to email address (e.g., mail).\n'
+                      'Emails are a crucial part of RhodeCode. \n'
+                      'If possible add a valid email attribute to ldap users.'),
+        missing='',
+        preparer=strip_whitespace,
+        title=_('Email Attribute'),
+        widget='string')
     attr_firstname = colander.SchemaNode(
         colander.String(),
         default='',
@@ -185,182 +376,10 b' class LdapSettingsSchema(AuthnPluginSett'
         preparer=strip_whitespace,
         title=_('Last Name Attribute'),
         widget='string')
-    attr_email = colander.SchemaNode(
-        colander.String(),
-        default='',
-        description=_('LDAP Attribute to map to email address (e.g., mail).\n'
-                      'Emails are a crucial part of RhodeCode. \n'
-                      'If possible add a valid email attribute to ldap users.'),
-        missing='',
-        preparer=strip_whitespace,
-        title=_('Email Attribute'),
-        widget='string')
-
-
-class AuthLdap(AuthLdapBase):
-
-    def __init__(self, server, base_dn, port=389, bind_dn='', bind_pass='',
-                 tls_kind='PLAIN', tls_reqcert='DEMAND', ldap_version=3,
-                 search_scope='SUBTREE', attr_login='uid',
-                 ldap_filter='', timeout=None):
-        if ldap == Missing:
-            raise LdapImportError("Missing or incompatible ldap library")
-
-        self.debug = False
-        self.timeout = timeout or 60 * 5
-        self.ldap_version = ldap_version
-        self.ldap_server_type = 'ldap'
-
-        self.TLS_KIND = tls_kind
-
-        if self.TLS_KIND == 'LDAPS':
-            port = port or 689
-            self.ldap_server_type += 's'
-
-        OPT_X_TLS_DEMAND = 2
-        self.TLS_REQCERT = getattr(ldap, 'OPT_X_TLS_%s' % tls_reqcert,
-                                   OPT_X_TLS_DEMAND)
-        self.LDAP_SERVER = server
-        # split server into list
-        self.SERVER_ADDRESSES = self._get_server_list(server)
-        self.LDAP_SERVER_PORT = port
-
-        # USE FOR READ ONLY BIND TO LDAP SERVER
-        self.attr_login = attr_login
-
-        self.LDAP_BIND_DN = safe_str(bind_dn)
-        self.LDAP_BIND_PASS = safe_str(bind_pass)
-
-        self.SEARCH_SCOPE = getattr(ldap, 'SCOPE_%s' % search_scope)
-        self.BASE_DN = safe_str(base_dn)
-        self.LDAP_FILTER = safe_str(ldap_filter)
-
-    def _get_ldap_conn(self):
-
-        if self.debug:
-            ldap.set_option(ldap.OPT_DEBUG_LEVEL, 255)
-
-        if hasattr(ldap, 'OPT_X_TLS_CACERTDIR'):
-            ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, '/etc/openldap/cacerts')
-        if self.TLS_KIND != 'PLAIN':
-            ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, self.TLS_REQCERT)
-
-        ldap.set_option(ldap.OPT_REFERRALS, ldap.OPT_OFF)
-        ldap.set_option(ldap.OPT_RESTART, ldap.OPT_ON)
-
-        # init connection now
-        ldap_servers = self._build_servers(
-            self.ldap_server_type,  self.SERVER_ADDRESSES, self.LDAP_SERVER_PORT)
-        log.debug('initializing LDAP connection to:%s', ldap_servers)
-        ldap_conn = ldap.initialize(ldap_servers)
-        ldap_conn.set_option(ldap.OPT_NETWORK_TIMEOUT, self.timeout)
-        ldap_conn.set_option(ldap.OPT_TIMEOUT, self.timeout)
-        ldap_conn.timeout = self.timeout
-
-        if self.ldap_version == 2:
-            ldap_conn.protocol = ldap.VERSION2
-        else:
-            ldap_conn.protocol = ldap.VERSION3
-
-        if self.TLS_KIND == 'START_TLS':
-            ldap_conn.start_tls_s()
-
-        if self.LDAP_BIND_DN and self.LDAP_BIND_PASS:
-            log.debug('Trying simple_bind with password and given login DN: %s',
-                      self.LDAP_BIND_DN)
-            ldap_conn.simple_bind_s(self.LDAP_BIND_DN, self.LDAP_BIND_PASS)
-
-        return ldap_conn
-
-    def fetch_attrs_from_simple_bind(self, server, dn, username, password):
-        try:
-            log.debug('Trying simple bind with %s', dn)
-            server.simple_bind_s(dn, safe_str(password))
-            user = server.search_ext_s(
-                dn, ldap.SCOPE_BASE, '(objectClass=*)', )[0]
-            _, attrs = user
-            return attrs
-
-        except ldap.INVALID_CREDENTIALS:
-            log.debug(
-                "LDAP rejected password for user '%s': %s, org_exc:",
-                username, dn, exc_info=True)
-
-    def authenticate_ldap(self, username, password):
-        """
-        Authenticate a user via LDAP and return his/her LDAP properties.
-
-        Raises AuthenticationError if the credentials are rejected, or
-        EnvironmentError if the LDAP server can't be reached.
-
-        :param username: username
-        :param password: password
-        """
-
-        uid = self.get_uid(username, self.SERVER_ADDRESSES)
-        user_attrs = {}
-        dn = ''
-
-        if not password:
-            msg = "Authenticating user %s with blank password not allowed"
-            log.warning(msg, username)
-            raise LdapPasswordError(msg)
-        if "," in username:
-            raise LdapUsernameError(
-                "invalid character `,` in username: `{}`".format(username))
-        ldap_conn = None
-        try:
-            ldap_conn = self._get_ldap_conn()
-            filter_ = '(&%s(%s=%s))' % (
-                self.LDAP_FILTER, self.attr_login, username)
-            log.debug(
-                "Authenticating %r filter %s", self.BASE_DN, filter_)
-            lobjects = ldap_conn.search_ext_s(
-                self.BASE_DN, self.SEARCH_SCOPE, filter_)
-
-            if not lobjects:
-                log.debug("No matching LDAP objects for authentication "
-                          "of UID:'%s' username:(%s)", uid, username)
-                raise ldap.NO_SUCH_OBJECT()
-
-            log.debug('Found matching ldap object, trying to authenticate')
-            for (dn, _attrs) in lobjects:
-                if dn is None:
-                    continue
-
-                user_attrs = self.fetch_attrs_from_simple_bind(
-                    ldap_conn, dn, username, password)
-                if user_attrs:
-                    break
-
-            else:
-                raise LdapPasswordError(
-                    'Failed to authenticate user `{}`'
-                    'with given password'.format(username))
-
-        except ldap.NO_SUCH_OBJECT:
-            log.debug("LDAP says no such user '%s' (%s), org_exc:",
-                      uid, username, exc_info=True)
-            raise LdapUsernameError('Unable to find user')
-        except ldap.SERVER_DOWN:
-            org_exc = traceback.format_exc()
-            raise LdapConnectionError(
-                "LDAP can't access authentication "
-                "server, org_exc:%s" % org_exc)
-        finally:
-            if ldap_conn:
-                log.debug('ldap: connection release')
-                try:
-                    ldap_conn.unbind_s()
-                except Exception:
-                    # for any reason this can raise exception we must catch it
-                    # to not crush the server
-                    pass
-
-        return dn, user_attrs
 
 
 class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
+    uid = 'ldap'
     # used to define dynamic binding in the
     DYNAMIC_BIND_VAR = '$login'
     _settings_unsafe_keys = ['dn_pass']
@@ -389,9 +408,13 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
     def get_display_name(self):
         return _('LDAP')
 
+    @classmethod
+    def docs(cls):
+        return "https://docs.rhodecode.com/RhodeCode-Enterprise/auth/auth-ldap.html"
+
     @hybrid_property
     def name(self):
-        return "ldap"
+        return u"ldap"
 
     def use_fake_password(self):
         return True
@@ -448,6 +471,8 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
             'bind_pass': settings.get('dn_pass'),
             'tls_kind': settings.get('tls_kind'),
             'tls_reqcert': settings.get('tls_reqcert'),
+            'tls_cert_file': settings.get('tls_cert_file'),
+            'tls_cert_dir': settings.get('tls_cert_dir'),
             'search_scope': settings.get('search_scope'),
             'attr_login': settings.get('attr_login'),
             'ldap_version': 3,
@@ -477,12 +502,11 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
             extern_type = getattr(userobj, 'extern_type', '')
 
             groups = []
+
             user_attrs = {
                 'username': username,
-                'firstname': safe_unicode(
-                    get_ldap_attr('attr_firstname') or firstname),
-                'lastname': safe_unicode(
-                    get_ldap_attr('attr_lastname') or lastname),
+                'firstname': safe_unicode(get_ldap_attr('attr_firstname') or firstname),
+                'lastname': safe_unicode(get_ldap_attr('attr_lastname') or lastname),
                 'groups': groups,
                 'user_group_sync': False,
                 'email': get_ldap_attr('attr_email') or email,
@@ -492,6 +516,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
                 'extern_name': user_dn,
                 'extern_type': extern_type,
             }
+
             log.debug('ldap user: %s', user_attrs)
             log.info('user `%s` authenticated correctly', user_attrs['username'])
 
@@ -504,3 +529,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
             log.exception("Other exception")
             return None
 
+
+def includeme(config):
+    plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(RhodeCodeAuthPlugin.uid)
+    plugin_factory(plugin_id).includeme(config)

rhodecode/authentication/plugins/auth_pam.py

@@ -40,7 +40,7 b' from rhodecode.lib.colander_utils import'
 log = logging.getLogger(__name__)
 
 
-def plugin_factory(plugin_id, *args, **kwds):
+def plugin_factory(plugin_id, *args, **kwargs):
     """
     Factory function that is called during plugin discovery.
     It returns the plugin instance.
@@ -72,6 +72,7 b' class PamSettingsSchema(AuthnPluginSetti'
 
 
 class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
+    uid = 'pam'
     # PAM authentication can be slow. Repository operations involve a lot of
     # auth calls. Little caching helps speedup push/pull operations significantly
     AUTH_CACHE_TTL = 4
@@ -97,9 +98,13 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
     def get_display_name(self):
         return _('PAM')
 
+    @classmethod
+    def docs(cls):
+        return "https://docs.rhodecode.com/RhodeCode-Enterprise/auth/auth-pam.html"
+
     @hybrid_property
     def name(self):
-        return "pam"
+        return u"pam"
 
     def get_settings_schema(self):
         return PamSettingsSchema()
@@ -159,3 +164,8 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
         log.debug("pamuser: %s", user_attrs)
         log.info('user `%s` authenticated correctly', user_attrs['username'])
         return user_attrs
+
+
+def includeme(config):
+    plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(RhodeCodeAuthPlugin.uid)
+    plugin_factory(plugin_id).includeme(config)

rhodecode/authentication/plugins/auth_rhodecode.py

@@ -34,7 +34,7 b' from rhodecode.model.db import User'
 log = logging.getLogger(__name__)
 
 
-def plugin_factory(plugin_id, *args, **kwds):
+def plugin_factory(plugin_id, *args, **kwargs):
     plugin = RhodeCodeAuthPlugin(plugin_id)
     return plugin
 
@@ -44,6 +44,7 b' class RhodecodeAuthnResource(AuthnPlugin'
 
 
 class RhodeCodeAuthPlugin(RhodeCodeAuthPluginBase):
+    uid = 'rhodecode'
 
     def includeme(self, config):
         config.add_authn_plugin(self)
@@ -64,11 +65,15 b' class RhodeCodeAuthPlugin(RhodeCodeAuthP'
             context=RhodecodeAuthnResource)
 
     def get_display_name(self):
-        return _('Rhodecode')
+        return _('RhodeCode Internal')
+
+    @classmethod
+    def docs(cls):
+        return "https://docs.rhodecode.com/RhodeCode-Enterprise/auth/auth.html"
 
     @hybrid_property
     def name(self):
-        return "rhodecode"
+        return u"rhodecode"
 
     def user_activation_state(self):
         def_user_perms = User.get_default_user().AuthUser().permissions['global']
@@ -141,3 +146,8 b' class RhodeCodeAuthPlugin(RhodeCodeAuthP'
                 'user `%s` failed to authenticate via %s, reason: account not '
                 'active.', username, self.name)
             return None
+
+
+def includeme(config):
+    plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(RhodeCodeAuthPlugin.uid)
+    plugin_factory(plugin_id).includeme(config)

rhodecode/authentication/plugins/auth_token.py

@@ -34,7 +34,7 b' from rhodecode.model.db import User, Use'
 log = logging.getLogger(__name__)
 
 
-def plugin_factory(plugin_id, *args, **kwds):
+def plugin_factory(plugin_id, *args, **kwargs):
     plugin = RhodeCodeAuthPlugin(plugin_id)
     return plugin
 
@@ -47,6 +47,7 b' class RhodeCodeAuthPlugin(RhodeCodeAuthP'
     """
     Enables usage of authentication tokens for vcs operations.
     """
+    uid = 'token'
 
     def includeme(self, config):
         config.add_authn_plugin(self)
@@ -67,11 +68,15 b' class RhodeCodeAuthPlugin(RhodeCodeAuthP'
             context=RhodecodeAuthnResource)
 
     def get_display_name(self):
-        return _('Rhodecode Token Auth')
+        return _('Rhodecode Token')
+
+    @classmethod
+    def docs(cls):
+        return "https://docs.rhodecode.com/RhodeCode-Enterprise/auth/auth-token.html"
 
     @hybrid_property
     def name(self):
-        return "authtoken"
+        return u"authtoken"
 
     def user_activation_state(self):
         def_user_perms = User.get_default_user().AuthUser().permissions['global']
@@ -145,3 +150,8 b' class RhodeCodeAuthPlugin(RhodeCodeAuthP'
                 'user `%s` failed to authenticate via %s, reason: account not '
                 'active.', username, self.name)
         return None
+
+
+def includeme(config):
+    plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(RhodeCodeAuthPlugin.uid)
+    plugin_factory(plugin_id).includeme(config)

rhodecode/authentication/routes.py

@@ -19,6 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import logging
+import collections
 
 from pyramid.exceptions import ConfigurationError
 
@@ -55,9 +56,9 b' class AuthnRootResource(AuthnResourceBas'
     """
 
     def __init__(self):
-        self._store = {}
+        self._store = collections.OrderedDict()
         self._resource_name_map = {}
-        self.display_name = _('Global')
+        self.display_name = _('Authentication Plugins')
 
     def __getitem__(self, key):
         """
@@ -87,23 +88,27 b' class AuthnRootResource(AuthnResourceBas'
         # TODO: Store this info in the resource element.
         return self._resource_name_map[resource_name]
 
-    def get_sorted_list(self):
+    def get_sorted_list(self, sort_key=None):
         """
         Returns a sorted list of sub resources for displaying purposes.
         """
-        def sort_key(resource):
+        def default_sort_key(resource):
             return str.lower(safe_str(resource.display_name))
 
         active = [item for item in self]
-        return sorted(active, key=sort_key)
+        return sorted(active, key=sort_key or default_sort_key)
 
-    def get_nav_list(self):
+    def get_nav_list(self, sort=True):
         """
         Returns a sorted list of resources for displaying the navigation.
         """
-        list = self.get_sorted_list()
-        list.insert(0, self)
-        return list
+        if sort:
+            nav_list = self.get_sorted_list()
+        else:
+            nav_list = [item for item in self]
+
+        nav_list.insert(0, self)
+        return nav_list
 
     def add_authn_resource(self, config, plugin_id, resource):
         """

rhodecode/config/middleware.py

@@ -23,6 +23,7 b' import sys'
 import logging
 import collections
 import tempfile
+import time
 
 from paste.gzipper import make_gzip_middleware
 import pyramid.events
@@ -63,6 +64,14 b' def is_http_error(response):'
     return response.status_code > 499
 
 
+def should_load_all():
+    """
+    Returns if all application components should be loaded. In some cases it's
+    desired to skip apps loading for faster shell script execution
+    """
+    return True
+
+
 def make_pyramid_app(global_config, **settings):
     """
     Constructs the WSGI application based on Pyramid.
@@ -78,8 +87,13 b' def make_pyramid_app(global_config, **se'
 
     # Allows to use format style "{ENV_NAME}" placeholders in the configuration. It
     # will be replaced by the value of the environment variable "NAME" in this case.
-    environ = {
-        'ENV_{}'.format(key): value for key, value in os.environ.items()}
+    start_time = time.time()
+
+    debug = asbool(global_config.get('debug'))
+    if debug:
+        enable_debug()
+
+    environ = {'ENV_{}'.format(key): value for key, value in os.environ.items()}
 
     global_config = _substitute_values(global_config, environ)
     settings = _substitute_values(settings, environ)
@@ -105,8 +119,10 b' def make_pyramid_app(global_config, **se'
     config.configure_celery(global_config['__file__'])
     # creating the app uses a connection - return it after we are done
     meta.Session.remove()
+    total_time = time.time() - start_time
+    log.info('Pyramid app `%s` created and configured in %.2fs',
+             pyramid_app.func_name, total_time)
 
-    log.info('Pyramid app %s created and configured.', pyramid_app)
     return pyramid_app
 
 
@@ -215,6 +231,7 b' def includeme_first(config):'
 
 
 def includeme(config):
+    log.debug('Initializing main includeme from %s', os.path.basename(__file__))
     settings = config.registry.settings
     config.set_request_factory(Request)
 
@@ -229,41 +246,58 b' def includeme(config):'
     if asbool(settings.get('appenlight', 'false')):
         config.include('appenlight_client.ext.pyramid_tween')
 
+    load_all = should_load_all()
+
     # Includes which are required. The application would fail without them.
     config.include('pyramid_mako')
     config.include('pyramid_beaker')
     config.include('rhodecode.lib.rc_cache')
 
+    config.include('rhodecode.apps._base.navigation')
+    config.include('rhodecode.apps._base.subscribers')
+    config.include('rhodecode.tweens')
+
+    config.include('rhodecode.integrations')
     config.include('rhodecode.authentication')
-    config.include('rhodecode.integrations')
+
+    if load_all:
+        from rhodecode.authentication import discover_legacy_plugins
+        # load CE authentication plugins
+        config.include('rhodecode.authentication.plugins.auth_crowd')
+        config.include('rhodecode.authentication.plugins.auth_headers')
+        config.include('rhodecode.authentication.plugins.auth_jasig_cas')
+        config.include('rhodecode.authentication.plugins.auth_ldap')
+        config.include('rhodecode.authentication.plugins.auth_pam')
+        config.include('rhodecode.authentication.plugins.auth_rhodecode')
+        config.include('rhodecode.authentication.plugins.auth_token')
+
+        # Auto discover authentication plugins and include their configuration.
+        discover_legacy_plugins(config)
 
     # apps
     config.include('rhodecode.apps._base')
-    config.include('rhodecode.apps.ops')
 
-    config.include('rhodecode.apps.admin')
-    config.include('rhodecode.apps.channelstream')
-    config.include('rhodecode.apps.login')
-    config.include('rhodecode.apps.home')
-    config.include('rhodecode.apps.journal')
-    config.include('rhodecode.apps.repository')
-    config.include('rhodecode.apps.repo_group')
-    config.include('rhodecode.apps.user_group')
-    config.include('rhodecode.apps.search')
-    config.include('rhodecode.apps.user_profile')
-    config.include('rhodecode.apps.user_group_profile')
-    config.include('rhodecode.apps.my_account')
-    config.include('rhodecode.apps.svn_support')
-    config.include('rhodecode.apps.ssh_support')
-    config.include('rhodecode.apps.gist')
+    if load_all:
+        config.include('rhodecode.apps.ops')
+        config.include('rhodecode.apps.admin')
+        config.include('rhodecode.apps.channelstream')
+        config.include('rhodecode.apps.login')
+        config.include('rhodecode.apps.home')
+        config.include('rhodecode.apps.journal')
+        config.include('rhodecode.apps.repository')
+        config.include('rhodecode.apps.repo_group')
+        config.include('rhodecode.apps.user_group')
+        config.include('rhodecode.apps.search')
+        config.include('rhodecode.apps.user_profile')
+        config.include('rhodecode.apps.user_group_profile')
+        config.include('rhodecode.apps.my_account')
+        config.include('rhodecode.apps.svn_support')
+        config.include('rhodecode.apps.ssh_support')
+        config.include('rhodecode.apps.gist')
+        config.include('rhodecode.apps.debug_style')
+        config.include('rhodecode.api')
 
-    config.include('rhodecode.apps.debug_style')
-    config.include('rhodecode.tweens')
-    config.include('rhodecode.api')
-
-    config.add_route(
-        'rhodecode_support', 'https://rhodecode.com/help/', static=True)
-
+    config.add_route('rhodecode_support', 'https://rhodecode.com/help/', static=True)
     config.add_translation_dirs('rhodecode:i18n/')
     settings['default_locale_name'] = settings.get('lang', 'en')
 
@@ -403,6 +437,114 b' def sanitize_settings_and_apply_defaults'
     return settings
 
 
+def enable_debug():
+    """
+    Helper to enable debug on running instance
+    :return:
+    """
+    import tempfile
+    import textwrap
+    import logging.config
+
+    ini_template = textwrap.dedent("""
+    #####################################
+    ### DEBUG LOGGING CONFIGURATION  ####
+    #####################################
+    [loggers]
+    keys = root, sqlalchemy, beaker, celery, rhodecode, ssh_wrapper
+
+    [handlers]
+    keys = console, console_sql
+
+    [formatters]
+    keys = generic, color_formatter, color_formatter_sql
+
+    #############
+    ## LOGGERS ##
+    #############
+    [logger_root]
+    level = NOTSET
+    handlers = console
+
+    [logger_sqlalchemy]
+    level = INFO
+    handlers = console_sql
+    qualname = sqlalchemy.engine
+    propagate = 0
+
+    [logger_beaker]
+    level = DEBUG
+    handlers =
+    qualname = beaker.container
+    propagate = 1
+
+    [logger_rhodecode]
+    level = DEBUG
+    handlers =
+    qualname = rhodecode
+    propagate = 1
+
+    [logger_ssh_wrapper]
+    level = DEBUG
+    handlers =
+    qualname = ssh_wrapper
+    propagate = 1
+
+    [logger_celery]
+    level = DEBUG
+    handlers =
+    qualname = celery
+
+
+    ##############
+    ## HANDLERS ##
+    ##############
+
+    [handler_console]
+    class = StreamHandler
+    args = (sys.stderr, )
+    level = DEBUG
+    formatter = color_formatter
+
+    [handler_console_sql]
+    # "level = DEBUG" logs SQL queries and results.
+    # "level = INFO" logs SQL queries.
+    # "level = WARN" logs neither.  (Recommended for production systems.)
+    class = StreamHandler
+    args = (sys.stderr, )
+    level = WARN
+    formatter = color_formatter_sql
+
+    ################
+    ## FORMATTERS ##
+    ################
+
+    [formatter_generic]
+    class = rhodecode.lib.logging_formatter.ExceptionAwareFormatter
+    format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s | %(req_id)s
+    datefmt = %Y-%m-%d %H:%M:%S
+
+    [formatter_color_formatter]
+    class = rhodecode.lib.logging_formatter.ColorRequestTrackingFormatter
+    format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s | %(req_id)s
+    datefmt = %Y-%m-%d %H:%M:%S
+
+    [formatter_color_formatter_sql]
+    class = rhodecode.lib.logging_formatter.ColorFormatterSql
+    format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
+    datefmt = %Y-%m-%d %H:%M:%S    
+    """)
+
+    with tempfile.NamedTemporaryFile(prefix='rc_debug_logging_', suffix='.ini',
+                                     delete=False) as f:
+        log.info('Saved Temporary DEBUG config at %s', f.name)
+        f.write(ini_template)
+
+    logging.config.fileConfig(f.name)
+    log.debug('DEBUG MODE ON')
+    os.remove(f.name)
+
+
 def _sanitize_appenlight_settings(settings):
     _bool_setting(settings, 'appenlight', 'false')
 
@@ -447,7 +589,7 b' def _sanitize_cache_settings(settings):'
 
     # ensure we have our dir created
     if not os.path.isdir(default_cache_dir):
-        os.makedirs(default_cache_dir, mode=0755)
+        os.makedirs(default_cache_dir, mode=0o755)
 
     # exception store cache
     _string_setting(
@@ -578,5 +720,8 b' def _substitute_values(mapping, substitu'
         raise ValueError(
             'Failed to substitute env variable: {}. '
             'Make sure you have specified this env variable without ENV_ prefix'.format(e))
+    except ValueError as e:
+        log.warning('Failed to substitute ENV variable: %s', e)
+        result = mapping
 
     return result

rhodecode/config/rcextensions/helpers/extract_pre_commits.py

@@ -27,6 +27,7 b' us in hooks::'
 """
 import re
 import collections
+import json
 
 
 def get_hg_commits(repo, refs):
@@ -36,6 +37,31 b' def get_hg_commits(repo, refs):'
 
 def get_git_commits(repo, refs):
     commits = []
+
+    for data in refs:
+        # we should now extract commit data
+        old_rev = data['old_rev']
+        new_rev = data['new_rev']
+
+        if '00000000' in old_rev:
+            # new branch, we don't need to extract nothing
+            return commits
+
+        git_env = dict(data['git_env'])
+        cmd = [
+            'log',
+            '--pretty=format:{"commit_id": "%H",  "author": "%aN <%aE>",  "date": "%ad",  "message": "%f"}',
+            '{}...{}'.format(old_rev, new_rev)
+        ]
+
+        stdout, stderr = repo.run_git_command(cmd, extra_env=git_env)
+        for line in stdout.splitlines():
+            try:
+                data = json.loads(line)
+                commits.append(data)
+            except Exception:
+                print('Failed to load data from GIT line')
+
     return commits
 
 
@@ -51,13 +77,14 b' def run(*args, **kwargs):'
 
     commits = []
 
-    for rev_data in kwargs['commit_ids']:
-        new_environ = dict((k, v) for k, v in rev_data['hg_env'])
-
     if vcs_type == 'git':
+        for rev_data in kwargs['commit_ids']:
+            new_environ = dict((k, v) for k, v in rev_data['git_env'])
         commits = get_git_commits(vcs_repo, kwargs['commit_ids'])
 
     if vcs_type == 'hg':
+        for rev_data in kwargs['commit_ids']:
+            new_environ = dict((k, v) for k, v in rev_data['hg_env'])
         commits = get_hg_commits(vcs_repo, kwargs['commit_ids'])
 
     return commits

rhodecode/config/rcextensions/utils.py

@@ -145,3 +145,41 b' def maybe_log_call(name, args, kwargs):'
     if hasattr(rcextensions, 'calls'):
         calls = rcextensions.calls
         calls[name].append((args, kwargs))
+
+
+def str2bool(_str):
+    """
+    returns True/False value from given string, it tries to translate the
+    string into boolean
+
+    :param _str: string value to translate into boolean
+    :rtype: boolean
+    :returns: boolean from given string
+    """
+    if _str is None:
+        return False
+    if _str in (True, False):
+        return _str
+    _str = str(_str).strip().lower()
+    return _str in ('t', 'true', 'y', 'yes', 'on', '1')
+
+
+def aslist(obj, sep=None, strip=True):
+    """
+    Returns given string separated by sep as list
+
+    :param obj:
+    :param sep:
+    :param strip:
+    """
+    if isinstance(obj, (basestring,)):
+        lst = obj.split(sep)
+        if strip:
+            lst = [v.strip() for v in lst]
+        return lst
+    elif isinstance(obj, (list, tuple)):
+        return obj
+    elif obj is None:
+        return []
+    else:
+        return [obj]
  No newline at end of file

rhodecode/config/routing_links.py

@@ -43,7 +43,7 b' then you can retrieve the url by simply '
 The redirection must be first implemented in our servers before
 you can see it working.
 """
-# flake8: noqa
+# pragma: no cover
 from __future__ import unicode_literals
 
 link_config = [

rhodecode/events/__init__.py

@@ -44,7 +44,7 b' def trigger(event, registry=None):'
         integrations_event_handler(event)
 
 
-from rhodecode.events.user import (  # noqa
+from rhodecode.events.user import (  # pragma: no cover
     UserPreCreate,
     UserPostCreate,
     UserPreUpdate,
@@ -52,7 +52,7 b' from rhodecode.events.user import ( # n'
     UserPermissionsChange,
 )
 
-from rhodecode.events.repo import (  # noqa
+from rhodecode.events.repo import (  # pragma: no cover
     RepoEvent,
     RepoPreCreateEvent, RepoCreateEvent,
     RepoPreDeleteEvent, RepoDeleteEvent,
@@ -60,14 +60,14 b' from rhodecode.events.repo import ( # n'
     RepoPrePullEvent,   RepoPullEvent,
 )
 
-from rhodecode.events.repo_group import (  # noqa
+from rhodecode.events.repo_group import (  # pragma: no cover
     RepoGroupEvent,
     RepoGroupCreateEvent,
     RepoGroupUpdateEvent,
     RepoGroupDeleteEvent,
 )
 
-from rhodecode.events.pullrequest import (  # noqa
+from rhodecode.events.pullrequest import (  # pragma: no cover
     PullRequestEvent,
     PullRequestCreateEvent,
     PullRequestUpdateEvent,

rhodecode/integrations/registry.py

@@ -32,6 +32,6 b' class IntegrationTypeRegistry(collection'
         if key in self:
             log.debug(
                 'Overriding existing integration type %s (%s) with %s',
-                self[key], key, IntegrationType)
+                self[key].__class__, key, IntegrationType)
 
         self[key] = IntegrationType

rhodecode/integrations/types/hipchat.py

@@ -36,6 +36,26 b' from rhodecode.integrations.types.base i'
 
 log = logging.getLogger(__name__)
 
+REPO_PUSH_TEMPLATE = Template('''
+<b>${data['actor']['username']}</b> pushed to repo <a href="${data['repo']['url']}">${data['repo']['repo_name']}</a>:
+<br>
+<ul>
+%for branch, branch_commits in branches_commits.items():
+    <li>
+        % if branch:
+        <a href="${branch_commits['branch']['url']}">branch: ${branch_commits['branch']['name']}</a>
+        % else:
+        to trunk
+        % endif
+        <ul>
+        % for commit in branch_commits['commits']:
+            <li><a href="${commit['url']}">${commit['short_id']}</a> - ${commit['message_html']}</li>
+        % endfor
+        </ul>
+    </li>
+%endfor
+''')
+
 
 class HipchatSettingsSchema(colander.Schema):
     color_choices = [
@@ -76,27 +96,6 b' class HipchatSettingsSchema(colander.Sch'
     )
 
 
-repo_push_template = Template('''
-<b>${data['actor']['username']}</b> pushed to repo <a href="${data['repo']['url']}">${data['repo']['repo_name']}</a>:
-<br>
-<ul>
-%for branch, branch_commits in branches_commits.items():
-    <li>
-        % if branch:
-        <a href="${branch_commits['branch']['url']}">branch: ${branch_commits['branch']['name']}</a>
-        % else:
-        to trunk
-        % endif
-        <ul>
-        % for commit in branch_commits['commits']:
-            <li><a href="${commit['url']}">${commit['short_id']}</a> - ${commit['message_html']}</li>
-        % endfor
-        </ul>
-    </li>
-%endfor
-''')
-
-
 class HipchatIntegrationType(IntegrationTypeBase, CommitParsingDataHandler):
     key = 'hipchat'
     display_name = _('Hipchat')
@@ -226,7 +225,7 b' class HipchatIntegrationType(Integration'
             data['push']['branches'], data['push']['commits'])
 
         result = render_with_traceback(
-            repo_push_template,
+            REPO_PUSH_TEMPLATE,
             data=data,
             branches_commits=branches_commits,
         )

rhodecode/integrations/types/slack.py

@@ -41,6 +41,30 b' from rhodecode.integrations.types.base i'
 log = logging.getLogger(__name__)
 
 
+def html_to_slack_links(message):
+    return re.compile(r'<a .*?href=["\'](.+?)".*?>(.+?)</a>').sub(
+        r'<\1|\2>', message)
+
+
+REPO_PUSH_TEMPLATE = Template('''
+<%
+    def branch_text(branch):
+        if branch:
+            return 'on branch: <{}|{}>'.format(branch_commits['branch']['url'], branch_commits['branch']['name'])
+        else:
+            ## case for SVN no branch push...
+            return 'to trunk'
+%> \
+
+% for branch, branch_commits in branches_commits.items():
+${len(branch_commits['commits'])} ${'commit' if len(branch_commits['commits']) == 1 else 'commits'} ${branch_text(branch)}
+% for commit in branch_commits['commits']:
+`<${commit['url']}|${commit['short_id']}>` - ${commit['message_html']|html_to_slack_links}
+% endfor
+% endfor
+''')
+
+
 class SlackSettingsSchema(colander.Schema):
     service = colander.SchemaNode(
         colander.String(),
@@ -258,7 +282,6 b' class SlackIntegrationType(IntegrationTy'
         return title, text
 
     def format_repo_push_event(self, data):
-
         branches_commits = self.aggregate_branch_data(
             data['push']['branches'], data['push']['commits'])
 
@@ -267,25 +290,8 b' class SlackIntegrationType(IntegrationTy'
         ''')
         title = render_with_traceback(template, data=data)
 
-        repo_push_template = Template(textwrap.dedent(r'''
-        <%
-            def branch_text(branch):
-                if branch:
-                    return 'on branch: <{}|{}>'.format(branch_commits['branch']['url'], branch_commits['branch']['name'])
-                else:
-                    ## case for SVN no branch push...
-                    return 'to trunk'
-        %> \
-        % for branch, branch_commits in branches_commits.items():
-        ${len(branch_commits['commits'])} ${'commit' if len(branch_commits['commits']) == 1 else 'commits'} ${branch_text(branch)}
-        % for commit in branch_commits['commits']:
-        `<${commit['url']}|${commit['short_id']}>` - ${commit['message_html']|html_to_slack_links}
-        % endfor
-        % endfor
-        '''))
-
         text = render_with_traceback(
-            repo_push_template,
+            REPO_PUSH_TEMPLATE,
             data=data,
             branches_commits=branches_commits,
             html_to_slack_links=html_to_slack_links,
@@ -308,11 +314,6 b' class SlackIntegrationType(IntegrationTy'
         return title, text
 
 
-def html_to_slack_links(message):
-    return re.compile(r'<a .*?href=["\'](.+?)".*?>(.+?)</a>').sub(
-        r'<\1|\2>', message)
-
-
 @async_task(ignore_result=True, base=RequestContextTask)
 def post_text_to_slack(settings, title, text, fields=None, overrides=None):
     log.debug('sending %s (%s) to slack %s', title, text, settings['service'])

rhodecode/integrations/views.py

@@ -25,9 +25,9 b' import webhelpers.paginate'
 
 from pyramid.httpexceptions import HTTPFound, HTTPForbidden, HTTPNotFound
 
+from rhodecode.integrations import integration_type_registry
 from rhodecode.apps._base import BaseAppView
-from rhodecode.integrations import integration_type_registry
-from rhodecode.apps.admin.navigation import navigation_list
+from rhodecode.apps._base.navigation import navigation_list
 from rhodecode.lib.auth import (
     LoginRequired, CSRFRequired, HasPermissionAnyDecorator,
     HasRepoPermissionAnyDecorator, HasRepoGroupPermissionAnyDecorator)

rhodecode/lib/bleach_whitelist.py

@@ -60,6 +60,7 b' markdown_tags = ['
     "table", "thead", "tbody", "tfoot", "tr", "th", "td",
     "img",
     "a",
+    "input",
 ]
 
 markdown_attrs = {
@@ -68,7 +69,8 b' markdown_attrs = {'
     "a": ["href", "alt", "title", "name"],
     "abbr": ["title"],
     "acronym": ["title"],
-    "pre": ["lang"]
+    "pre": ["lang"],
+    "input": ["type", "disabled"]
 }
 
 standard_styles = [

rhodecode/lib/celerylib/loader.py

@@ -33,7 +33,7 b' import importlib'
 from celery import Celery
 from celery import signals
 from celery import Task
-from celery import exceptions  # noqa
+from celery import exceptions  # pragma: no cover
 from kombu.serialization import register
 from pyramid.threadlocal import get_current_request
 

rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py

@@ -40,12 +40,12 b' from sqlalchemy import ('
     Boolean, String, Unicode, UnicodeText, DateTime, Integer, LargeBinary,
     Text, Float, PickleType)
 from sqlalchemy.sql.expression import true, false
-from sqlalchemy.sql.functions import coalesce, count  # noqa
+from sqlalchemy.sql.functions import coalesce, count  # pragma: no cover
 from sqlalchemy.orm import (
     relationship, joinedload, class_mapper, validates, aliased)
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.hybrid import hybrid_property
-from sqlalchemy.exc import IntegrityError  # noqa
+from sqlalchemy.exc import IntegrityError  # pragma: no cover
 from sqlalchemy.dialects.mysql import LONGTEXT
 from beaker.cache import cache_region
 from zope.cachedescriptors.property import Lazy as LazyProperty

rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py

@@ -40,12 +40,12 b' from sqlalchemy import ('
     Boolean, String, Unicode, UnicodeText, DateTime, Integer, LargeBinary,
     Text, Float, PickleType)
 from sqlalchemy.sql.expression import true, false
-from sqlalchemy.sql.functions import coalesce, count  # noqa
+from sqlalchemy.sql.functions import coalesce, count  # pragma: no cover
 from sqlalchemy.orm import (
     relationship, joinedload, class_mapper, validates, aliased)
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.hybrid import hybrid_property
-from sqlalchemy.exc import IntegrityError  # noqa
+from sqlalchemy.exc import IntegrityError  # pragma: no cover
 from sqlalchemy.dialects.mysql import LONGTEXT
 from beaker.cache import cache_region
 from zope.cachedescriptors.property import Lazy as LazyProperty

rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py

@@ -41,7 +41,7 b' from sqlalchemy.ext.hybrid import hybrid'
 from sqlalchemy.orm import (
     relationship, joinedload, class_mapper, validates, aliased)
 from sqlalchemy.sql.expression import true
-from sqlalchemy.sql.functions import coalesce, count  # noqa
+from sqlalchemy.sql.functions import coalesce, count  # pragma: no cover
 from beaker.cache import cache_region
 from zope.cachedescriptors.property import Lazy as LazyProperty
 

rhodecode/lib/diff_match_patch.py

@@ -95,7 +95,7 b' class diff_match_patch:'
       Array of changes.
     """
     # Set a deadline by which time the diff must be complete.
-    if deadline == None:
+    if deadline is None:
       # Unlike in most languages, Python counts time in seconds.
       if self.Diff_Timeout <= 0:
         deadline = sys.maxint
@@ -103,7 +103,7 b' class diff_match_patch:'
         deadline = time.time() + self.Diff_Timeout
 
     # Check for null inputs.
-    if text1 == None or text2 == None:
+    if text1 is None or text2 is None:
       raise ValueError("Null inputs. (diff_main)")
 
     # Check for equality (speedup).
@@ -1227,7 +1227,7 b' class diff_match_patch:'
       Best match index or -1.
     """
     # Check for null inputs.
-    if text == None or pattern == None:
+    if text is None or pattern is None:
       raise ValueError("Null inputs. (match_main)")
 
     loc = max(0, min(loc, len(text)))

rhodecode/lib/helpers.py

@@ -1018,7 +1018,7 b' def style_metatag(tag_type, value):'
     return html_value
 
 
-def bool2icon(value):
+def bool2icon(value, show_at_false=True):
     """
     Returns boolean value of a given value, represented as html element with
     classes that will represent icons
@@ -1029,8 +1029,9 b' def bool2icon(value):'
     if value:  # does bool conversion
         return HTML.tag('i', class_="icon-true")
     else:  # not true as bool
-        return HTML.tag('i', class_="icon-false")
-
+        if show_at_false:
+            return HTML.tag('i', class_="icon-false")
+        return HTML.tag('i')
 
 #==============================================================================
 # PERMS

rhodecode/lib/index/whoosh.py

@@ -264,7 +264,7 b' class WhooshResultWrapper(object):'
         # inside hit object, and we don't need all
         res = dict(hit)
 
-        f_path = ''  # noqa
+        f_path = ''  # pragma: no cover
         if self.search_type in ['content', 'path']:
             f_path = res['path'][len(res['repository']):]
             f_path = f_path.lstrip(os.sep)

rhodecode/lib/logging_formatter.py

@@ -126,7 +126,8 b' class ColorFormatter(ExceptionAwareForma'
 def _inject_req_id(record):
     from pyramid.threadlocal import get_current_request
     req = get_current_request()
-    req_id = 'req_id:%-36s ' % (getattr(req, 'req_id', None))
+    dummy = '00000000-0000-0000-0000-000000000000'
+    req_id = 'req_id:%-36s' % (getattr(req, 'req_id', dummy))
     record.req_id = req_id
 
 

rhodecode/lib/markdown_ext.py

@@ -22,36 +22,7 b' import re'
 
 import markdown
 
-from mdx_gfm import GithubFlavoredMarkdownExtension  # noqa
-
-
-class FlavoredCheckboxExtension(markdown.Extension):
-
-    def extendMarkdown(self, md, md_globals):
-        md.preprocessors.add('checklist',
-                             FlavoredCheckboxPreprocessor(md), '<reference')
-        md.postprocessors.add('checklist',
-                              FlavoredCheckboxPostprocessor(md), '>unescape')
-
-
-class FlavoredCheckboxPreprocessor(markdown.preprocessors.Preprocessor):
-    """
-    Replaces occurrences of [ ] or [x] to checkbox input
-    """
-
-    pattern = re.compile(r'^([*-]) \[([ x])\]')
-
-    def run(self, lines):
-        return [self._transform_line(line) for line in lines]
-
-    def _transform_line(self, line):
-        return self.pattern.sub(self._replacer, line)
-
-    def _replacer(self, match):
-        list_prefix, state = match.groups()
-        checked = '' if state == ' ' else ' checked="checked"'
-        return '%s <input type="checkbox" disabled="disabled"%s>' % (list_prefix,
-                                                                   checked)
+from mdx_gfm import GithubFlavoredMarkdownExtension  # pragma: no cover
 
 
 class FlavoredCheckboxPostprocessor(markdown.postprocessors.Postprocessor):

rhodecode/lib/markup_renderer.py

@@ -40,8 +40,7 b' from docutils.writers import html4css1'
 import markdown
 
 from rhodecode.lib.markdown_ext import GithubFlavoredMarkdownExtension
-from rhodecode.lib.utils2 import (
-    safe_str, safe_unicode, md5_safe, MENTIONS_REGEX)
+from rhodecode.lib.utils2 import (safe_unicode, md5_safe, MENTIONS_REGEX)
 
 log = logging.getLogger(__name__)
 
@@ -172,6 +171,32 b' def relative_path(path, request_path, is'
     return u'/' + final_path
 
 
+_cached_markdown_renderer = None
+
+
+def get_markdown_renderer(extensions, output_format):
+    global _cached_markdown_renderer
+
+    if _cached_markdown_renderer is None:
+        _cached_markdown_renderer = markdown.Markdown(
+            extensions=extensions,
+            enable_attributes=False, output_format=output_format)
+    return _cached_markdown_renderer
+
+
+_cached_markdown_renderer_flavored = None
+
+
+def get_markdown_renderer_flavored(extensions, output_format):
+    global _cached_markdown_renderer_flavored
+
+    if _cached_markdown_renderer_flavored is None:
+        _cached_markdown_renderer_flavored = markdown.Markdown(
+            extensions=extensions + [GithubFlavoredMarkdownExtension()],
+            enable_attributes=False, output_format=output_format)
+    return _cached_markdown_renderer_flavored
+
+
 class MarkupRenderer(object):
     RESTRUCTUREDTEXT_DISALLOWED_DIRECTIVES = ['include', 'meta', 'raw']
 
@@ -183,14 +208,10 b' class MarkupRenderer(object):'
     URL_PAT = re.compile(r'(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]'
                          r'|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)')
 
-    extensions = ['codehilite', 'extra', 'def_list', 'sane_lists']
+    extensions = ['markdown.extensions.codehilite', 'markdown.extensions.extra',
+                  'markdown.extensions.def_list', 'markdown.extensions.sane_lists']
+
     output_format = 'html4'
-    markdown_renderer = markdown.Markdown(
-        extensions, enable_attributes=False, output_format=output_format)
-
-    markdown_renderer_flavored = markdown.Markdown(
-        extensions + [GithubFlavoredMarkdownExtension()],
-        enable_attributes=False, output_format=output_format)
 
     # extension together with weights. Lower is first means we control how
     # extensions are attached to readme names with those.
@@ -346,9 +367,11 b' class MarkupRenderer(object):'
         """
 
         if flavored:
-            markdown_renderer = cls.markdown_renderer_flavored
+            markdown_renderer = get_markdown_renderer_flavored(
+                cls.extensions, cls.output_format)
         else:
-            markdown_renderer = cls.markdown_renderer
+            markdown_renderer = get_markdown_renderer(
+                cls.extensions, cls.output_format)
 
         if mentions:
             mention_pat = re.compile(MENTIONS_REGEX)
@@ -452,7 +475,7 b' class MarkupRenderer(object):'
 
                 return nb, resources
 
-        def _sanitize_resources(resources):
+        def _sanitize_resources(input_resources):
             """
             Skip/sanitize some of the CSS generated and included in jupyter
             so it doesn't messes up UI so much
@@ -464,8 +487,8 b' class MarkupRenderer(object):'
             # _default_template_path_default, to achieve that
 
             # strip the reset CSS
-            resources[0] = resources[0][resources[0].find('/*! Source'):]
-            return resources
+            input_resources[0] = input_resources[0][input_resources[0].find('/*! Source'):]
+            return input_resources
 
         def as_html(notebook):
             conf = Config()

rhodecode/lib/middleware/simplehg.py

@@ -69,6 +69,11 b' class SimpleHg(simplevcs.SimpleVCS):'
         'statlfile': 'pull',
         'lheads': 'pull',
 
+        # evolve
+        'evoext_obshashrange_v1': 'pull',
+        'evoext_obshash': 'pull',
+        'evoext_obshash1': 'pull',
+
         'unbundle': 'push',
         'pushkey': 'push',
     }

rhodecode/lib/pyramid_utils.py

@@ -20,7 +20,7 b''
 
 import os
 from pyramid.compat import configparser
-from pyramid.paster import bootstrap as pyramid_bootstrap, setup_logging  # noqa
+from pyramid.paster import bootstrap as pyramid_bootstrap, setup_logging  # pragma: no cover
 from pyramid.scripting import prepare
 
 from rhodecode.lib.request import Request
@@ -37,6 +37,23 b' def get_app_config(ini_path):'
     return appconfig('config:{}'.format(ini_path), relative_to=os.getcwd())
 
 
+class BootstrappedRequest(Request):
+    """
+    Special version of Request Which has some available methods like in pyramid.
+    Some code (used for template rendering) requires this, and we unsure it's present.
+    """
+
+    def translate(self, msg):
+        return msg
+
+    def plularize(self, singular, plural, n):
+        return singular
+
+    def get_partial_renderer(self, tmpl_name):
+        from rhodecode.lib.partial_renderer import get_partial_renderer
+        return get_partial_renderer(request=self, tmpl_name=tmpl_name)
+
+
 def bootstrap(config_uri, request=None, options=None, env=None):
     if env:
         os.environ.update(env)
@@ -48,7 +65,7 b' def bootstrap(config_uri, request=None, '
     except (configparser.NoSectionError, configparser.NoOptionError):
         pass
 
-    request = request or Request.blank('/', base_url=base_url)
+    request = request or BootstrappedRequest.blank('/', base_url=base_url)
 
     return pyramid_bootstrap(config_uri, request=request, options=options)
 

rhodecode/lib/vcs/backends/base.py

@@ -50,8 +50,8 b' from rhodecode.lib.vcs.exceptions import'
 log = logging.getLogger(__name__)
 
 
-FILEMODE_DEFAULT = 0100644
-FILEMODE_EXECUTABLE = 0100755
+FILEMODE_DEFAULT = 0o100644
+FILEMODE_EXECUTABLE = 0o100755
 
 Reference = collections.namedtuple('Reference', ('type', 'name', 'commit_id'))
 MergeResponse = collections.namedtuple(
@@ -209,7 +209,7 b' class BaseRepository(object):'
     def get_create_shadow_cache_pr_path(self, db_repo):
         path = db_repo.cached_diffs_dir
         if not os.path.exists(path):
-            os.makedirs(path, 0755)
+            os.makedirs(path, 0o755)
         return path
 
     @classmethod
@@ -942,13 +942,13 b' class BaseCommit(object):'
         """
         raise NotImplementedError
 
-    def get_file_commit(self, path, pre_load=None):
+    def get_path_commit(self, path, pre_load=None):
         """
         Returns last commit of the file at the given `path`.
 
         :param pre_load: Optional. List of commit attributes to load.
         """
-        commits = self.get_file_history(path, limit=1, pre_load=pre_load)
+        commits = self.get_path_history(path, limit=1, pre_load=pre_load)
         if not commits:
             raise RepositoryError(
                 'Failed to fetch history for path {}. '
@@ -956,7 +956,7 b' class BaseCommit(object):'
                     path))
         return commits[0]
 
-    def get_file_history(self, path, limit=None, pre_load=None):
+    def get_path_history(self, path, limit=None, pre_load=None):
         """
         Returns history of file as reversed list of :class:`BaseCommit`
         objects for which file at given `path` has been modified.
@@ -1046,7 +1046,7 b' class BaseCommit(object):'
                 ('tags', ','.join(self.tags)),
             ]
             meta = ["%s:%s" % (f_name, value) for f_name, value in metadata]
-            file_info.append(('.archival.txt', 0644, False, '\n'.join(meta)))
+            file_info.append(('.archival.txt', 0o644, False, '\n'.join(meta)))
 
         connection.Hg.archive_repo(file_path, mtime, file_info, kind)
 
@@ -1194,8 +1194,8 b' class BaseCommit(object):'
         self.idx = value
 
     def get_file_changeset(self, path):
-        warnings.warn("Use get_file_commit instead", DeprecationWarning)
-        return self.get_file_commit(path)
+        warnings.warn("Use get_path_commit instead", DeprecationWarning)
+        return self.get_path_commit(path)
 
 
 class BaseChangesetClass(type):
@@ -1502,7 +1502,7 b' class EmptyCommit(BaseCommit):'
     def id(self):
         return self.raw_id
 
-    def get_file_commit(self, path):
+    def get_path_commit(self, path):
         return self
 
     def get_file_content(self, path):

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

@@ -298,7 +298,7 b' class GitCommit(base.BaseCommit):'
         id_, _ = self._get_id_for_path(path)
         return self._remote.blob_raw_length(id_)
 
-    def get_file_history(self, path, limit=None, pre_load=None):
+    def get_path_history(self, path, limit=None, pre_load=None):
         """
         Returns history of file as reversed list of `GitCommit` objects for
         which file at given `path` has been modified.
@@ -321,21 +321,6 b' class GitCommit(base.BaseCommit):'
             self.repository.get_commit(commit_id=commit_id, pre_load=pre_load)
             for commit_id in commit_ids]
 
-    # TODO: unused for now potential replacement for subprocess
-    def get_file_history_2(self, path, limit=None, pre_load=None):
-        """
-        Returns history of file as reversed list of `Commit` objects for
-        which file at given `path` has been modified.
-        """
-        self._get_filectx(path)
-        f_path = safe_str(path)
-
-        commit_ids = self._remote.get_file_history(f_path, self.id, limit)
-
-        return [
-            self.repository.get_commit(commit_id=commit_id, pre_load=pre_load)
-            for commit_id in commit_ids]
-
     def get_file_annotate(self, path, pre_load=None):
         """
         Returns a generator of four element tuples with

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

@@ -161,7 +161,7 b' class GitRepository(BaseRepository):'
                 GitRepository.check_url(src_url, self.config)
 
             if create:
-                os.makedirs(self.path, mode=0755)
+                os.makedirs(self.path, mode=0o755)
 
                 if bare:
                     self._remote.init_bare()

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

@@ -252,13 +252,13 b' class MercurialCommit(base.BaseCommit):'
         path = self._get_filectx(path)
         return self._remote.fctx_size(self.idx, path)
 
-    def get_file_history(self, path, limit=None, pre_load=None):
+    def get_path_history(self, path, limit=None, pre_load=None):
         """
         Returns history of file as reversed list of `MercurialCommit` objects
         for which file at given ``path`` has been modified.
         """
         path = self._get_filectx(path)
-        hist = self._remote.file_history(self.idx, path, limit)
+        hist = self._remote.node_history(self.idx, path, limit)
         return [
             self.repository.get_commit(commit_id=commit_id, pre_load=pre_load)
             for commit_id in hist]

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

@@ -355,7 +355,7 b' class MercurialRepository(BaseRepository'
             create = False
 
         if create:
-            os.makedirs(self.path, mode=0755)
+            os.makedirs(self.path, mode=0o755)
 
         self._remote.localrepository(create)
 

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

@@ -121,7 +121,7 b' class SubversionCommit(base.BaseCommit):'
         path = self._fix_path(path)
         return self._remote.get_file_size(safe_str(path), self._svn_rev)
 
-    def get_file_history(self, path, limit=None, pre_load=None):
+    def get_path_history(self, path, limit=None, pre_load=None):
         path = safe_str(self._fix_path(path))
         history = self._remote.node_history(path, self._svn_rev, limit)
         return [

rhodecode/lib/vcs/geventcurl.py

@@ -31,7 +31,7 b' import greenlet'
 
 # Import everything from pycurl.
 # This allows us to use this module as a drop in replacement of pycurl.
-from pycurl import *  # noqa
+from pycurl import *  # pragma: no cover
 
 from gevent import core
 from gevent.hub import Waiter

rhodecode/lib/vcs/nodes.py

@@ -404,7 +404,7 b' class FileNode(Node):'
     def last_commit(self):
         if self.commit:
             pre_load = ["author", "date", "message"]
-            return self.commit.get_file_commit(self.path, pre_load=pre_load)
+            return self.commit.get_path_commit(self.path, pre_load=pre_load)
         raise NodeError(
             "Cannot retrieve last commit of the file without "
             "related commit attribute")
@@ -510,7 +510,7 b' class FileNode(Node):'
         """
         if self.commit is None:
             raise NodeError('Unable to get commit for this FileNode')
-        return self.commit.get_file_history(self.path)
+        return self.commit.get_path_history(self.path)
 
     @LazyProperty
     def annotate(self):
@@ -724,6 +724,15 b' class DirNode(Node):'
 
         return size
 
+    @LazyProperty
+    def last_commit(self):
+        if self.commit:
+            pre_load = ["author", "date", "message"]
+            return self.commit.get_path_commit(self.path, pre_load=pre_load)
+        raise NodeError(
+            "Cannot retrieve last commit of the file without "
+            "related commit attribute")
+
     def __repr__(self):
         return '<%s %r @ %s>' % (self.__class__.__name__, self.path,
                                  getattr(self.commit, 'short_id', ''))

rhodecode/model/__init__.py

@@ -21,6 +21,7 b''
 
 import logging
 
+import rhodecode
 from rhodecode.model import meta, db
 from rhodecode.lib.utils2 import obfuscate_url_pw, get_encryption_key
 
@@ -36,7 +37,7 b' def init_model(engine, encryption_key=No'
     :param engine: engine to bind to
     """
     engine_str = obfuscate_url_pw(str(engine.url))
-    log.info("initializing db for %s", engine_str)
+    log.info("RhodeCode %s initializing db for %s", rhodecode.__version__, engine_str)
     meta.Base.metadata.bind = engine
     db.ENCRYPTION_KEY = encryption_key
 

rhodecode/model/db.py

@@ -40,12 +40,12 b' from sqlalchemy import ('
     Boolean, String, Unicode, UnicodeText, DateTime, Integer, LargeBinary,
     Text, Float, PickleType)
 from sqlalchemy.sql.expression import true, false
-from sqlalchemy.sql.functions import coalesce, count  # noqa
+from sqlalchemy.sql.functions import coalesce, count  # pragma: no cover
 from sqlalchemy.orm import (
     relationship, joinedload, class_mapper, validates, aliased)
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.hybrid import hybrid_property
-from sqlalchemy.exc import IntegrityError  # noqa
+from sqlalchemy.exc import IntegrityError  # pragma: no cover
 from sqlalchemy.dialects.mysql import LONGTEXT
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
@@ -377,6 +377,12 b' class RhodeCodeSetting(Base, BaseModel):'
                             % (self.SETTINGS_TYPES.keys(), val))
         self._app_settings_type = val
 
+    @classmethod
+    def get_by_prefix(cls, prefix):
+        return RhodeCodeSetting.query()\
+            .filter(RhodeCodeSetting.app_settings_name.startswith(prefix))\
+            .all()
+
     def __unicode__(self):
         return u"<%s('%s:%s[%s]')>" % (
             self.__class__.__name__,
@@ -4143,20 +4149,16 b' class ExternalIdentity(Base, BaseModel):'
         base_table_args
     )
 
-    external_id = Column('external_id', Unicode(255), default=u'',
-                         primary_key=True)
+    external_id = Column('external_id', Unicode(255), default=u'', primary_key=True)
     external_username = Column('external_username', Unicode(1024), default=u'')
-    local_user_id = Column('local_user_id', Integer(),
-                           ForeignKey('users.user_id'), primary_key=True)
-    provider_name = Column('provider_name', Unicode(255), default=u'',
-                           primary_key=True)
+    local_user_id = Column('local_user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
+    provider_name = Column('provider_name', Unicode(255), default=u'', primary_key=True)
     access_token = Column('access_token', String(1024), default=u'')
     alt_token = Column('alt_token', String(1024), default=u'')
     token_secret = Column('token_secret', String(1024), default=u'')
 
     @classmethod
-    def by_external_id_and_provider(cls, external_id, provider_name,
-                                    local_user_id=None):
+    def by_external_id_and_provider(cls, external_id, provider_name, local_user_id=None):
         """
         Returns ExternalIdentity instance based on search params
 
@@ -4198,6 +4200,13 b' class ExternalIdentity(Base, BaseModel):'
         query = query.filter(cls.local_user_id == local_user_id)
         return query
 
+    @classmethod
+    def load_provider_plugin(cls, plugin_id):
+        from rhodecode.authentication.base import loadplugin
+        _plugin_id = 'egg:rhodecode-enterprise-ee#{}'.format(plugin_id)
+        auth_plugin = loadplugin(_plugin_id)
+        return auth_plugin
+
 
 class Integration(Base, BaseModel):
     __tablename__ = 'integrations'

rhodecode/model/notification.py

@@ -95,15 +95,14 b' class NotificationModel(BaseModel):'
             log.debug('sending notifications %s to admins: %s',
                       notification_type, recipients_objs)
         else:
-            recipients_objs = []
+            recipients_objs = set()
             for u in recipients:
                 obj = self._get_user(u)
                 if obj:
-                    recipients_objs.append(obj)
+                    recipients_objs.add(obj)
                 else:  # we didn't find this user, log the error and carry on
                     log.error('cannot notify unknown user %r', u)
 
-            recipients_objs = set(recipients_objs)
             if not recipients_objs:
                 raise Exception('no valid recipients specified')
 
@@ -122,7 +121,7 b' class NotificationModel(BaseModel):'
             return notification
 
         # don't send email to person who created this comment
-        rec_objs = set(recipients_objs).difference(set([created_by_obj]))
+        rec_objs = set(recipients_objs).difference({created_by_obj})
 
         # now notify all recipients in question
 

rhodecode/model/pull_request.py

@@ -1576,10 +1576,8 b' class PullRequestModel(BaseModel):'
             from rc_reviewers.utils import get_default_reviewers_data
             from rc_reviewers.utils import validate_default_reviewers
         except ImportError:
-            from rhodecode.apps.repository.utils import \
-                get_default_reviewers_data
-            from rhodecode.apps.repository.utils import \
-                validate_default_reviewers
+            from rhodecode.apps.repository.utils import get_default_reviewers_data
+            from rhodecode.apps.repository.utils import validate_default_reviewers
 
         return get_default_reviewers_data, validate_default_reviewers
 

rhodecode/model/repo_group.py

@@ -181,7 +181,7 b' class RepoGroupModel(BaseModel):'
         self.check_exist_filesystem(group_name)
         create_path = os.path.join(self.repos_path, group_name)
         log.debug('creating new group in %s', create_path)
-        os.makedirs(create_path, mode=0755)
+        os.makedirs(create_path, mode=0o755)
         log.debug('created group in %s', create_path)
 
     def _rename_group(self, old, new):

rhodecode/model/settings.py

@@ -582,7 +582,6 b' class VcsSettingsModel(object):'
         self._create_or_update_ui(
             self.repo_settings, *phases, value=safe_str(data[phases_key]))
 
-
     def create_or_update_global_hg_settings(self, data):
         largefiles, largefiles_store, phases, hgsubversion, evolve \
             = self.GLOBAL_HG_SETTINGS

rhodecode/model/user.py

@@ -344,8 +344,8 b' class UserModel(BaseModel):'
         new_user.is_new_user = not edit
         # for users that didn's specify auth type, we use RhodeCode built in
         from rhodecode.authentication.plugins import auth_rhodecode
-        extern_name = extern_name or auth_rhodecode.RhodeCodeAuthPlugin.name
-        extern_type = extern_type or auth_rhodecode.RhodeCodeAuthPlugin.name
+        extern_name = extern_name or auth_rhodecode.RhodeCodeAuthPlugin.uid
+        extern_type = extern_type or auth_rhodecode.RhodeCodeAuthPlugin.uid
 
         try:
             new_user.username = username
@@ -392,14 +392,15 b' class UserModel(BaseModel):'
             log.error(traceback.format_exc())
             raise
 
-    def create_registration(self, form_data):
+    def create_registration(self, form_data,
+                            extern_name='rhodecode', extern_type='rhodecode'):
         from rhodecode.model.notification import NotificationModel
         from rhodecode.model.notification import EmailNotificationModel
 
         try:
             form_data['admin'] = False
-            form_data['extern_name'] = 'rhodecode'
-            form_data['extern_type'] = 'rhodecode'
+            form_data['extern_name'] = extern_name
+            form_data['extern_type'] = extern_type
             new_user = self.create(form_data)
 
             self.sa.add(new_user)

rhodecode/model/validation_schema/__init__.py

@@ -20,5 +20,5 b''
 
 import colander
 
-from colander import Invalid  # noqa, don't remove this
+from colander import Invalid  # pragma: no cover
 

rhodecode/public/502.html

@@ -27,10 +27,7 b''
             padding-left: 10px;
         }
         li {
-            list-style-type: none;
-        }
-        li:before {
-            content: "\2014\00A0";
+            list-style-type: disc;
         }
         .error_message {
             font-weight: normal;
@@ -89,7 +86,9 b''
         </div>
         <div class="main">
             <h1>
-                502 Bad Gateway | <span class="error_message">Backend server is unreachable</span>
+                502 Bad Gateway
+                <br/>
+                <span class="error_message">Backend server is unreachable</span>
             </h1>
             <div class="inner-column">
                 <h4>Possible Causes</h4>

rhodecode/public/css/buttons.less

@@ -254,7 +254,7 b' input[type="button"] {'
 .btn-social {
     &:extend(.btn-default);
     margin: 5px 5px 5px 0px;
-    min-width: 150px;
+    min-width: 160px;
 }
 
 // TODO: johbo: check these exceptions

rhodecode/public/css/code-block.less

@@ -570,14 +570,17 b' div.annotatediv { margin-left: 2px; marg'
 
 .code { display: block; border:0px !important; }
 .code-highlight, /* TODO: dan: merge codehilite into code-highlight */
+/* This can be generated with `pygmentize -S default -f html` */
 .codehilite {
     .hll { background-color: #ffffcc }
     .c { color: #408080; font-style: italic } /* Comment */
     .err, .codehilite .err { border: none } /* Error */
     .k { color: #008000; font-weight: bold } /* Keyword */
     .o { color: #666666 } /* Operator */
+    .ch { color: #408080; font-style: italic } /* Comment.Hashbang */
     .cm { color: #408080; font-style: italic } /* Comment.Multiline */
     .cp { color: #BC7A00 } /* Comment.Preproc */
+    .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */
     .c1 { color: #408080; font-style: italic } /* Comment.Single */
     .cs { color: #408080; font-style: italic } /* Comment.Special */
     .gd { color: #A00000 } /* Generic.Deleted */
@@ -585,11 +588,11 b' div.annotatediv { margin-left: 2px; marg'
     .gr { color: #FF0000 } /* Generic.Error */
     .gh { color: #000080; font-weight: bold } /* Generic.Heading */
     .gi { color: #00A000 } /* Generic.Inserted */
-    .go { color: #808080 } /* Generic.Output */
+    .go { color: #888888 } /* Generic.Output */
     .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
     .gs { font-weight: bold } /* Generic.Strong */
     .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-    .gt { color: #0040D0 } /* Generic.Traceback */
+    .gt { color: #0044DD } /* Generic.Traceback */
     .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
     .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
     .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
@@ -612,12 +615,15 b' div.annotatediv { margin-left: 2px; marg'
     .nv { color: #19177C } /* Name.Variable */
     .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
     .w { color: #bbbbbb } /* Text.Whitespace */
+    .mb { color: #666666 } /* Literal.Number.Bin */
     .mf { color: #666666 } /* Literal.Number.Float */
     .mh { color: #666666 } /* Literal.Number.Hex */
     .mi { color: #666666 } /* Literal.Number.Integer */
     .mo { color: #666666 } /* Literal.Number.Oct */
+    .sa { color: #BA2121 } /* Literal.String.Affix */
     .sb { color: #BA2121 } /* Literal.String.Backtick */
     .sc { color: #BA2121 } /* Literal.String.Char */
+    .dl { color: #BA2121 } /* Literal.String.Delimiter */
     .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
     .s2 { color: #BA2121 } /* Literal.String.Double */
     .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
@@ -628,9 +634,11 b' div.annotatediv { margin-left: 2px; marg'
     .s1 { color: #BA2121 } /* Literal.String.Single */
     .ss { color: #19177C } /* Literal.String.Symbol */
     .bp { color: #008000 } /* Name.Builtin.Pseudo */
+    .fm { color: #0000FF } /* Name.Function.Magic */
     .vc { color: #19177C } /* Name.Variable.Class */
     .vg { color: #19177C } /* Name.Variable.Global */
     .vi { color: #19177C } /* Name.Variable.Instance */
+    .vm { color: #19177C } /* Name.Variable.Magic */
     .il { color: #666666 } /* Literal.Number.Integer.Long */
 }
 

rhodecode/public/css/comments.less

@@ -548,10 +548,9 b' form.comment-form {'
 }
 .nav-links li {
     display: inline-block;
+    list-style-type: none;
 }
-.nav-links li:before {
-    content: "";
-}
+
 .nav-links li a.disabled {
     cursor: not-allowed;
 }

rhodecode/public/css/forms.less

@@ -219,7 +219,6 b' form.rcform {'
         li {
             list-style-type: none;
 
-            &:before { content:none; }
             &:after {
                 content: "";
                 float: left;

rhodecode/public/css/helpers.less

@@ -43,7 +43,9 b' a { cursor: pointer; }'
     float: right;
     clear: right;
 
-    li:before { content:none; }
+    li {
+        list-style-type: none;
+    }
 }
 
 //--- DEVICE-SPECIFIC CLASSES ---------------//

rhodecode/public/css/legacy_code_styles.less

@@ -126,6 +126,11 b' div.markdown-block h6 {'
     overflow: visible !important;
 }
 
+div.markdown-block h1,
+div.markdown-block h2 {
+    border-bottom: 1px #e6e5e5 solid !important;
+}
+
 div.markdown-block h1 {
     font-size: 32px;
     margin: 15px 0 15px 0 !important;
@@ -135,7 +140,6 b' div.markdown-block h1 {'
 div.markdown-block h2 {
     font-size: 24px !important;
     margin: 34px 0 10px 0 !important;
-    border-top: 3px #e6e5e5 solid !important;
     padding-top: 15px !important;
     padding-bottom: 8px !important;
 }
@@ -199,6 +203,7 b' div.markdown-block pre {'
 div.markdown-block img {
   border-style: none;
   background-color: #fff;
+  padding-right: 20px;
 }
 
 
@@ -317,9 +322,13 b' div.rst-block h3 {'
     margin: 1em 0 !important;
 }
 
+div.rst-block  h1,
+div.rst-block  h2 {
+    border-bottom: 1px #e6e5e5 solid !important;
+}
+
 div.rst-block  h2 {
     margin-top: 1.5em !important;
-    border-top: 4px solid #e0e0e0 !important;
     padding-top: .5em !important;
 }
 

rhodecode/public/css/main-content.less

@@ -196,6 +196,16 b''
             .text-as-placeholder {
                 padding-top: @input-padding-px + @border-thickness-inputs;
             }
+
+            .no-border {
+                border: 1px;
+            }
+
+            .no-horizontal-padding {
+                padding-left: 0;
+                padding-right: 0;
+            }
+
         }
 
         // TODO: johbo: Try to find a better integration of this bit.

rhodecode/public/css/main.less

@@ -315,7 +315,6 b' ul.auth_plugins {'
 			margin-right: @padding;
 		}
 
-        &:before { content: none; }
 	}
 }
 
@@ -1325,6 +1324,7 b' table.integrations {'
     position: relative;
     width: 100%;
     padding-bottom: 8px;
+    list-style-type: none;
 }
 
 .reviewer_entry {
@@ -1719,8 +1719,8 b' BIN_FILENODE = 7'
     padding: 0px 0px;
 }
 
-.pull-request-merge li:before{
-    content:none;
+.pull-request-merge li {
+    list-style-type: none;
 }
 
 .pull-request-merge .pull-request-wrap {
@@ -1957,7 +1957,7 b' BIN_FILENODE = 7'
 			font-size: @journal-fontsize;
             line-height: 1em;
 
-            &:before { content: none; }
+            list-style-type: none;
 		}
 	}
 }

rhodecode/public/css/navigation.less

@@ -201,8 +201,7 b''
                 padding: 0 2px;
             }
         }
-
-        &:before { content: none; }
+        list-style-type: none;
     }
 
     > li {
@@ -305,8 +304,7 b''
         line-height: 1em;
         color: @grey3;
         background-color: @grey6;
-
-        &:before { content: none; }
+        list-style-type: none;
 
         a {
             display: block;
@@ -398,8 +396,6 b''
             line-height: 1em;
             list-style-type: none;
 
-            &:before { content: none; }
-
             a {
                 display: block;
                 height: 16px;
@@ -461,8 +457,6 b''
             line-height: 1em;
             color: @grey6;
 
-            &:before { content: none; }
-
             &>.select2-result-label {
                 padding: 8px 0;
                 border-bottom: @border-thickness solid @grey3;
@@ -494,8 +488,7 b''
             line-height: 1em;
             font-family: @text-light;
             color: @grey2;
-
-            &:before { content: none; }
+            list-style-type: none;
 
             &:hover {
                 background-color: @grey3;
@@ -520,8 +513,7 b''
 ul#context-pages {
     li {
         line-height: 1em;
-
-        &:before { content: none; }
+        list-style-type: none;
 
         a {
             color: @grey3;
@@ -622,6 +614,7 b' ul#context-pages {'
             padding-bottom: @menupadding;
             line-height: 1em;
             color: @grey4;
+            list-style-type: none;
 
             &.active a {
                 color: @grey2;
@@ -630,8 +623,6 b' ul#context-pages {'
             a {
                 color: @grey4;
             }
-
-            &:before { content: none; }
         }
 
     }

rhodecode/public/css/readme-box.less

@@ -17,6 +17,11 b' div.readme_box h6 {'
     overflow: visible !important;
 }
 
+div.readme_box h1,
+div.readme_box h2 {
+    border-bottom: 1px #e6e5e5 solid !important;
+}
+
 div.readme_box h1 {
     font-size: 32px;
     margin: 15px 0 15px 0 !important;
@@ -26,7 +31,6 b' div.readme_box h1 {'
 div.readme_box h2 {
     font-size: 24px !important;
     margin: 34px 0 10px 0 !important;
-    border-top: 3px #e6e5e5 solid !important;
     padding-top: 15px !important;
     padding-bottom: 8px !important;
 }
@@ -90,6 +94,7 b' div.readme_box pre {'
 div.readme_box img {
   border-style: none;
   background-color: #fff;
+  padding-right: 20px;
 }
 
 
@@ -107,7 +112,7 b' div.readme_box ol {'
 
 div.readme_box ul li,
 div.readme_box ol li {
-    list-style: bullet !important;
+    list-style: disc !important;
     margin: 6px !important;
     padding: 0 !important;
 }

rhodecode/public/css/select2.less

@@ -174,8 +174,6 b' select.select2{height:28px;visibility:hi'
         line-height: 1em;
         list-style-type: none;
 
-        &:before { content: none; }
-
         &:hover,
         &.select2-highlighted {
             background-color: @rclightblue;

rhodecode/public/css/summary.less

@@ -104,11 +104,7 b''
             padding-left: 0;
 
             li {
-
-                &:before {
-                    content: none;
-                    width: 0;
-                }
+                list-style-type: none;
             }
         }
     }

rhodecode/public/css/tables.less

@@ -64,7 +64,9 b' table.dataTable {'
     .expired td {
         background-color: @grey7;
     }
-
+    .inactive td {
+        background-color: @grey6;
+    }
     th {
         text-align: left;
         font-weight: @text-semibold-weight;

rhodecode/public/css/tags.less

@@ -49,8 +49,6 b''
         margin: 0 0 @padding;
         line-height: 1em;
         list-style-type: none;
-
-        &:before { content: none; }
     }
 }
 

rhodecode/public/css/type.less

@@ -274,8 +274,11 b' mark,'
         list-style: none;
         text-align: right;
 
-        li:before { content: none; }
-        li { float: right; }
+        li {
+          float: right;
+          list-style-type: none;
+        }
+
         a {
             display: inline-block;
             margin-left: @textmargin/2;
@@ -338,15 +341,7 b' li {'
 
 ul li {
   position: relative;
-  display: block;
-  list-style-type: none;
-
-  &:before {
-    content: "\2014\00A0";
-    position: absolute;
-    top: 0;
-    left: -1.25em;
-  }
+  list-style-type: disc;
 
   p:first-child {
     display:inline;
@@ -539,7 +534,7 b' address {'
   color: @grey4;
   font-family: @text-light;
   &.pre-formatting {
-      white-space: pre;
+      white-space: pre-wrap;
   }
 }
 

rhodecode/public/css/variables.less

@@ -125,7 +125,7 b''
 @label-summary-minwidth: 80px;
 @search-form-width: 400px;
 @fields-input-m: 400px;
-@fields-input-l: 800px;
+@fields-input-l: 720px;
 
 // BUTTONS
 @button-padding: .9em;

rhodecode/public/js/rhodecode/routes.js

@@ -14,7 +14,6 b' function registerRCRoutes() {'
     // routes registration
     pyroutes.register('favicon', '/favicon.ico', []);
     pyroutes.register('robots', '/robots.txt', []);
-    pyroutes.register('auth_home', '/_admin/auth*traverse', []);
     pyroutes.register('global_integrations_new', '/_admin/integrations/new', []);
     pyroutes.register('global_integrations_home', '/_admin/integrations', []);
     pyroutes.register('global_integrations_list', '/_admin/integrations/%(integration)s', ['integration']);
@@ -30,6 +29,7 b' function registerRCRoutes() {'
     pyroutes.register('repo_integrations_list', '/%(repo_name)s/settings/integrations/%(integration)s', ['repo_name', 'integration']);
     pyroutes.register('repo_integrations_create', '/%(repo_name)s/settings/integrations/%(integration)s/new', ['repo_name', 'integration']);
     pyroutes.register('repo_integrations_edit', '/%(repo_name)s/settings/integrations/%(integration)s/%(integration_id)s', ['repo_name', 'integration', 'integration_id']);
+    pyroutes.register('auth_home', '/_admin/auth*traverse', []);
     pyroutes.register('ops_ping', '/_admin/ops/ping', []);
     pyroutes.register('ops_error_test', '/_admin/ops/error', []);
     pyroutes.register('ops_redirect_test', '/_admin/ops/redirect', []);

rhodecode/rcserver.py

@@ -475,11 +475,10 b' class RcServerCommand(object):'
                 msg = ''
             self.out('Exiting%s (-v to see traceback)' % msg)
 
-
     def loadapp(self, app_spec, name, relative_to, **kw):  # pragma: no cover
         return loadapp(app_spec, name=name, relative_to=relative_to, **kw)
 
-    def loadserver(self, server_spec, name, relative_to, **kw):  # pragma:no cover
+    def loadserver(self, server_spec, name, relative_to, **kw):  # pragma: no cover
         return loadserver(
             server_spec, name=name, relative_to=relative_to, **kw)
 

rhodecode/templates/admin/auth/auth_settings.mako

@@ -39,48 +39,56 b''
 
     <div class="main-content-full-width">
       ${h.secure_form(request.resource_path(resource, route_name='auth_home'), request=request)}
-      <div class="form">
-
         <div class="panel panel-default">
 
           <div class="panel-heading">
             <h3 class="panel-title">${_("Enabled and Available Plugins")}</h3>
           </div>
 
-          <div class="fields panel-body">
+          <div class="panel-body">
 
-            <div class="field">
-              <div class="label">${_("Enabled Plugins")}</div>
+
+              <div class="label">${_("Ordered Activated Plugins")}</div>
               <div class="textarea text-area editor">
-                  ${h.textarea('auth_plugins',cols=23,rows=5,class_="medium")}
+                  ${h.textarea('auth_plugins',cols=120,rows=20,class_="medium")}
               </div>
-              <p class="help-block pre-formatting">${_('List of plugins, separated by commas.'
+              <div class="field">
+                <p class="help-block pre-formatting">${_('List of plugins, separated by commas.'
                   '\nThe order of the plugins is also the order in which '
-                  'RhodeCode Enterprise will try to authenticate a user.')}</p>
-            </div>
+                  'RhodeCode Enterprise will try to authenticate a user.')}
+                </p>
+              </div>
 
-            <div class="field">
-              <div class="label">${_('Available Built-in Plugins')}</div>
-              <ul class="auth_plugins">
-              %for plugin in available_plugins:
-                  <li>
-                    <div class="auth_buttons">
-                        <span plugin_id="${plugin.get_id()}" class="toggle-plugin btn ${'btn-success' if plugin.get_id() in enabled_plugins else ''}">
-                          ${_('enabled') if plugin.get_id() in enabled_plugins else _('disabled')}
-                        </span>
-                        ${plugin.get_display_name()} (${plugin.get_id()})
-                    </div>
-                  </li>
-              %endfor
-              </ul>
-            </div>
+              <table class="rctable">
+                  <th>${_('Activate')}</th>
+                  <th>${_('Plugin Name')}</th>
+                  <th>${_('Documentation')}</th>
+                  <th>${_('Plugin ID')}</th>
+                  <th>${_('Enabled')}</th>
+                  %for plugin in available_plugins:
+                      <tr class="${'inactive' if (not plugin.is_active() and plugin.get_id() in enabled_plugins) else ''}">
+                          <td>
+                            <span plugin_id="${plugin.get_id()}" class="toggle-plugin btn ${'btn-success' if plugin.get_id() in enabled_plugins else ''}">
+                              ${_('activated') if plugin.get_id() in enabled_plugins else _('not active')}
+                            </span>
+                          </td>
+                          <td>${plugin.get_display_name()}</td>
+                          <td>
+                              % if plugin.docs():
+                                <a href="${plugin.docs()}">docs</a>
+                              % endif
+                          </td>
+                          <td>${plugin.get_id()}</td>
+                          <td>${h.bool2icon(plugin.is_active(),show_at_false=False)}</td>
+                      </tr>
+                  %endfor
+              </table>
 
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
             </div>
           </div>
         </div>
-      </div>
       ${h.end_form()}
     </div>
   </div>
@@ -103,15 +111,15 b''
       elems.splice(elems.indexOf(plugin_id), 1);
       auth_plugins_input.val(elems.join(',\n'));
       $(cur_button).removeClass('btn-success');
-      cur_button.innerHTML = _gettext('disabled');
+      cur_button.innerHTML = _gettext('not active');
     }
     else{
-      if(elems.indexOf(plugin_id) == -1){
-        elems.push(plugin_id);
+      if (elems.indexOf(plugin_id) === -1) {
+            elems.push(plugin_id);
       }
       auth_plugins_input.val(elems.join(',\n'));
       $(cur_button).addClass('btn-success');
-      cur_button.innerHTML = _gettext('enabled');
+      cur_button.innerHTML = _gettext('activated');
     }
   });
 </script>

rhodecode/templates/admin/auth/plugin_settings.mako

@@ -51,23 +51,29 b''
                 <div class="form">
 
                   %for node in plugin.get_settings_schema():
-                    <% label_css_class = ("label-checkbox" if (node.widget == "bool") else "") %>
+                    <%
+                      label_to_type = {'label-checkbox': 'bool', 'label-textarea': 'textarea'}
+                    %>
+
                     <div class="field">
-                      <div class="label ${label_css_class}"><label for="${node.name}">${node.title}</label></div>
+                      <div class="label ${label_to_type.get(node.widget)}"><label for="${node.name}">${node.title}</label></div>
                       <div class="input">
                         %if node.widget in ["string", "int", "unicode"]:
-                          ${h.text(node.name, defaults.get(node.name), class_="medium")}
+                          ${h.text(node.name, defaults.get(node.name), class_="large")}
                         %elif node.widget == "password":
-                          ${h.password(node.name, defaults.get(node.name), class_="medium")}
+                          ${h.password(node.name, defaults.get(node.name), class_="large")}
                         %elif node.widget == "bool":
                           <div class="checkbox">${h.checkbox(node.name, True, checked=defaults.get(node.name))}</div>
                         %elif node.widget == "select":
-                          ${h.select(node.name, defaults.get(node.name), node.validator.choices)}
+                          ${h.select(node.name, defaults.get(node.name), node.validator.choices, class_="select2AuthSetting")}
+                        %elif node.widget == "textarea":
+                          <div class="textarea" style="margin-left: 0px">${h.textarea(node.name, defaults.get(node.name), rows=10)}</div>
                         %elif node.widget == "readonly":
                           ${node.default}
                         %else:
                           This field is of type ${node.typ}, which cannot be displayed. Must be one of [string|int|bool|select].
                         %endif
+
                         %if node.name in errors:
                           <span class="error-message">${errors.get(node.name)}</span>
                           <br />
@@ -91,6 +97,18 b''
                 ${h.end_form()}
               </div>
             </div>
+
+% if request.GET.get('schema'):
+## this is for development and creation of example configurations for documentation
+<pre>
+    % for node in plugin.get_settings_schema():
+    *option*: `${node.name}` => `${defaults.get(node.name)}`${'\n    # '.join(['']+node.description.splitlines())}
+
+    % endfor
+</pre>
+
+% endif
+
           </div>
         </div>
       </div>
@@ -98,8 +116,7 b''
     </div>
   </div>
 
-## TODO: Ugly hack to get ldap select elements to work.
-##       Find a solution to integrate this nicely.
+
 <script>
 $(document).ready(function() {
   var select2Options = {
@@ -107,12 +124,9 b''
         dropdownCssClass: 'drop-menu-dropdown',
         dropdownAutoWidth: true,
         minimumResultsForSearch: -1
-    };
-    $("#tls_kind").select2(select2Options);
-    $("#tls_reqcert").select2(select2Options);
-    $("#search_scope").select2(select2Options);
-    $("#group_extraction_type").select2(select2Options);
-    $("#admin_groups_sync").select2(select2Options);
+  };
+  $('.select2AuthSetting').select2(select2Options);
+
 });
 </script>
 </%def>

rhodecode/templates/admin/my_account/my_account.mako

@@ -32,10 +32,10 b''
           <li class="${'active' if c.active in ['ssh_keys', 'ssh_keys_generate'] else ''}"><a href="${h.route_path('my_account_ssh_keys')}">${_('SSH Keys')}</a></li>
           <li class="${'active' if c.active=='user_group_membership' else ''}"><a href="${h.route_path('my_account_user_group_membership')}">${_('User Group Membership')}</a></li>
 
-          ## TODO: Find a better integration of oauth views into navigation.
-          <% my_account_oauth_url = h.route_path_or_none('my_account_oauth') %>
-          % if my_account_oauth_url:
-          <li class="${'active' if c.active=='oauth' else ''}"><a href="${my_account_oauth_url}">${_('OAuth Identities')}</a></li>
+          ## TODO: Find a better integration of oauth/saml views into navigation.
+          <% my_account_external_url = h.route_path_or_none('my_account_external_identity') %>
+          % if my_account_external_url:
+          <li class="${'active' if c.active=='external_identity' else ''}"><a href="${my_account_external_url}">${_('External Identities')}</a></li>
           % endif
           <li class="${'active' if c.active=='emails' else ''}"><a href="${h.route_path('my_account_emails')}">${_('Emails')}</a></li>
           <li class="${'active' if c.active=='repos' else ''}"><a href="${h.route_path('my_account_repos')}">${_('Repositories')}</a></li>

rhodecode/templates/admin/permissions/permissions_auth_token_access.mako

@@ -49,9 +49,7 b' Currently the following views are set:'
         % for route_name, view_fqn, view_url, active in c.view_data:
         <tr>
             <td class="td-x">
-                % if active:
-                    ${h.bool2icon(active)}
-                % endif
+                ${h.bool2icon(active, show_at_false=False)}
             </td>
             <td class="td-x">${view_fqn}</td>
             <td class="td-x" title="${route_name}">${view_url}</td>

rhodecode/templates/admin/settings/settings_global.mako

@@ -102,6 +102,7 b''
                 <option value="clicky">Clicky</option>
                 <option value="server_announce">${_('Server Announcement')}</option>
                 <option value="flash_filtering">${_('Flash message filtering')}</option>
+                <option value="custom_logo">${_('Custom logos')}</option>
             </select>
         </div>
         <div style="padding: 10px 0px"></div>
@@ -212,7 +213,7 b''
 // This can be used to send a global maintenance messages or other
 // important messages to all users of the RhodeCode Enterprise system.
 
-$(document).ready(function(e){
+$(document).ready(function(e) {
 
  // EDIT - put your message below
  var message = "TYPE YOUR MESSAGE HERE";
@@ -248,6 +249,32 b''
 </%text>
 </script>
 
+
+<script id="custom_logo_tmpl" type='text/x-template'>
+<%text filter="h">
+<script>
+
+$(document).ready(function(e) {
+    // 1) Set custom logo on login/register pages.
+
+    // external URL, custom company logo
+    //$('.sign-in-image').attr("src", "http://server.com/logo_path/custom_logo.png");
+
+    // Alternative logo from static folder
+    $('.sign-in-image').attr("src", "/_static/rhodecode/images/RhodeCode_Logo_Black.png");
+
+    // option to set width/height, adjust if required to make your image look good.
+    $('.sign-in-image').css({"width": "300px", "height": "345px"});
+
+    // 2) Header logo on top bar
+    $('.logo-wrapper').find('img').attr('src', 'http://server.com/logo_path/custom_header_logo.png')
+
+});
+</script>
+</%text>
+</script>
+
+
 <script>
 var pre_cm = initCodeMirror('rhodecode_pre_code', '', false);
 var pre_old = pre_cm.getValue();
@@ -255,7 +282,7 b' var pre_old = pre_cm.getValue();'
 var post_cm = initCodeMirror('rhodecode_post_code', '', false);
 var post_old = post_cm.getValue();
 
-var get_data = function(type, old){
+var get_data = function(type, old) {
     var get_tmpl = function(tmpl_name){
         // unescape some stuff
         return htmlEnDeCode.htmlDecode($('#'+tmpl_name+'_tmpl').html());
@@ -265,7 +292,8 b' var get_data = function(type, old){'
         'ga': get_tmpl('ga'),
         'clicky': get_tmpl('clicky'),
         'server_announce': get_tmpl('server_announce'),
-        'flash_filtering': get_tmpl('flash_filtering')
+        'flash_filtering': get_tmpl('flash_filtering'),
+        'custom_logo': get_tmpl('custom_logo')
     }[type]
 };
 

rhodecode/templates/admin/users/user_edit_profile.mako

@@ -103,11 +103,12 b''
             </div>
             <div class="field">
                <div class="label-text">
-                    ${_('Source of Record')}:
+                    ${_('Authentication type')}:
                </div>
                <div class="input">
                     <p>${c.extern_type}</p>
                     ${h.hidden('extern_type', readonly="readonly")}
+                    <p class="help-block">${_('User was created using an external source. He is bound to authentication using this method.')}</p>
                 </div>
             </div>
             <div class="field">
@@ -127,7 +128,7 b''
                     ## allowed_languages is defined in the users.py
                     ## c.language comes from base.py as a default language
                     ${h.select('language', c.language, c.allowed_languages)}
-                    <p class="help-block">${h.literal(_('Help translate %(rc_link)s into your language.') % {'rc_link': h.link_to('RhodeCode Enterprise', h.route_url('rhodecode_translations'))})}</p>
+                    <p class="help-block">${h.literal(_('User interface language. Help translate %(rc_link)s into your language.') % {'rc_link': h.link_to('RhodeCode Enterprise', h.route_url('rhodecode_translations'))})}</p>
                 </div>
             </div>
             <div class="buttons">

rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako

@@ -4,7 +4,8 b''
     </div>
     <div class="panel-body">
         <p>
-            ${_('Below is a 2048 bit generated SSH RSA key. You can use it to access RhodeCode via the SSH wrapper.')}
+            ${_('Below is a 2048 bit generated SSH RSA key.')}<br/>
+            ${_('If You wish to use it to access RhodeCode via the SSH please save the private key and click `Use this generated key` at the bottom.')}
         </p>
         <h4>${_('Private key')}</h4>
         <pre>

rhodecode/templates/base/root.mako

@@ -27,9 +27,6 b" c.template_context['default_user'] = {"
 %>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
-
-        <script src="${h.asset('js/vendors/webcomponentsjs/custom-elements-es5-adapter.js', ver=c.rhodecode_version_hash)}"></script>
-        <script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-bundle.js', ver=c.rhodecode_version_hash)}"></script>
         <title>${self.title()}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 
@@ -46,6 +43,8 b" c.template_context['default_user'] = {"
         </%def>
         ${self.robots()}
         <link rel="icon" href="${h.asset('images/favicon.ico', ver=c.rhodecode_version_hash)}" sizes="16x16 32x32" type="image/png" />
+        <script src="${h.asset('js/vendors/webcomponentsjs/custom-elements-es5-adapter.js', ver=c.rhodecode_version_hash)}"></script>
+        <script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-bundle.js', ver=c.rhodecode_version_hash)}"></script>
 
         ## CSS definitions
         <%def name="css()">

rhodecode/templates/errors/error_document.mako

@@ -5,13 +5,16 b''
         <title>Error - ${c.error_message}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <meta name="robots" content="index, nofollow"/>
-        <link rel="icon" href="${h.asset('images/favicon.ico')}" sizes="16x16 32x32" type="image/png" />
 
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         %if c.redirect_time:
             <meta http-equiv="refresh" content="${c.redirect_time}; url=${c.url_redirect}"/>
         %endif
 
+        <link rel="icon" href="${h.asset('images/favicon.ico', ver=c.rhodecode_version_hash)}" sizes="16x16 32x32" type="image/png" />
+        <script src="${h.asset('js/vendors/webcomponentsjs/custom-elements-es5-adapter.js', ver=c.rhodecode_version_hash)}"></script>
+        <script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-bundle.js', ver=c.rhodecode_version_hash)}"></script>
+
         <link rel="stylesheet" type="text/css" href="${h.asset('css/style.css', ver=c.rhodecode_version_hash)}" media="screen"/>
         <style>body { background:#eeeeee; }</style>
         <script type="text/javascript">
@@ -31,7 +34,9 b''
                     <span class="error-branding">
                         ${h.branding(c.rhodecode_name)}
                     </span><br/>
-                    ${c.error_message} | <span class="error_message">${c.error_explanation}</span>
+                    ${c.error_message}
+                    <br/>
+                    <span class="error_message">${c.error_explanation}</span>
                 </h1>
                 % if c.messages:
                     % for message in c.messages:

rhodecode/templates/register.mako

@@ -32,8 +32,8 b''
         <div id="register" class="right-column">
             <!-- login -->
             <div class="sign-in-title">
-                % if social_auth_provider:
-                    <h1>${_('Create an account linked with {}').format(social_auth_provider)}</h1>
+                % if external_auth_provider:
+                    <h1>${_('Create an account linked with {}').format(external_auth_provider)}</h1>
                 % else:
                     <h1>${_('Create an account')}</h1>
                 % endif
@@ -50,7 +50,9 b''
                       <br />
                     %endif
 
-                    % if social_auth_provider:
+                    % if external_auth_provider:
+                        ## store internal marker about external identity
+                        ${h.hidden('external_identity', external_auth_provider)}
                         ## hide password prompts for social auth
                         <div style="display: none">
                     % endif
@@ -69,7 +71,7 b''
                       <br />
                     %endif
 
-                    % if social_auth_provider:
+                    % if external_auth_provider:
                         ## hide password prompts for social auth
                         </div>
                     % endif

rhodecode/tests/auth_external_test.py

@@ -45,7 +45,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
 
     @hybrid_property
     def name(self):
-        return "external_test"
+        return u"external_test"
 
     def settings(self):
         settings = [

rhodecode/tests/lib/auth_modules/test_auth_modules.py

@@ -30,7 +30,7 b' from rhodecode.model import db'
 class RcTestAuthPlugin(RhodeCodeAuthPluginBase):
 
     def name(self):
-        return 'stub_auth'
+        return u'stub_auth'
 
 
 def test_authenticate_returns_from_auth(stub_auth_data):

rhodecode/tests/lib/middleware/test_simplevcs.py

@@ -77,6 +77,8 b' class StubVCSController(simplevcs.Simple'
 def vcscontroller(baseapp, config_stub, request_stub):
     config_stub.testing_securitypolicy()
     config_stub.include('rhodecode.authentication')
+    config_stub.include('rhodecode.authentication.plugins.auth_rhodecode')
+    config_stub.include('rhodecode.authentication.plugins.auth_token')
 
     controller = StubVCSController(
         baseapp.config.get_settings(), request_stub.registry)

rhodecode/tests/models/test_changeset_status_group_voting.py

@@ -46,7 +46,7 b' class ReviewerMock(object):'
 class MemberMock(object):
     def __init__(self, reviewer_def):
         self.reviewer_def = reviewer_def
-        self.user_id = random.randint(1, 1024)
+        self.user_id = random.randint(1, 1024*1024)
 
 
 class Statuses(object):

rhodecode/tests/other/test_validators.py

@@ -193,6 +193,8 b' def test_ValidPasswordsMatch(localizer):'
 def test_ValidAuth(localizer, config_stub):
     config_stub.testing_securitypolicy()
     config_stub.include('rhodecode.authentication')
+    config_stub.include('rhodecode.authentication.plugins.auth_rhodecode')
+    config_stub.include('rhodecode.authentication.plugins.auth_token')
 
     validator = v.ValidAuth(localizer)
     valid_creds = {

rhodecode/tests/vcs/test_commits.py

@@ -310,9 +310,9 b' class TestCommits(BackendTestMixin):'
         with pytest.raises(CommitDoesNotExistError):
             commit.next()
 
-    def test_get_file_commit(self):
+    def test_get_path_commit(self):
         commit = self.repo.get_commit()
-        commit.get_file_commit('file_4.txt')
+        commit.get_path_commit('file_4.txt')
         assert commit.message == 'Commit 4'
 
     def test_get_filenodes_generator(self):
@@ -571,19 +571,19 b' class TestCommitsChanges(BackendTestMixi'
         assert FILEMODE_DEFAULT == commit.get_file_mode('foo/bał')
         assert FILEMODE_DEFAULT == commit.get_file_mode(u'foo/bał')
 
-    def test_get_file_history(self):
+    def test_get_path_history(self):
         commit = self.repo.get_commit()
-        history = commit.get_file_history('foo/bar')
+        history = commit.get_path_history('foo/bar')
         assert len(history) == 2
 
-    def test_get_file_history_with_limit(self):
+    def test_get_path_history_with_limit(self):
         commit = self.repo.get_commit()
-        history = commit.get_file_history('foo/bar', limit=1)
+        history = commit.get_path_history('foo/bar', limit=1)
         assert len(history) == 1
 
-    def test_get_file_history_first_commit(self):
+    def test_get_path_history_first_commit(self):
         commit = self.repo[0]
-        history = commit.get_file_history('foo/bar')
+        history = commit.get_path_history('foo/bar')
         assert len(history) == 1
 
 

rhodecode/tests/vcs/test_git.py

@@ -538,7 +538,7 b' TODO: To be written...'
                 'sys.exit(1)',
             ]
             f.write('\n'.join(script_lines))
-        os.chmod(hook_path, 0755)
+        os.chmod(hook_path, 0o755)
 
     def test_local_push_does_not_execute_hook(self):
         target_repo = self.get_empty_repo()
@@ -1061,7 +1061,7 b' class TestGitSpecificWithRepo(BackendTes'
                     FileNode('foobar/static/js/admin/base.js', content='base'),
                     FileNode(
                         'foobar/static/admin', content='admin',
-                        mode=0120000),  # this is a link
+                        mode=0o120000),  # this is a link
                     FileNode('foo', content='foo'),
                 ],
             },

rhodecode/tests/vcs/test_nodes.py

@@ -190,13 +190,13 b' class TestNodeBasics:'
         assert not mode & stat.S_IXOTH
 
     def test_file_node_is_executable(self):
-        node = FileNode('foobar', 'empty... almost', mode=0100755)
+        node = FileNode('foobar', 'empty... almost', mode=0o100755)
         assert node.is_executable
 
-        node = FileNode('foobar', 'empty... almost', mode=0100500)
+        node = FileNode('foobar', 'empty... almost', mode=0o100500)
         assert node.is_executable
 
-        node = FileNode('foobar', 'empty... almost', mode=0100644)
+        node = FileNode('foobar', 'empty... almost', mode=0o100644)
         assert not node.is_executable
 
     def test_file_node_is_not_symlink(self):

rhodecode/tests/vcs/test_repository.py

@@ -259,13 +259,13 b' class TestRepositoryGetCommonAncestor:'
             commit_id1=original[0].raw_id,
             commit_id2=unrelated[0].raw_id,
             repo2=unrelated
-        ) == None
+        ) is None
 
         assert original.get_common_ancestor(
             commit_id1=original[-1].raw_id,
             commit_id2=unrelated[-1].raw_id,
             repo2=unrelated
-        ) == None
+        ) is None
 
 
 @pytest.mark.backends("git", "hg")

setup.py

@@ -148,15 +148,6 b' setup('
     },
     paster_plugins=['PasteScript'],
     entry_points={
-        'enterprise.plugins1': [
-            'crowd=rhodecode.authentication.plugins.auth_crowd:plugin_factory',
-            'headers=rhodecode.authentication.plugins.auth_headers:plugin_factory',
-            'jasig_cas=rhodecode.authentication.plugins.auth_jasig_cas:plugin_factory',
-            'ldap=rhodecode.authentication.plugins.auth_ldap:plugin_factory',
-            'pam=rhodecode.authentication.plugins.auth_pam:plugin_factory',
-            'rhodecode=rhodecode.authentication.plugins.auth_rhodecode:plugin_factory',
-            'token=rhodecode.authentication.plugins.auth_token:plugin_factory',
-        ],
         'paste.app_factory': [
             'main=rhodecode.config.middleware:make_pyramid_app',
         ],